Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)

diff --git a/NEWS b/NEWS
index c555dda00f98f6e93972c6f50a8774a82149aa84..58768d396c423dc897ee01e84cbb497de994882b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ This file documents the major additions and syntax changes between releases.
        Fix usage of repeated -o options in check_snmp
        Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
        Fix memory leak in check_http for large pages (Jimmy Bergman - #2957455)
        Fix usage of repeated -o options in check_snmp
        Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
        Fix memory leak in check_http for large pages (Jimmy Bergman - #2957455)

+       Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)

        WARNINGS
        Updated developer documentation to say that performance labels should not have an equals sign or
        single quote in the label
        WARNINGS
        Updated developer documentation to say that performance labels should not have an equals sign or
        single quote in the label

diff --git a/THANKS.in b/THANKS.in
index 19663032aa0cc0f10966e2968ce6e6a2dbfb00b2..16036222db4383f9506a5c018f86af62e790e395 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -259,3 +259,4 @@ Grant Byers
 Marcel Kuiper
 Bryan Irvine
 Jimmy Bergman
 Marcel Kuiper
 Bryan Irvine
 Jimmy Bergman

+Konstantin Khomoutov

diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b0b0189051e4b642dbfadc1cac31b945fe267ed6..e036a37ae2afe89fbdeff4da09ad04d5ce640eb2 100644 (file)
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -158,9 +158,6 @@ main (int argc, char *argv[])
        values_t values;
        int fd;
 
        values_t values;
        int fd;
 

-       /* Parse extra opts if any */
-       argv=np_extra_opts (&argc, argv, progname);
-

        static struct option longopts[] = { 
                {"device", required_argument, 0, 'd'}, 
                {"immediate", no_argument, 0, 'i'}, 
        static struct option longopts[] = { 
                {"device", required_argument, 0, 'd'}, 
                {"immediate", no_argument, 0, 'i'}, 


@@ -173,6 +170,9 @@ main (int argc, char *argv[])
                {0, 0, 0, 0}
        };
 
                {0, 0, 0, 0}
        };
 

+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+

        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);