diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-14 15:22:53 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-14 14:25:36 +0000 |
| commit | e11db2ea032080f07e38acb00b2e4ea3a224b366 (patch) | |
| tree | bbea6f1d2ab74a52abb88239ba31a0dd4a7711be /capture_opts.h | |
| parent | 560762044def0985f8dabd759bf3cfd7c62523cd (diff) | |
| download | wireshark-e11db2ea032080f07e38acb00b2e4ea3a224b366.tar.gz | |
Rename parameter if_index to stop clang warning:
capture_opts.c:1017:61: error: declaration of 'index' shadows a global declaration [-Werror=shadow]
Change-Id: Ie409b4fa7abeb85e460bea398735cdc98d9034b1
Reviewed-on: https://code.wireshark.org/review/3041
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'capture_opts.h')
| -rw-r--r-- | capture_opts.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/capture_opts.h b/capture_opts.h index 3d88f647cb..a603a6e330 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -31,7 +31,7 @@ #define __CAPTURE_OPTS_H__ #ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> /* for gid_t */ +# include <sys/types.h> /* for gid_t */ #endif #include <caputils/capture_ifinfo.h> @@ -76,7 +76,7 @@ extern "C" { #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) #define LONGOPT_BUFFER_SIZE \ - {(char *)"buffer-size", required_argument, NULL, 'B'}, + {(char *)"buffer-size", required_argument, NULL, 'B'}, #define OPTSTRING_B "B:" #else #define LONGOPT_BUFFER_SIZE @@ -105,7 +105,7 @@ extern "C" { {(char *)"linktype", required_argument, NULL, 'y'}, #define OPTSTRING_CAPTURE_COMMON \ - "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:" + "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:" #ifdef HAVE_PCAP_REMOTE /* Type of capture source */ @@ -339,7 +339,7 @@ capture_opts_default_iface_if_necessary(capture_options *capture_opts, const char *capture_device); extern void -capture_opts_del_iface(capture_options *capture_opts, guint index); +capture_opts_del_iface(capture_options *capture_opts, guint if_index); extern void collect_ifaces(capture_options *capture_opts); |