summaryrefslogtreecommitdiff
path: root/tethereal.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-04 02:50:21 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-04 02:50:21 +0000
commitcc7347ebf6888d718c1216ff81488447eaaeafcd (patch)
tree571378721f73038ee7db6c58e814cde559b8a647 /tethereal.c
parent52bf3d770f472b5a605ac4114c9ef1535a041f2f (diff)
downloadwireshark-cc7347ebf6888d718c1216ff81488447eaaeafcd.tar.gz
Allow a dissector to register preferences that it no longer supports as
obsolete; we silently ignore attempts to set those in a preferences file, so that we don't spam the user with error messages caused by them having saved preferences in an earlier release that contained those preferences. Make the Diameter and iSCSI dissectors register obsolete preferences. Crash if some code tries to register a preferences module with a name that contains something other than lower-case ASCII letters, numbers, or underscores, or that has already been registered, or if some code tries to register a preference with a name that contains something other than lower-case ASCII letters, numbers, underscores, or periods, or that has already been registered, so that we don't put code like that in a release and have to shovel code into "prefs.c" to fix it up later. (The problem with multiple modules or preferences with the same name should be obvious; the problem with names with blanks, or upper-case letters, or punctuation, is that they're a pain to type on the command line.) svn path=/trunk/; revision=4148
Diffstat (limited to 'tethereal.c')
-rw-r--r--tethereal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tethereal.c b/tethereal.c
index 9035db8e0c..75de86f80e 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
/* tethereal.c
*
- * $Id: tethereal.c,v 1.95 2001/10/26 18:28:16 gram Exp $
+ * $Id: tethereal.c,v 1.96 2001/11/04 02:50:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -446,6 +446,7 @@ main(int argc, char *argv[])
break;
case PREFS_SET_NO_SUCH_PREF:
+ case PREFS_SET_OBSOLETE:
fprintf(stderr, "tethereal: -o flag \"%s\" specifies unknown preference\n",
optarg);
exit(1);