print_help and print_usage() cleanup

[nagiosplug.git] / plugins / check_nt.c

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 8d66092d4f9781547020e7ccfede00afd31aab29..4826d68722dda72c89ebea4d1f0ecfb7a8659450 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -26,8 +26,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ * $Id$
+ *
  *****************************************************************************/
 
+const char *progname = "check_nt";
+const char *revision = "$Revision$";
+const char *copyright = "2003-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -63,8 +70,6 @@ int check_critical_value=FALSE;
 enum checkvars vars_to_check = CHECK_NONE;
 int show_all=FALSE;
 
-const char *progname = "check_nt";
-
 char recv_buffer[MAX_INPUT_BUFFER];
 
 void fetch_data (const char* address, int port, const char* sendb);
@@ -75,6 +80,9 @@ void print_help(void);
 void print_usage(void);
 
 int main(int argc, char **argv){
+
+/* should be   int result = STATE_UNKNOWN; */
+
        int return_code = STATE_UNKNOWN;
        char *send_buffer=NULL;
        char *output_message=NULL;
@@ -108,8 +116,8 @@ int main(int argc, char **argv){
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if(process_arguments(argc,argv)==ERROR)
-               usage(_("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);
@@ -188,7 +196,7 @@ int main(int argc, char **argv){
                updays = uptime / 86400;                        
                uphours = (uptime % 86400) / 3600;
                upminutes = ((uptime % 86400) % 3600) / 60;
-               asprintf(&output_message,_("System Uptime : %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
+               asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
                return_code=STATE_OK;
                break;
 
@@ -427,9 +435,6 @@ int main(int argc, char **argv){
 
 
 
-
-
-\f
 /* process command-line arguments */
 int process_arguments(int argc, char **argv){
        int c;
@@ -557,9 +562,6 @@ int process_arguments(int argc, char **argv){
 
 
 
-
-
-\f
 void fetch_data (const char *address, int port, const char *sendb) {
        int result;
 
@@ -603,17 +605,18 @@ void preparelist(char *string) {
 
 
 
-
-
-\f
 void print_help(void)
 {
-       print_revision(progname,"$Revision$");
-       printf (_("\
-Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n\n\
-This plugin collects data from the NSClient service running on a\n\
-Windows NT/2000/XP server.\n\n"));
+       print_revision(progname,revision);
+       
+       printf (_("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n"));
+       printf (COPYRIGHT, copyright, email);
+       
+       printf (_("This plugin collects data from the NSClient service running on a\n\
+Windows NT/2000/XP/2003 server.\n\n"));
+
        print_usage();
+       
   printf (_("\nOptions:\n\
 -H, --hostname=HOST\n\
   Name of the host to check\n\
@@ -630,8 +633,8 @@ Windows NT/2000/XP server.\n\n"));
 -h, --help\n\
   Print this help screen\n\
 -V, --version\n\
-  Print version information\n"),
-               PORT, DEFAULT_SOCKET_TIMEOUT);
+  Print version information\n"), PORT, DEFAULT_SOCKET_TIMEOUT);
+       
   printf (_("\
 -v, --variable=STRING\n\
   Variable to check.  Valid variables are:\n"));
@@ -681,11 +684,9 @@ Windows NT/2000/XP server.\n\n"));
 
 
 
-
 void print_usage(void)
 {
-       printf(_("\
+       printf("\
 Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\
-  [-l params] [-d SHOWALL] [-t timeout]\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+                  [-l params] [-d SHOWALL] [-t timeout]\n", progname);
 }