diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2003-12-11 21:23:37 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2003-12-11 21:23:37 +0000 |
| commit | 10e3320115a0fd419829016e29a62ca806081878 (patch) | |
| tree | fb84266ca65361a8ca29f29daffb1e7fd1217b12 /wiretap | |
| parent | 95ea01a41ad9ca8a1b3514c1bef8a69141721bf0 (diff) | |
| download | wireshark-10e3320115a0fd419829016e29a62ca806081878.tar.gz wireshark-10e3320115a0fd419829016e29a62ca806081878.tar.bz2 wireshark-10e3320115a0fd419829016e29a62ca806081878.zip | |
prevent MSVC warning:
"warning C4761: Gr��enkonflikt im Argument. Konvertierung vorgenommen"
-> size conflict in argument, conversion done
svn path=/trunk/; revision=9244
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/erf.c | 4 | ||||
| -rw-r--r-- | wiretap/lanalyzer.c | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 6c650b9b16..491046f88e 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -32,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * -* $Id: erf.c,v 1.4 2003/10/01 07:11:46 guy Exp $ +* $Id: erf.c,v 1.5 2003/12/11 21:23:37 ulfl Exp $ */ /* @@ -203,7 +203,7 @@ int erf_open(wtap *wth, int *err) wth->file_encap = (common_type < 0 ? WTAP_ENCAP_PER_PACKET - : erf_encap_to_wtap_encap(wth->capture.erf, common_type)); + : erf_encap_to_wtap_encap(wth->capture.erf, (guint8) common_type)); wth->subtype_read = erf_read; wth->subtype_seek_read = erf_seek_read; diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 6b27df5b18..6bdeafa360 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -1,6 +1,6 @@ /* lanalyzer.c * - * $Id: lanalyzer.c,v 1.40 2003/10/01 07:11:47 guy Exp $ + * $Id: lanalyzer.c,v 1.41 2003/12/11 21:23:37 ulfl Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -742,49 +742,49 @@ static gboolean lanalyzer_dump_header(wtap_dumper *wdh, int *err) *err = s16write(htoles(SummarySize), wdh->fh); /* rlen */ if (*err) return FALSE; - *err = s8write(fT->tm_mday, wdh->fh); /* s.datcre.day */ + *err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.datcre.day */ if (*err) return FALSE; - *err = s8write(fT->tm_mon+1, wdh->fh); /* s.datcre.mon */ + *err = s8write((guint8) (fT->tm_mon+1), wdh->fh); /* s.datcre.mon */ if (*err) return FALSE; *err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datcre.year */ if (*err) return FALSE; - *err = s8write(fT->tm_mday, wdh->fh); /* s.datclo.day */ + *err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.datclo.day */ if (*err) return FALSE; - *err = s8write(fT->tm_mon+1, wdh->fh); /* s.datclo.mon */ + *err = s8write((guint8) (fT->tm_mon+1), wdh->fh); /* s.datclo.mon */ if (*err) return FALSE; *err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datclo.year */ if (*err) return FALSE; - *err = s8write(fT->tm_sec, wdh->fh); /* s.timeopn.second */ + *err = s8write((guint8) fT->tm_sec, wdh->fh); /* s.timeopn.second */ if (*err) return FALSE; - *err = s8write(fT->tm_min, wdh->fh); /* s.timeopn.minute */ + *err = s8write((guint8) fT->tm_min, wdh->fh); /* s.timeopn.minute */ if (*err) return FALSE; - *err = s8write(fT->tm_hour, wdh->fh); /* s.timeopn.hour */ + *err = s8write((guint8) fT->tm_hour, wdh->fh); /* s.timeopn.hour */ if (*err) return FALSE; - *err = s8write(fT->tm_mday, wdh->fh); /* s.timeopn.mday */ + *err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.timeopn.mday */ if (*err) return FALSE; *err = s0write(2, wdh->fh); if (*err) return FALSE; - *err = s8write(fT->tm_sec, wdh->fh); /* s.timeclo.second */ + *err = s8write((guint8) fT->tm_sec, wdh->fh); /* s.timeclo.second */ if (*err) return FALSE; - *err = s8write(fT->tm_min, wdh->fh); /* s.timeclo.minute */ + *err = s8write((guint8) fT->tm_min, wdh->fh); /* s.timeclo.minute */ if (*err) return FALSE; - *err = s8write(fT->tm_hour, wdh->fh); /* s.timeclo.hour */ + *err = s8write((guint8) fT->tm_hour, wdh->fh); /* s.timeclo.hour */ if (*err) return FALSE; - *err = s8write(fT->tm_mday, wdh->fh); /* s.timeclo.mday */ + *err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.timeclo.mday */ if (*err) return FALSE; *err = s0write(2, wdh->fh); |