first revised patch failed to trap the "break" in while()

[nagiosplug.git] / plugins / check_radius.c

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 0b338c2b2330e80a9309a926bb5fcfc64177f6e7..c71f3b4c37772de2d345c5c065568b77fec53d5b 100644 (file)
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -208,7 +208,6 @@ process_arguments (int argc, char **argv)
 {
        int c;
 
-#ifdef HAVE_GETOPT_H
        int option_index = 0;
        static struct option long_options[] = {
                {"hostname", required_argument, 0, 'H'},
@@ -224,7 +223,6 @@ process_arguments (int argc, char **argv)
                {"help", no_argument, 0, 'h'},
                {0, 0, 0, 0}
        };
-#endif
 
        if (argc < 2)
                return ERROR;
@@ -251,13 +249,8 @@ process_arguments (int argc, char **argv)
        }
 
        while (1) {
-#ifdef HAVE_GETOPT_H
-               c =
-                       getopt_long (argc, argv, "+hVvH:P:F:u:p:t:r:e:", long_options,
+               c = getopt_long (argc, argv, "+hVvH:P:F:u:p:t:r:e:", long_options,
                                                                         &option_index);
-#else
-               c = getopt (argc, argv, "+hVvH:P:F:u:p:t:r:e:");
-#endif
 
                if (c == -1 || c == EOF || c == 1)
                        break;
@@ -340,12 +333,7 @@ void
 print_usage (void)
 {
        printf ("Usage:\n" " %s %s\n"
-#ifdef HAVE_GETOPT_H
                                        " %s (-h | --help) for detailed help\n"
                                        " %s (-V | --version) for version information\n",
-#else
-                                       " %s -h for detailed help\n"
-                                       " %s -V for version information\n",
-#endif
                                        progname, OPTIONS, progname, progname);
 }