diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-06-23 20:23:29 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-06-23 20:23:29 +0000 |
| commit | dd6c6af3e4ae4fd27b9c552a45b27eb4f1ea2aa0 (patch) | |
| tree | ec481f712992adf1227076d2f2ed550adf82df16 /epan/ftypes/ftype-tvbuff.c | |
| parent | ee78dbb925737828923a466906c679f15d401c34 (diff) | |
Rename some variables to avoid shadowing warnings.
svn path=/trunk/; revision=25543
Diffstat (limited to 'epan/ftypes/ftype-tvbuff.c')
| -rw-r--r-- | epan/ftypes/ftype-tvbuff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c index 201d73de4b..c4449a12d1 100644 --- a/epan/ftypes/ftype-tvbuff.c +++ b/epan/ftypes/ftype-tvbuff.c @@ -315,7 +315,7 @@ static gboolean cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) { tvbuff_t *tvb = fv_a->value.tvb; - pcre_tuple_t *pcre = fv_b->value.re; + pcre_tuple_t *pcre_t = fv_b->value.re; int options = 0; volatile int rc = 1; const char *data = NULL; /* tvb data */ @@ -328,15 +328,15 @@ cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) if (strcmp(fv_b->ftype->name, "FT_PCRE") != 0) { return FALSE; } - if (! pcre) { + if (! pcre_t) { return FALSE; } TRY { tvb_len = tvb_length(tvb); data = (const char *)tvb_get_ptr(tvb, 0, tvb_len); rc = pcre_exec( - pcre->re, /* Compiled PCRE */ - pcre->ex, /* PCRE extra from pcre_study() */ + pcre_t->re, /* Compiled PCRE */ + pcre_t->ex, /* PCRE extra from pcre_study() */ data, /* The data to check for the pattern... */ tvb_len, /* ... and its length */ 0, /* Start offset within data */ |