X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_nwstat.c;h=b791640f5e1d849efb5a7949586fd69699ed0140;hb=edf60f6dceba48555f2534d9a217a8c5913ce029;hp=ec5d5d6c3544227925b1c60d824ca0b6dd5e034f;hpb=d19edd4043c498626fe68308005947975ef0a697;p=nagiosplug.git

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index ec5d5d6..b791640 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -20,7 +20,7 @@
 
 const char *progname = "check_nwstat";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -84,7 +84,7 @@ void print_usage(void);
 
 int
 main(int argc, char **argv) {
-	int result;
+	int result = STATE_UNKNOWN;
 	int sd;
 	char *send_buffer=NULL;
 	char recv_buffer[MAX_INPUT_BUFFER];
@@ -121,8 +121,8 @@ main(int argc, char **argv) {
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
 
-	if (process_arguments(argc,argv)==ERROR)
-		usage(_("check_nwstat: could not parse arguments\n"));
+	if (process_arguments(argc,argv) != TRUE)
+		usage4 (_("Could not parse arguments"));
 
 	/* initialize alarm signal handling */
 	signal(SIGALRM,socket_timeout_alarm_handler);
@@ -293,7 +293,7 @@ main(int argc, char **argv) {
 			return result;
 
 		if (!strcmp(recv_buffer,"-1\n")) {
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 		}	else {
 			free_disk_space=strtoul(recv_buffer,NULL,10);
@@ -318,7 +318,7 @@ main(int argc, char **argv) {
 
 		if (!strcmp(recv_buffer,"-1\n")) {
 
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 
 		} else {
@@ -438,7 +438,7 @@ main(int argc, char **argv) {
 			return result;
 
 		if (!strcmp(recv_buffer,"-1\n")) {
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 		} else {
 			purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -459,7 +459,7 @@ main(int argc, char **argv) {
 
 		if (!strcmp(recv_buffer,"-1\n")) {
 
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 
 		} else {
@@ -491,7 +491,7 @@ main(int argc, char **argv) {
 			return result;
 
 		if (!strcmp(recv_buffer,"-1\n")) {
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 		} else {
 			non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -512,7 +512,7 @@ main(int argc, char **argv) {
 
 		if (!strcmp(recv_buffer,"-1\n")) {
 
-			asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+			asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
 			result=STATE_CRITICAL;
 
 		} else {
@@ -643,7 +643,7 @@ main(int argc, char **argv) {
 			result=STATE_CRITICAL;
 		else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value)
 			result=STATE_WARNING;
-		asprintf (&output_message,_("dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
+		asprintf (&output_message,_("Dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
 
 		/* check % total cache buffers as a percentage of the original*/
 	} else if (vars_to_check==TCB) {
@@ -658,7 +658,7 @@ main(int argc, char **argv) {
 			result=STATE_CRITICAL;
 		else if (check_warning_value==TRUE && total_cache_buffers <= warning_value)
 			result=STATE_WARNING;
-		asprintf (&output_message,_("total cache buffers = %lu%% of the original"),total_cache_buffers);
+		asprintf (&output_message,_("Total cache buffers = %lu%% of the original"),total_cache_buffers);
 		
 	} else if (vars_to_check==DSVER) {
 		asprintf (&send_buffer,"S13\r\n");
@@ -987,8 +987,7 @@ Notes:\n\
 
 void print_usage(void)
 {
-	printf (_("\
+	printf ("\
 Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
-  [-t timeout].\n"), progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+          [-t timeout].\n", progname);
 }