diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-29 16:09:25 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-29 16:09:25 +0000 |
| commit | e4d6610bd5a46d4b81f34bb82a132f60a6b02835 (patch) | |
| tree | b6688a7b2922d82da6c94e25ca74d5753b5c8321 /rawshark.c | |
| parent | 9cc7ad9f664b3db9767b9a5722ae9395cfc65533 (diff) | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31729
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rawshark.c b/rawshark.c index 9b99b3a92b..6aa911cf9d 100644 --- a/rawshark.c +++ b/rawshark.c @@ -445,7 +445,7 @@ main(int argc, char *argv[]) int err; gchar *pipe_name = NULL; gchar *rfilters[64]; - e_prefs *prefs; + e_prefs *prefs_p; char badopt; GLogLevelFlags log_flags; GPtrArray *disp_fields = g_ptr_array_new(); @@ -520,7 +520,7 @@ main(int argc, char *argv[]) /* Set the C-language locale to the native environment. */ setlocale(LC_ALL, ""); - prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, + prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { if (gpf_open_errno != 0) { @@ -546,7 +546,7 @@ main(int argc, char *argv[]) } /* Set the name resolution code's flags from the preferences. */ - g_resolv_flags = prefs->name_resolve; + g_resolv_flags = prefs_p->name_resolve; /* Read the disabled protocols file. */ read_disabled_protos_list(&gdp_path, &gdp_open_errno, &gdp_read_errno, @@ -777,7 +777,7 @@ main(int argc, char *argv[]) } /* Build the column format array */ - build_column_format_array(&cfile.cinfo, prefs->num_cols, TRUE); + build_column_format_array(&cfile.cinfo, prefs_p->num_cols, TRUE); if (n_rfilters != 0) { for (i = 0; i < n_rfilters; i++) { |