aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-multipart.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-04-06 00:08:46 +0000
committerGerald Combs <gerald@wireshark.org>2009-04-06 00:08:46 +0000
commit60d3b4579277e7c3246eb35d8414f89b73b4c0af (patch)
tree59c6a726826c2bef9b834348bbea00a98bebf460 /epan/dissectors/packet-multipart.c
parent7265c99e0c294a875ff3b2aee3521ec25eac9d05 (diff)
More size_t casts/fixes, and string buffers.
svn path=/trunk/; revision=27968
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
-rw-r--r--epan/dissectors/packet-multipart.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 2278ce7b6d..63f23860a3 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -217,7 +217,7 @@ unfold_and_compact_mime_header(const char *lines, gint *first_colon_offset)
if (c == ':') {
lws = FALSE; /* Prevent leading LWS from showing up */
if (colon == -1) {/* First colon */
- colon = q - ret;
+ colon = (gint) (q - ret);
}
*(q++) = sep_seen = c;
p++;
@@ -321,10 +321,11 @@ static char *find_parameter(char *parameters, const char *key, int *retlen)
int keylen = 0;
int len = 0;
- if(!parameters || !*parameters || !key || !(keylen = strlen(key)))
+ if(!parameters || !*parameters || !key || strlen(key) == 0)
/* we won't be able to find anything */
return NULL;
+ keylen = (int) strlen(key);
p = parameters;
while (*p) {