diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-03-25 15:13:03 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-03-25 15:13:03 +0000 |
| commit | 5aa4b3cecda34d09a255f132fc89f2ecf8c66c67 (patch) | |
| tree | 597d0b313bc20870c962f6efb5189e571a6e8cea | |
| parent | 62353b80441419b6ae5f21a5766fba2ea791bd6d (diff) | |
remove remaining warnings in epan dir and set the "treat warning as error" barrier
(epan/dissectors still waiting for a cleanup)
svn path=/trunk/; revision=21181
| -rw-r--r-- | epan/Makefile.nmake | 2 | ||||
| -rw-r--r-- | epan/column-utils.c | 12 | ||||
| -rw-r--r-- | epan/uat_load.l | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index b6142c89d5..f5635e46f5 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -10,7 +10,7 @@ include Makefile.common ############### no need to modify below this line ######### -CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ +CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ -D_U_="" $(LOCAL_CFLAGS) diff --git a/epan/column-utils.c b/epan/column-utils.c index 570472b51a..cea5fced43 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -710,32 +710,32 @@ col_set_delta_time_dis(frame_data *fd, column_info *cinfo, int col) case(TS_PREC_FIXED_SEC): case(TS_PREC_AUTO_SEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000000000, SECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000000000, SECS); break; case(TS_PREC_FIXED_DSEC): case(TS_PREC_AUTO_DSEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 100000000, DSECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 100000000, DSECS); break; case(TS_PREC_FIXED_CSEC): case(TS_PREC_AUTO_CSEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 10000000, CSECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 10000000, CSECS); break; case(TS_PREC_FIXED_MSEC): case(TS_PREC_AUTO_MSEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000000, MSECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000000, MSECS); break; case(TS_PREC_FIXED_USEC): case(TS_PREC_AUTO_USEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000, USECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs / 1000, USECS); break; case(TS_PREC_FIXED_NSEC): case(TS_PREC_AUTO_NSEC): display_signed_time(cinfo->col_buf[col], COL_MAX_LEN, - fd->del_dis_ts.secs, fd->del_dis_ts.nsecs, NSECS); + (gint32) fd->del_dis_ts.secs, fd->del_dis_ts.nsecs, NSECS); break; default: g_assert_not_reached(); diff --git a/epan/uat_load.l b/epan/uat_load.l index b5ef2ff268..d467d3810e 100644 --- a/epan/uat_load.l +++ b/epan/uat_load.l @@ -286,7 +286,7 @@ static char* undquote(const char* si, guint in_len, guint* len_p) { switch(*(++s)) { case 'a': *(p++) = '\a'; len++; break; case 'b': *(p++) = '\b'; len++; break; - case 'e': *(p++) = '\e'; len++; break; + case 'e': *(p++) = '\033' /* '\e' is non ANSI-C */; len++; break; case 'f': *(p++) = '\f'; len++; break; case 'n': *(p++) = '\n'; len++; break; case 'r': *(p++) = '\r'; len++; break; |