commit 1c236ba5319d6141964fddb38f1d942cebcaed05
author Markus Armbruster <armbru@redhat.com> Thu Aug 24 10:46:06 2017 +0200
committer Markus Armbruster <armbru@redhat.com> Mon Sep 04 13:09:13 2017 +0200
tree 382b6dcf8bceacb9df4c3f23c34b05b2bf3b1c05
parent 113e47ae6dc45b08e732dd5fa85abe71b764f5ae

qapi: Avoid unnecessary use of enum lookup table's sentinel

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>
Message-Id: <1503564371-26090-12-git-send-email-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

monitor.c

diff --git a/monitor.c b/monitor.c
index 135ec2d..86438f4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3249,7 +3249,7 @@
     }
     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 @@
         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]);
     }
 }