diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-11-26 01:30:41 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-11-26 01:30:41 +0000 |
| commit | b9f950e33f55b16d358595b9a34731dfbbd6b9c0 (patch) | |
| tree | edceb955f602d354e51d4b717c38d671d3bdd322 /epan/dtd_parse.l | |
| parent | ea845e4299211f9274de1673eb23fb3d18e2f3d4 (diff) | |
| download | wireshark-b9f950e33f55b16d358595b9a34731dfbbd6b9c0.tar.gz | |
Fix several [-Wshadow] warnings;
svn path=/trunk/; revision=46194
Diffstat (limited to 'epan/dtd_parse.l')
| -rw-r--r-- | epan/dtd_parse.l | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l index 29a3c5f4e4..e918e138bc 100644 --- a/epan/dtd_parse.l +++ b/epan/dtd_parse.l @@ -60,7 +60,7 @@ static void* pParser; static GString* input_string; - static guint offset; + static guint offsetx; static guint len; static gchar* location; static gchar* attr_name; @@ -307,16 +307,16 @@ static dtd_token_data_t* new_token(gchar* text) { static int my_yyinput(char* buff, guint size) { - if (offset >= len ) { + if (offsetx >= len ) { return YY_NULL; - } else if ( offset + size <= len ) { - memcpy(buff, input_string->str + offset,size); - offset += size; + } else if ( offsetx + size <= len ) { + memcpy(buff, input_string->str + offsetx,size); + offsetx += size; return size; } else { - size = len - offset; - memcpy(buff, input_string->str + offset,size); - offset = len; + size = len - offsetx; + memcpy(buff, input_string->str + offsetx,size); + offsetx = len; return size; } } @@ -324,7 +324,7 @@ static int my_yyinput(char* buff, guint size) { extern dtd_build_data_t* dtd_parse(GString* s) { input_string = s; - offset = 0; + offsetx = 0; len = (guint) input_string->len; pParser = DtdParseAlloc(g_malloc); |