diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-04-21 16:57:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-04-21 16:57:52 +0000 |
| commit | 54c159cb41d3d885807ce117b41cfbb444e45e5a (patch) | |
| tree | 26c23c6b5773084609cd0d8ff02dfbd9cf624e1f /epan | |
| parent | 85f8b0d87d42dd092ee8baaa0786d9ef8cf49080 (diff) | |
Turn on -Wshorten-64-to-32 by default, and fix some issues that turned
up (99 44/100% of which were assignments of double-precision
floating-point constants to floats). Hopefully this will catch at least
some P64 issues on UN*X.
svn path=/trunk/; revision=28108
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index dfa7256b2e..10f535eeb9 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -2517,7 +2517,7 @@ info_to_display(tvbuff_t *tvb, proto_item *stt, int offset, int octets, const ch guint16 code16 = 0; guint32 codeipv4 = 0; guint32 code32 = 0; - float codefl = 0.0; + float codefl = 0.0f; /* Print information elements in the specified way */ switch (octets) { diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index b4d38dd331..a436b6b9d1 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -340,7 +340,7 @@ ssl_parse(void) if ((ssl_keys_file = ws_fopen(ssl_keys_list, "r"))) { read_failed = FALSE; fstat(fileno(ssl_keys_file), &statb); - size = statb.st_size; + size = (size_t)statb.st_size; tmp_buf = ep_alloc0(size + 1); nbytes = fread(tmp_buf, 1, size, ssl_keys_file); if (ferror(ssl_keys_file)) { |