osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CLI: Use a better error message for obsolete preferences 

Say that the preference is "obsolete", not "unknown".

Wireshark GUI already uses this language.
This commit is contained in:
João Valverde 2021-12-08 10:43:02 +00:00
parent c29d3b9fa0
commit 1f68f87807
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rawshark.c
View File

@ -603,11 +603,16 @@ main(int argc, char *argv[])
break;
case PREFS_SET_NO_SUCH_PREF:
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies unknown preference", ws_optarg);
ret = INVALID_OPTION;
goto clean_exit;
break;
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies obsolete preference", ws_optarg);
ret = INVALID_OPTION;
goto clean_exit;
break;
}
break;
}

12
tfshark.c
View File

@ -616,16 +616,14 @@ main(int argc, char *argv[])
case PREFS_SET_OK:
break;
case PREFS_SET_SYNTAX_ERR:
cmdarg_err("Invalid -o flag \"%s\"%s%s", ws_optarg,
errmsg ? ": " : "", errmsg ? errmsg : "");
g_free(errmsg);
return 1;
case PREFS_SET_NO_SUCH_PREF:
cmdarg_err("-o flag \"%s\" specifies unknown preference", ws_optarg);
exit_status = INVALID_OPTION;
goto clean_exit;
break;
case PREFS_SET_NO_SUCH_PREF:
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies unknown preference", ws_optarg);
cmdarg_err("-o flag \"%s\" specifies obsolete preference", ws_optarg);
exit_status = INVALID_OPTION;
goto clean_exit;
break;

7
tshark.c
View File

@ -1270,11 +1270,16 @@ main(int argc, char *argv[])
break;
case PREFS_SET_NO_SUCH_PREF:
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies unknown preference", ws_optarg);
exit_status = INVALID_OPTION;
goto clean_exit;
break;
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies obsolete preference", ws_optarg);
exit_status = INVALID_OPTION;
goto clean_exit;
break;
}
break;
}