osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't report a syntax error if a preference name without a "." is 

specified, report it as "no such preference" instead.  That should be
less confusing; see

   http://stackoverflow.com/questions/17757659/how-to-apply-and-override-preferences-with-tshark

for an example of confusion.

#BACKPORT 1.10, 1.8

svn path=/trunk/; revision=50745
This commit is contained in:
Guy Harris 2013-07-21 00:56:42 +00:00
parent 6635f5ef67
commit 21609c54bb
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/prefs.c
View File

@ -3562,7 +3562,6 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_,
gchar *filter_expr = NULL; gchar *filter_expr = NULL;
module_t *module; module_t *module;
pref_t *pref; pref_t *pref;
gboolean had_a_dot;
if (strcmp(pref_name, PRS_GUI_FILTER_LABEL) == 0) { if (strcmp(pref_name, PRS_GUI_FILTER_LABEL) == 0) {
filter_label = g_strdup(value); filter_label = g_strdup(value);
@ -3624,21 +3623,12 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_,
/* To which module does this preference belong? */ /* To which module does this preference belong? */
module = NULL; module = NULL;
last_dotp = pref_name; last_dotp = pref_name;
had_a_dot = FALSE;
while (!module) { while (!module) {
dotp = strchr(last_dotp, '.'); dotp = strchr(last_dotp, '.');
if (dotp == NULL) { if (dotp == NULL) {
if (had_a_dot) { /* Either there's no such module, or no module was specified.
/* no such module */ In either case, that means there's no such preference. */
return PREFS_SET_NO_SUCH_PREF; return PREFS_SET_NO_SUCH_PREF;
}
else {
/* no ".", so no module/name separator */
return PREFS_SET_SYNTAX_ERR;
}
}
else {
had_a_dot = TRUE;
} }
*dotp = '\0'; /* separate module and preference name */ *dotp = '\0'; /* separate module and preference name */
module = prefs_find_module(pref_name); module = prefs_find_module(pref_name);