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/strutil.c | |
| parent | 8a39d11aa1a70ca1c51317833c2e7d90441c5df8 (diff) | |
| download | wireshark-9d663d7081ba8204a3b43fcfb84a460a82c38ba0.tar.gz | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31720
Diffstat (limited to 'epan/strutil.c')
| -rw-r--r-- | epan/strutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/strutil.c b/epan/strutil.c index f6b9b9e4d7..eebbff38ed 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -993,7 +993,7 @@ escape_string(char *buf, const char *string) const gchar *p; gchar c; char *bufp; - char hex[3]; + char hexbuf[3]; bufp = buf; *bufp++ = '"'; @@ -1008,11 +1008,11 @@ escape_string(char *buf, const char *string) * in ASCII need to be escaped. */ else if (!isprint((unsigned char)c)) { /* c --> \xNN */ - g_snprintf(hex,sizeof(hex), "%02x", (unsigned char) c); + g_snprintf(hexbuf,sizeof(hexbuf), "%02x", (unsigned char) c); *bufp++ = '\\'; *bufp++ = 'x'; - *bufp++ = hex[0]; - *bufp++ = hex[1]; + *bufp++ = hexbuf[0]; + *bufp++ = hexbuf[1]; } /* Other characters are just passed through. */ else { |