diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2004-01-25 17:22:57 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2004-01-25 17:22:57 +0000 |
| commit | 111f977cfa71ded320833bf0a103dace671fc824 (patch) | |
| tree | 579d40a41c4b23c73c38026642be5d8bcf5f28d2 /epan/ftypes/ftype-bytes.c | |
| parent | 21c1c34c023a855def95e634911208b78ca5b83c (diff) | |
Remove the cast again and do the proper fix (add right type to union)
svn path=/trunk/; revision=9844
Diffstat (limited to 'epan/ftypes/ftype-bytes.c')
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index e8f1bf75e1..b73b3288cb 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -1,5 +1,5 @@ /* - * $Id: ftype-bytes.c,v 1.23 2004/01/25 17:07:57 jmayer Exp $ + * $Id: ftype-bytes.c,v 1.24 2004/01/25 17:22:57 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -558,7 +558,7 @@ cmp_contains(fvalue_t *fv_a, fvalue_t *fv_b) static gboolean cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) { - GByteArray *a = fv_a->value.bytes; + GString *a = fv_a->value.gstring; pcre_tuple_t *pcre = fv_b->value.re; int options = 0; int rc; @@ -576,7 +576,7 @@ cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) rc = pcre_exec( pcre->re, /* Compiled PCRE */ pcre->ex, /* PCRE extra from pcre_study() */ - (const char *) a->data, /* The data to check for the pattern... */ + a->str, /* The data to check for the pattern... */ a->len, /* ... and its length */ 0, /* Start offset within data */ options, /* PCRE options */ |