From: Joel Stanley <joel@jms.id.au>
Date: Mon, 7 Feb 2011 04:06:15 +0000 (+1030)
Subject: opt: Fix -Wmissing-field-initializers warning
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=b30c544bd1486e7b60b99259e3d0dcbc1ec9efd0

opt: Fix -Wmissing-field-initializers warning

OPT_ENDTABLE does not initalise all the elements in stuct opt_table.
When compliling with -Wextra -Wmissing-field-initializers is enabled,
which produces the following warning:

        iviewiir.c:299:9: error: missing field 'cb' initializer
              [-Wmissing-field-initializers]
                OPT_ENDTABLE
                ^
        In file included from iviewiir.c:12:
        ./ccan/opt/opt.h:82:38: note: instantiated from:
        #define OPT_ENDTABLE { NULL, OPT_END }
                                             ^
By changing the definition of OPT_ENDTABLE to initalise all 7 elements
of struct opt_table, the warning is silenced.
---

diff --git a/ccan/opt/opt.h b/ccan/opt/opt.h
index 8796752a..a1adc41d 100644
--- a/ccan/opt/opt.h
+++ b/ccan/opt/opt.h
@@ -79,7 +79,7 @@ struct opt_table;
  *
  * This must be the final element in the opt_table array.
  */
-#define OPT_ENDTABLE { NULL, OPT_END }
+#define OPT_ENDTABLE { NULL, OPT_END, NULL, NULL, NULL, NULL, NULL }
 
 /**
  * opt_register_table - register a table of options