X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_game.c;h=05b363af509259c1a4ebc8556306fb90d99835e0;hb=187f86275426bfb501c7180c48161e1e22af1ef7;hp=8b2a6c42f6d229080a436a9923c448604d2c935a;hpb=d19edd4043c498626fe68308005947975ef0a697;p=nagiosplug.git

diff --git a/plugins/check_game.c b/plugins/check_game.c
index 8b2a6c4..05b363a 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -19,7 +19,7 @@
 
 const char *progname = "check_game";
 const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
+const char *copyright = "2002-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -55,7 +55,7 @@ int
 main (int argc, char **argv)
 {
 	char *command_line;
-	int result;
+	int result = STATE_UNKNOWN;
 	FILE *fp;
 	char input_buffer[MAX_INPUT_BUFFER];
 	char *p, *ret[QSTAT_MAX_RETURN_ARGS];
@@ -64,22 +64,9 @@ main (int argc, char **argv)
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
-
-//	result = process_arguments (argc, argv);
 	
 	if (process_arguments (argc, argv) == ERROR)
-		usage (_("check_game: could not parse arguments\n"));
-
-/*	if (result != OK) {
-		printf (_("Incorrect arguments supplied\n"));
-		printf ("\n");
-		print_revision (progname, revision);
-		printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
-		printf (_("License: GPL\n"));
-		printf ("\n");
-		return STATE_UNKNOWN;
-	}
-*/
+		usage4 (_("Could not parse arguments"));
 
 	result = STATE_OK;
 
@@ -116,7 +103,7 @@ main (int argc, char **argv)
 	 */
 
 	if (!strncmp (input_buffer, "unknown option", 14)) {
-		printf (_("ERROR: Host type parameter incorrect!\n"));
+		printf (_("CRITICAL - Host type parameter incorrect!\n"));
 		result = STATE_CRITICAL;
 		return result;
 	}
@@ -136,15 +123,15 @@ main (int argc, char **argv)
 	}
 
 	if (strstr (ret[2], QSTAT_HOST_ERROR)) {
-		printf ("ERROR: Host not found\n");
+		printf (_("CRITICAL - Host not found\n"));
 		result = STATE_CRITICAL;
 	}
 	else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
-		printf ("ERROR: Game server down or unavailable\n");
+		printf (_("CRITICAL - Game server down or unavailable\n"));
 		result = STATE_CRITICAL;
 	}
 	else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
-		printf ("ERROR: Game server timeout\n");
+		printf (_("CRITICAL - Game server timeout\n"));
 		result = STATE_CRITICAL;
 	}
 	else {
@@ -169,7 +156,6 @@ main (int argc, char **argv)
 }
 
 
-
 int
 process_arguments (int argc, char **argv)
 {
@@ -212,9 +198,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?': /* args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h': /* help */
 			print_help ();
 			exit (STATE_OK);
@@ -282,6 +266,7 @@ process_arguments (int argc, char **argv)
 	return validate_arguments ();
 }
 
+
 int
 validate_arguments (void)
 {
@@ -304,17 +289,15 @@ validate_arguments (void)
 }
 
 
-
-
-
 void
 print_help (void)
 {
 	print_revision (progname, revision);
 
-	printf (_(COPYRIGHT), copyright, email);
+	printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
+	printf (COPYRIGHT, copyright, email);
 
-	printf (_("This plugin tests %s connections with the specified host."), progname);
+	printf (_("This plugin tests game server connections with the specified host."));
 
 	print_usage ();
 
@@ -341,14 +324,12 @@ Notes:\n\
 
 
 
-
 void
 print_usage (void)
 {
-	printf (_("\
+	printf ("\
 Usage: %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field]\n\
-  [-pf ping_field]\n"), progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+                  [-pf ping_field]\n", progname);
 }
 
 /******************************************************************************