diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-04-22 03:07:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-04-22 03:07:37 +0000 |
| commit | ad33ca6c2f33d2b842d2b7891513d57336ab89cc (patch) | |
| tree | df299ef604107c294e223b6c40431136cdb90cd4 /epan/ftypes | |
| parent | 043b2b20ac210a0f29894909da7f29473e8c5161 (diff) | |
Clean up some 64-bit issues.
svn path=/trunk/; revision=28117
Diffstat (limited to 'epan/ftypes')
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 2 | ||||
| -rw-r--r-- | epan/ftypes/ftype-guid.c | 2 | ||||
| -rw-r--r-- | epan/ftypes/ftype-integer.c | 2 | ||||
| -rw-r--r-- | epan/ftypes/ftype-pcre.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index 19f2ba0eda..c8d33a16d9 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -494,7 +494,7 @@ cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) pcre_t->re, /* Compiled PCRE */ pcre_t->ex, /* PCRE extra from pcre_study() */ a->str, /* The data to check for the pattern... */ - a->len, /* ... and its length */ + (int)a->len, /* ... and its length */ 0, /* Start offset within data */ options, /* PCRE options */ NULL, /* We are not interested in the matched string */ diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c index 622da5f4d2..c171b55ef6 100644 --- a/epan/ftypes/ftype-guid.c +++ b/epan/ftypes/ftype-guid.c @@ -66,7 +66,7 @@ get_guid(char *s, e_guid_t *guid) p = s; strncpy(digits, p, 8); digits[8] = '\0'; - guid->data1 = strtoul(digits, NULL, 16); + guid->data1 = (guint32)strtoul(digits, NULL, 16); p += 9; strncpy(digits, p, 4); digits[4] = '\0'; diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index 8a3bb5aa7a..d12b38e4d5 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -102,7 +102,7 @@ val_from_unparsed(fvalue_t *fv, char *s, gboolean allow_partial_value _U_, LogFu return FALSE; } - fv->value.uinteger = value; + fv->value.uinteger = (guint32)value; return TRUE; } diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c index 01b01f1bb1..2edd34b8bf 100644 --- a/epan/ftypes/ftype-pcre.c +++ b/epan/ftypes/ftype-pcre.c @@ -145,7 +145,7 @@ static int pcre_repr_len(fvalue_t *fv, ftrepr_t rtype) { g_assert(rtype == FTREPR_DFILTER); - return strlen(fv->value.re->string); + return (int)strlen(fv->value.re->string); } static void |