[nagiosplug] Fix compilation with GCC 2.96 (Konstantin ...

Thomas Guyot-Sionnest dermoth at users.sourceforge.net
Sat Mar 27 05:14:44 CET 2010


 Module: nagiosplug
 Branch: master
 Commit: 08d8d119411fc875de56fac645b17152425eee46
 Author: Thomas Guyot-Sionnest <dermoth at aei.ca>
   Date: Sat Mar 27 00:13:38 2010 -0400
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=08d8d11

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

---

 NEWS                      |    1 +
 THANKS.in                 |    1 +
 plugins/check_ide_smart.c |    6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index c555dda..58768d3 100644
--- 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 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
diff --git a/THANKS.in b/THANKS.in
index 1966303..1603622 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -259,3 +259,4 @@ Grant Byers
 Marcel Kuiper
 Bryan Irvine
 Jimmy Bergman
+Konstantin Khomoutov
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b0b0189..e036a37 100644
--- 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;
 
-	/* 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'}, 
@@ -173,6 +170,9 @@ main (int argc, char *argv[])
 		{0, 0, 0, 0}
 	};
 
+	/* Parse extra opts if any */
+	argv=np_extra_opts (&argc, argv, progname);
+
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);





More information about the Commits mailing list