Having to update NSETOPTION/NSETWINDOWOPTION when adding new options is a bit

annoying and it is only use for iterating, so use a sentinel to mark the end of
each array instead. Different fix for a problem pointed out by Kalle Olavi
Niemitalo.
This commit is contained in:
Nicholas Marriott
2009-07-15 17:44:47 +00:00
parent 6ebb1df8fe
commit ff90170738
6 changed files with 23 additions and 33 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-show-options.c,v 1.14 2009-07-14 06:43:33 nicm Exp $ */
/* $Id: cmd-show-options.c,v 1.15 2009-07-15 17:44:47 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -49,7 +49,6 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
struct session *s;
struct options *oo;
const struct set_option_entry *entry;
u_int i;
char *vs;
long long vn;
@ -61,9 +60,7 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
oo = &s->options;
}
for (i = 0; i < NSETOPTION; i++) {
entry = &set_option_table[i];
for (entry = set_option_table; entry->name != NULL; entry++) {
if (options_find1(oo, entry->name) == NULL)
continue;