Merge branch 'maint' into check_load_macosx

THANKS.in

@@ -392,6 +392,7 @@ Tilman Koschnick
 Tilmann Bubeck
 Tim Laszlo
 Tobias Brox
+Todd Zullinger (tmzullinger)
 Tom Bertelston
 Tom De Blende
 Tom Payerle
@@ -411,4 +412,5 @@ William Leibzon
 William Pietri
 Wolfgang Rosenauer
 Yannick Charton
+Yusuke Hayashi (yusukeh0710)
 Ziya Suzen

plugins-scripts/check_disk_smb.pl

@@ -19,10 +19,7 @@
 #
 
 require 5.004;
-eval "use utf8::all";
-if ( $@ ) {
-    use utf8::all;
-}
+eval { require utf8::all };
 use POSIX;
 use strict;
 use Getopt::Long;

plugins/check_http.c

@@ -1589,7 +1589,7 @@ redir (char *pos, char *status_line)
             if(use_ssl)
                 strcpy (type,"https");
             else
-                strcpy (type,"server_type");
+                strcpy (type,server_type);
             xasprintf(&url, "/%s", url);
             use_ssl = server_type_check (type);
             i = server_port_check (use_ssl);

plugins/check_load.c

@@ -109,10 +109,6 @@ main (int argc, char **argv)
 #ifndef HAVE_GETLOADAVG
 	char input_buffer[MAX_INPUT_BUFFER];
 	int len;
-# ifdef HAVE_PROC_LOADAVG
-	FILE *fp;
-	char *str, *next;
-# endif
 #endif
 
 	setlocale (LC_ALL, "");
@@ -131,23 +127,6 @@ main (int argc, char **argv)
 	if (result != 3)
 		return STATE_UNKNOWN;
 #else
-# ifdef HAVE_PROC_LOADAVG
-	fp = fopen (PROC_LOADAVG, "r");
-	if (fp == NULL) {
-		printf (_("Error opening %s\n"), PROC_LOADAVG);
-		return STATE_UNKNOWN;
-	}
-
-	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-		str = (char *)input_buffer;
-		for(i = 0; i < 3; i++) {
-			la[i] = strtod(str, &next);
-			str = next;
-		}
-	}
-
-	fclose (fp);
-# else
 	child_process = spopen (PATH_TO_UPTIME);
 	if (child_process == NULL) {
 		printf (_("Error opening %s\n"), PATH_TO_UPTIME);
@@ -188,7 +167,6 @@ main (int argc, char **argv)
 		printf (_("Error code %d returned in %s\n"), result, PATH_TO_UPTIME);
 		return STATE_UNKNOWN;
 	}
-# endif
 #endif
 
 	if (take_into_account_cpus == 1) {
@@ -202,11 +180,7 @@ main (int argc, char **argv)
 #ifdef HAVE_GETLOADAVG
 		printf (_("Error in getloadavg()\n"));
 #else
-# ifdef HAVE_PROC_LOADAVG
-		printf (_("Error processing %s\n"), PROC_LOADAVG);
-# else
 		printf (_("Error processing %s\n"), PATH_TO_UPTIME);
-# endif
 #endif
 		return STATE_UNKNOWN;
 	}