Bladeren bron

Removed dead code (HAVE_PROC_LOADAVG is no longer referenced outside of this plugin, see commit fe856aa957978504137c1d425815d4ed8a22be40)

madlohe 6 jaren geleden
bovenliggende
commit
06168d325c
1 gewijzigde bestanden met toevoegingen van 0 en 26 verwijderingen
  1. 0 26
      plugins/check_load.c

+ 0 - 26
plugins/check_load.c

@@ -108,10 +108,6 @@ main (int argc, char **argv)
 	double la[3] = { 0.0, 0.0, 0.0 };	/* NetBSD complains about uninitialized arrays */
 #ifndef HAVE_GETLOADAVG
 	char input_buffer[MAX_INPUT_BUFFER];
-# ifdef HAVE_PROC_LOADAVG
-	FILE *fp;
-	char *str, *next;
-# endif
 #endif
 
 	setlocale (LC_ALL, "");
@@ -130,23 +126,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);
@@ -173,7 +152,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) {
@@ -187,11 +165,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;
 	}