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-string.c | |
| parent | ee78dbb925737828923a466906c679f15d401c34 (diff) | |
Rename some variables to avoid shadowing warnings.
svn path=/trunk/; revision=25543
Diffstat (limited to 'epan/ftypes/ftype-string.c')
| -rw-r--r-- | epan/ftypes/ftype-string.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index c355ce856d..5cfe5caa94 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -259,7 +259,7 @@ static gboolean cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) { char *str = fv_a->value.string; - pcre_tuple_t *pcre = fv_b->value.re; + pcre_tuple_t *pcre_t = fv_b->value.re; int options = 0; int rc; @@ -270,12 +270,12 @@ 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; } 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() */ str, /* The data to check for the pattern... */ (int)strlen(str), /* ... and its length */ 0, /* Start offset within data */ |