From Tomas Kukosa - allow a preference name to begin with the string

that's the name of the module, as long as the prefix doesn't end with
"." or "_" (so you can register "tc.tcp.port" or "tc.tcp_port", but not
"tc.tc.port" or "tc.tc_port").

svn path=/trunk/; revision=7351
This commit is contained in:
Guy Harris 2003-03-13 18:17:59 +00:00
parent 9de14cd339
commit 283afef806
1 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
* $Id: prefs.c,v 1.97 2003/03/12 19:45:52 guy Exp $
* $Id: prefs.c,v 1.98 2003/03/13 18:17:59 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -429,7 +429,8 @@ register_preference(module_t *module, const char *name, const char *title,
* Make sure the preference name doesn't begin with the
* module name, as that's redundant and Just Silly.
*/
g_assert(strncmp(name, module->name, strlen(module->name)) != 0);
g_assert((strncmp(name, module->name, strlen(module->name)) != 0) ||
(((name[strlen(module->name)]) != '.') && ((name[strlen(module->name)]) != '_')));
}
/*