| Message ID | 1503564371-26090-12-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 24, 2017 at 10:46 AM, Markus Armbruster <armbru@redhat.com> wrote: > Currently, the FOO_lookup[] generated for QAPI enum types are > terminated by a NULL sentinel. > > A future patch will generate enums with "holes". NULL-termination > will cease to work then. > > To prepare for that, replace "have we reached the sentinel?" > predicates by "have we reached the FOO__MAX value?" predicates. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > monitor.c | 4 ++-- > tests/test-qobject-input-visitor.c | 2 +- > tests/test-string-input-visitor.c | 2 +- > ui/input-legacy.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/monitor.c b/monitor.c > index e0f8801..b45f55d 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -3249,7 +3249,7 @@ void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str) > } > len = strlen(str); > readline_set_completion_index(rs, len); > - for (i = 0; NetClientDriver_lookup[i]; i++) { > + for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) { > add_completion_option(rs, str, NetClientDriver_lookup[i]); > } > } > @@ -3537,7 +3537,7 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) > return; > } > readline_set_completion_index(rs, strlen(str)); > - for (i = 0; WatchdogExpirationAction_lookup[i]; i++) { > + for (i = 0; i < WATCHDOG_EXPIRATION_ACTION__MAX; i++) { > add_completion_option(rs, str, WatchdogExpirationAction_lookup[i]); > } > } > diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c > index bcf0261..5bbfb65 100644 > --- a/tests/test-qobject-input-visitor.c > +++ b/tests/test-qobject-input-visitor.c > @@ -382,7 +382,7 @@ static void test_visitor_in_enum(TestInputVisitorData *data, > Visitor *v; > EnumOne i; > > - for (i = 0; EnumOne_lookup[i]; i++) { > + for (i = 0; i < ENUM_ONE__MAX; i++) { > EnumOne res = -1; > > v = visitor_input_test_init(data, "%s", EnumOne_lookup[i]); > diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c > index 79313a7..e7a7b80 100644 > --- a/tests/test-string-input-visitor.c > +++ b/tests/test-string-input-visitor.c > @@ -279,7 +279,7 @@ static void test_visitor_in_enum(TestInputVisitorData *data, > Visitor *v; > EnumOne i; > > - for (i = 0; EnumOne_lookup[i]; i++) { > + for (i = 0; i < ENUM_ONE__MAX; i++) { > EnumOne res = -1; > > v = visitor_input_test_init(data, EnumOne_lookup[i]); > diff --git a/ui/input-legacy.c b/ui/input-legacy.c > index 7159747..a5f1e82 100644 > --- a/ui/input-legacy.c > +++ b/ui/input-legacy.c > @@ -61,7 +61,7 @@ int index_from_key(const char *key, size_t key_length) > { > int i; > > - for (i = 0; QKeyCode_lookup[i] != NULL; i++) { > + for (i = 0; i < Q_KEY_CODE__MAX; i++) { > if (!strncmp(key, QKeyCode_lookup[i], key_length) && > !QKeyCode_lookup[i][key_length]) { > break; > -- > 2.7.5 > >
diff --git a/monitor.c b/monitor.c index e0f8801..b45f55d 100644 --- a/monitor.c +++ b/monitor.c @@ -3249,7 +3249,7 @@ void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str) } len = strlen(str); readline_set_completion_index(rs, len); - for (i = 0; NetClientDriver_lookup[i]; i++) { + for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) { add_completion_option(rs, str, NetClientDriver_lookup[i]); } } @@ -3537,7 +3537,7 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) return; } readline_set_completion_index(rs, strlen(str)); - for (i = 0; WatchdogExpirationAction_lookup[i]; i++) { + for (i = 0; i < WATCHDOG_EXPIRATION_ACTION__MAX; i++) { add_completion_option(rs, str, WatchdogExpirationAction_lookup[i]); } } diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c index bcf0261..5bbfb65 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -382,7 +382,7 @@ static void test_visitor_in_enum(TestInputVisitorData *data, Visitor *v; EnumOne i; - for (i = 0; EnumOne_lookup[i]; i++) { + for (i = 0; i < ENUM_ONE__MAX; i++) { EnumOne res = -1; v = visitor_input_test_init(data, "%s", EnumOne_lookup[i]); diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c index 79313a7..e7a7b80 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -279,7 +279,7 @@ static void test_visitor_in_enum(TestInputVisitorData *data, Visitor *v; EnumOne i; - for (i = 0; EnumOne_lookup[i]; i++) { + for (i = 0; i < ENUM_ONE__MAX; i++) { EnumOne res = -1; v = visitor_input_test_init(data, EnumOne_lookup[i]); diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 7159747..a5f1e82 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -61,7 +61,7 @@ int index_from_key(const char *key, size_t key_length) { int i; - for (i = 0; QKeyCode_lookup[i] != NULL; i++) { + for (i = 0; i < Q_KEY_CODE__MAX; i++) { if (!strncmp(key, QKeyCode_lookup[i], key_length) && !QKeyCode_lookup[i][key_length]) { break;
Currently, the FOO_lookup[] generated for QAPI enum types are terminated by a NULL sentinel. A future patch will generate enums with "holes". NULL-termination will cease to work then. To prepare for that, replace "have we reached the sentinel?" predicates by "have we reached the FOO__MAX value?" predicates. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- monitor.c | 4 ++-- tests/test-qobject-input-visitor.c | 2 +- tests/test-string-input-visitor.c | 2 +- ui/input-legacy.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)