From: <ag...@us...> - 2012-09-06 22:25:02
|
Revision: 2157 http://nagios.svn.sourceforge.net/nagios/?rev=2157&view=rev Author: ageric Date: 2012-09-06 22:24:55 +0000 (Thu, 06 Sep 2012) Log Message: ----------- core: Fix a small compiler warning When we have gnu getopt and are compiling with -ansi, we would get a warning about declaration after statement. We fix that here, and reduce the loc-count a little with a simple getopt() macro that wraps getoptlong if it's available. This reduces the possibilities of maintenance errors somewhat as there's only one optstring to take care of. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/base/nagios.c Modified: nagioscore/trunk/base/nagios.c =================================================================== --- nagioscore/trunk/base/nagios.c 2012-09-06 22:24:35 UTC (rev 2156) +++ nagioscore/trunk/base/nagios.c 2012-09-06 22:24:55 UTC (rev 2157) @@ -258,10 +258,6 @@ char datestring[256]; nagios_macros *mac; - mac = get_global_macros(); - - - #ifdef HAVE_GETOPT_H int option_index = 0; static struct option long_options[] = { @@ -277,21 +273,18 @@ {"use-precached-objects", no_argument, 0, 'u'}, {0, 0, 0, 0} }; +#define getopt(argc, argv, o) getopt_long(argc, argv, o, long_options, option_index) #endif + mac = get_global_macros(); + /* make sure we have the correct number of command line arguments */ if(argc < 2) error = TRUE; - /* get all command line arguments */ while(1) { - -#ifdef HAVE_GETOPT_H - c = getopt_long(argc, argv, "+hVvdsoxpu", long_options, &option_index); -#else c = getopt(argc, argv, "+hVvdsoxpu"); -#endif if(c == -1 || c == EOF) break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |