diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-28 18:45:46 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-28 18:45:46 +0000 |
| commit | 9d663d7081ba8204a3b43fcfb84a460a82c38ba0 (patch) | |
| tree | baadc97af6d6e836a3eea362eaea9c22bd80104b /epan/tvbparse.c | |
| parent | 8a39d11aa1a70ca1c51317833c2e7d90441c5df8 (diff) | |
| download | wireshark-9d663d7081ba8204a3b43fcfb84a460a82c38ba0.tar.gz wireshark-9d663d7081ba8204a3b43fcfb84a460a82c38ba0.tar.bz2 wireshark-9d663d7081ba8204a3b43fcfb84a460a82c38ba0.zip | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31720
Diffstat (limited to 'epan/tvbparse.c')
| -rw-r--r-- | epan/tvbparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 53bee6fec6..34d78298e2 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -104,7 +104,7 @@ static tvbparse_elem_t* new_tok(tvbparse_t* tt, return tok; } -static int ignore(tvbparse_t* tt,int offset) { +static int ignore_fcn(tvbparse_t* tt,int offset) { int len = 0; int consumed; tvbparse_elem_t* ignored = NULL; @@ -626,7 +626,7 @@ static int cond_seq(tvbparse_t* tt, int offset, const tvbparse_wanted_t * wanted } offset += len; - offset += ignore(tt,offset); + offset += ignore_fcn(tt,offset); } *tok = ret_tok; @@ -1282,7 +1282,7 @@ gboolean tvbparse_peek(tvbparse_t* tt, if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: ENTER offset=%i",offset); #endif - offset += ignore(tt,offset); + offset += ignore_fcn(tt,offset); #ifdef TVBPARSE_DEBUG if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: after ignore offset=%i",offset); @@ -1314,7 +1314,7 @@ tvbparse_elem_t* tvbparse_get(tvbparse_t* tt, if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_GET) g_warning("tvbparse_get: ENTER offset=%i",offset); #endif - offset += ignore(tt,offset); + offset += ignore_fcn(tt,offset); #ifdef TVBPARSE_DEBUG if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_GET) g_warning("tvbparse_get: after ignore offset=%i",offset); |