Remove some dead code and add a sanity check to create_fsets().

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@115 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-04-05 05:45:20 +00:00
parent c45c6a69bf
commit 3f0ef54b18

View File

@@ -525,19 +525,15 @@ void create_fsets(Window *win, int ansi)
#ifdef VAR_DEBUG #ifdef VAR_DEBUG
int i; int i;
for (i = 1; i < NUMBER_OF_CSETS - 1; i++) for (i = 1; i < NUMBER_OF_FSET - 1; i++)
if (strcmp(fset_array[i-1].name, fset_array[i].name) >= 0) if (strcmp(fset_array[i-1].name, fset_array[i].name) >= 0)
ircpanic("Variable [%d] (%s) is out of order.", i, fset_array[i].name); ircpanic("Variable [%d] (%s) is out of order.", i, fset_array[i].name);
#endif #endif
#if 0
fset_string_var(FORMAT_381_FSET, DEFAULT_FORMAT_381_FSET); if (sizeof fset_array / sizeof fset_array[0] != NUMBER_OF_FSET + 1)
fset_string_var(FORMAT_391_FSET, DEFAULT_FORMAT_391_FSET); ircpanic("Inconsistent fset_array - %d != %d",
fset_string_var(FORMAT_471_FSET, DEFAULT_FORMAT_471_FSET); sizeof fset_array / sizeof fset_array[0], NUMBER_OF_FSET + 1);
fset_string_var(FORMAT_473_FSET, DEFAULT_FORMAT_473_FSET);
fset_string_var(FORMAT_474_FSET, DEFAULT_FORMAT_474_FSET);
fset_string_var(FORMAT_475_FSET, DEFAULT_FORMAT_475_FSET);
fset_string_var(FORMAT_476_FSET, DEFAULT_FORMAT_476_FSET);
#else
add_numeric_fset("381", 0, DEFAULT_FORMAT_381_FSET, 0); add_numeric_fset("381", 0, DEFAULT_FORMAT_381_FSET, 0);
add_numeric_fset("391", 0, DEFAULT_FORMAT_391_FSET, 0); add_numeric_fset("391", 0, DEFAULT_FORMAT_391_FSET, 0);
add_numeric_fset("471", 0, DEFAULT_FORMAT_471_FSET, 0); add_numeric_fset("471", 0, DEFAULT_FORMAT_471_FSET, 0);
@@ -545,7 +541,7 @@ void create_fsets(Window *win, int ansi)
add_numeric_fset("474", 0, DEFAULT_FORMAT_474_FSET, 0); add_numeric_fset("474", 0, DEFAULT_FORMAT_474_FSET, 0);
add_numeric_fset("475", 0, DEFAULT_FORMAT_475_FSET, 0); add_numeric_fset("475", 0, DEFAULT_FORMAT_475_FSET, 0);
add_numeric_fset("476", 0, DEFAULT_FORMAT_476_FSET, 0); add_numeric_fset("476", 0, DEFAULT_FORMAT_476_FSET, 0);
#endif
fset_string_var(FORMAT_ACTION_FSET, DEFAULT_FORMAT_ACTION_FSET); fset_string_var(FORMAT_ACTION_FSET, DEFAULT_FORMAT_ACTION_FSET);
fset_string_var(FORMAT_ACTION_AR_FSET, DEFAULT_FORMAT_ACTION_AR_FSET); fset_string_var(FORMAT_ACTION_AR_FSET, DEFAULT_FORMAT_ACTION_AR_FSET);
fset_string_var(FORMAT_ACTION_CHANNEL_FSET, DEFAULT_FORMAT_ACTION_CHANNEL_FSET); fset_string_var(FORMAT_ACTION_CHANNEL_FSET, DEFAULT_FORMAT_ACTION_CHANNEL_FSET);