diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-27 01:43:24 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-27 01:43:24 +0000 |
| commit | e2dedb59cf196e5a1cd22aca9bacc4bd69f06c1c (patch) | |
| tree | 0d8b6b2ab23d104257c37d2c74723a9e2593c775 /epan/prefs.c | |
| parent | 8f8269777f8a428ba904a29e3421c241170b9286 (diff) | |
If we get a syntax error reading the preferences file, tell which preference we were reading when we got the error.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34655 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index c4d5478fb1..10b7bbb722 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1483,7 +1483,7 @@ read_prefs_file(const char *pf_path, FILE *pf, break; case PREFS_SET_SYNTAX_ERR: - g_warning ("%s line %d: Syntax error %s", pf_path, pline, hint); + g_warning ("%s line %d: Syntax error in preference %s %s", pf_path, pline, cur_var->str, hint); break; case PREFS_SET_NO_SUCH_PREF: @@ -1543,7 +1543,7 @@ read_prefs_file(const char *pf_path, FILE *pf, break; case PREFS_SET_SYNTAX_ERR: - g_warning ("%s line %d: Syntax error %s", pf_path, pline, hint); + g_warning ("%s line %d: Syntax error in preference %s %s", pf_path, pline, cur_var->str, hint); break; case PREFS_SET_NO_SUCH_PREF: @@ -3082,7 +3082,7 @@ write_prefs(char **pf_path_return) cfmt = (fmt_data *) clp->data; col_l = g_list_append(col_l, g_strdup(cfmt->title)); if ((strcmp(cfmt->fmt, cust_format) == 0) && (cfmt->custom_field)) { - prefs_fmt = g_strdup_printf("%s:%s:%d:%c", cfmt->fmt, cfmt->custom_field, + prefs_fmt = g_strdup_printf("%s:%s:%d:%c", cfmt->fmt, cfmt->custom_field, cfmt->custom_occurrence, cfmt->resolved ? 'R' : 'U'); col_l = g_list_append(col_l, prefs_fmt); } else { |