Просмотр исходного кода

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

Thomas Guyot-Sionnest 16 лет назад
Родитель
Сommit
08d8d11941
3 измененных файлов с 5 добавлено и 3 удалено
  1. 1 0
      NEWS
  2. 1 0
      THANKS.in
  3. 3 3
      plugins/check_ide_smart.c

+ 1 - 0
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
 	Fix usage of repeated -o options in check_snmp
 	Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
 	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 memory leak in check_http for large pages (Jimmy Bergman - #2957455)
+	Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)
 	WARNINGS
 	WARNINGS
 	Updated developer documentation to say that performance labels should not have an equals sign or
 	Updated developer documentation to say that performance labels should not have an equals sign or
 	single quote in the label
 	single quote in the label

+ 1 - 0
THANKS.in

@@ -259,3 +259,4 @@ Grant Byers
 Marcel Kuiper
 Marcel Kuiper
 Bryan Irvine
 Bryan Irvine
 Jimmy Bergman
 Jimmy Bergman
+Konstantin Khomoutov

+ 3 - 3
plugins/check_ide_smart.c

@@ -158,9 +158,6 @@ main (int argc, char *argv[])
 	values_t values;
 	values_t values;
 	int fd;
 	int fd;
 
 
-	/* Parse extra opts if any */
-	argv=np_extra_opts (&argc, argv, progname);
-
 	static struct option longopts[] = { 
 	static struct option longopts[] = { 
 		{"device", required_argument, 0, 'd'}, 
 		{"device", required_argument, 0, 'd'}, 
 		{"immediate", no_argument, 0, 'i'}, 
 		{"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, "");
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
 	textdomain (PACKAGE);