Rename some variables to avoid shadowing warnings.

svn path=/trunk/; revision=25543

4 files changed, 14 insertions, 14 deletions

diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index bc074c23a7..38cbb28253 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -476,7 +476,7 @@ static gboolean
 cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b)
 {
 	GString *a = fv_a->value.gstring;
-	pcre_tuple_t *pcre = fv_b->value.re;
+	pcre_tuple_t *pcre_t = fv_b->value.re;
 	int options = 0;
 	int rc;
 
@@ -487,12 +487,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() */
 		a->str,		/* The data to check for the pattern... */
 		a->len,		/* ... and its length */
 		0,			/* Start offset within data */
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 */
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 */
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index 2ff211a3ee..25084237a9 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -387,7 +387,7 @@ slice_func(gpointer data, gpointer user_data)
 
 /* Returns a new FT_BYTES fvalue_t* if possible, otherwise NULL */
 fvalue_t*
-fvalue_slice(fvalue_t *fv, drange *drange)
+fvalue_slice(fvalue_t *fv, drange *d_range)
 {
 	slice_data_t	slice_data;
 	fvalue_t	*new_fv;
@@ -401,7 +401,7 @@ fvalue_slice(fvalue_t *fv, drange *drange)
 	 * drange_get_max_offset().
 	 */
 
-	drange_foreach_drange_node(drange, slice_func, &slice_data);
+	drange_foreach_drange_node(d_range, slice_func, &slice_data);
 
 	new_fv = fvalue_new(FT_BYTES);
 	fvalue_set(new_fv, slice_data.bytes, TRUE);