From 0d444f1bff11b3837611988f4226b86f9ce34d0d Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Tue, 5 Oct 2010 14:46:14 +0200
Subject: [PATCH 1/3] Use POPT_TABLEEND to close option table

---
 src/tests/auth-tests.c          |    2 +-
 src/tests/krb5_utils-tests.c    |    2 +-
 src/tests/simple_access-tests.c |    2 +-
 src/tests/stress-tests.c        |    4 ++--
 src/tests/strtonum-tests.c      |    2 +-
 src/tests/sysdb-tests.c         |    2 +-
 src/tests/util-tests.c          |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tests/auth-tests.c b/src/tests/auth-tests.c
index bae0794..abdc874 100644
--- a/src/tests/auth-tests.c
+++ b/src/tests/auth-tests.c
@@ -305,7 +305,7 @@ int main(int argc, const char *argv[])
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         SSSD_MAIN_OPTS
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
diff --git a/src/tests/krb5_utils-tests.c b/src/tests/krb5_utils-tests.c
index 54b18cb..d5d1f09 100644
--- a/src/tests/krb5_utils-tests.c
+++ b/src/tests/krb5_utils-tests.c
@@ -639,7 +639,7 @@ int main(int argc, const char *argv[])
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         SSSD_MAIN_OPTS
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c
index f1d3775..c9bf4ea 100644
--- a/src/tests/simple_access-tests.c
+++ b/src/tests/simple_access-tests.c
@@ -147,7 +147,7 @@ int main(int argc, const char *argv[])
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         SSSD_MAIN_OPTS
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
diff --git a/src/tests/stress-tests.c b/src/tests/stress-tests.c
index 3b53735..b645c25 100644
--- a/src/tests/stress-tests.c
+++ b/src/tests/stress-tests.c
@@ -214,7 +214,7 @@ int main(int argc, const char *argv[])
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         { "groups", 'g', POPT_ARG_NONE, &pc_groups, 0,
-                    "Lookup in groups instead of users" },
+                    "Lookup in groups instead of users", NULL },
         { "prefix", '\0', POPT_ARG_STRING, &pc_prefix, 0,
                     "The username prefix", NULL },
         { "start",  '\0', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT,
@@ -227,7 +227,7 @@ int main(int argc, const char *argv[])
                     "Fail on not getting the requested NSS data (default: No)",
                     NULL },
         { "verbose", 'v', POPT_ARG_NONE, 0, 'v',
-                    "Be verbose" },
+                    "Be verbose", NULL },
         POPT_TABLEEND
     };
 
diff --git a/src/tests/strtonum-tests.c b/src/tests/strtonum-tests.c
index a7131c1..6c26018 100644
--- a/src/tests/strtonum-tests.c
+++ b/src/tests/strtonum-tests.c
@@ -431,7 +431,7 @@ int main(int argc, const char *argv[]) {
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         SSSD_MAIN_OPTS
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index c2e800b..51eda8f 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -2876,7 +2876,7 @@ int main(int argc, const char *argv[]) {
         SSSD_MAIN_OPTS
         {"no-cleanup", 'n', POPT_ARG_NONE, &no_cleanup, 0,
          _("Do not delete the test database after a test run"), NULL },
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
diff --git a/src/tests/util-tests.c b/src/tests/util-tests.c
index d8d3800..bfc48bb 100644
--- a/src/tests/util-tests.c
+++ b/src/tests/util-tests.c
@@ -200,7 +200,7 @@ int main(int argc, const char *argv[])
     struct poptOption long_options[] = {
         POPT_AUTOHELP
         SSSD_MAIN_OPTS
-        { NULL }
+        POPT_TABLEEND
     };
 
     pc = poptGetContext(argv[0], argc, argv, long_options, 0);
-- 
1.7.2.3