diff options
author | Gerald Combs <gerald@wireshark.org> | 2009-04-07 04:36:54 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2009-04-07 04:36:54 +0000 |
commit | de23147da291eee9aa4f43a5934f625f2c661c4c (patch) | |
tree | 85cae0eb34c593d691ffbcc97600803bf955b874 /epan | |
parent | c1e3c91b8f9887d44d58b791aeffd1d94b2b6715 (diff) |
More size_t casts.
svn path=/trunk/; revision=27981
Diffstat (limited to 'epan')
-rw-r--r-- | epan/adler32.c | 2 | ||||
-rw-r--r-- | epan/base64.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/adler32.c b/epan/adler32.c index 82cf7b6a00..9f51ce550f 100644 --- a/epan/adler32.c +++ b/epan/adler32.c @@ -53,7 +53,7 @@ unsigned long adler32_bytes(const unsigned char *buf, int len) /*--- adler32_str -----------------------------------------------------------*/ unsigned long adler32_str(const char *buf) { - return update_adler32(1L, (const unsigned char*)buf, strlen(buf)); + return update_adler32(1L, (const unsigned char*)buf, (int)strlen(buf)); } /*---------------------------------------------------------------------------*/ diff --git a/epan/base64.c b/epan/base64.c index 2a1257c82a..d528497e8b 100644 --- a/epan/base64.c +++ b/epan/base64.c @@ -42,7 +42,7 @@ size_t epan_base64_decode(char *s) int cr_idx; /* we will allow CR and LF - but ignore them */ - cr_idx = strchr(b64, '\r') - b64; + cr_idx = (int) (strchr(b64, '\r') - b64); i=0; @@ -75,9 +75,9 @@ base64_to_tvb(const char *base64) { tvbuff_t *tvb; char *data = g_strdup(base64); - size_t len; + gint len; - len = epan_base64_decode(data); + len = (gint) epan_base64_decode(data); tvb = tvb_new_real_data((const guint8 *)data, len, len); tvb_set_free_cb(tvb, g_free); |