remove incorrect check_disk() declaration

[nagiosplug.git] / plugins / check_mysql.c

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index a4a2ed1d8ffbfc46b557d2d9e860f4bee100f804..f806a2799dbfacf200843b4ca1643edd4ab3be07 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -14,7 +14,7 @@
 * This plugin is for testing a mysql server.
 ******************************************************************************/
 
-#define PROGNAME "check_mysql"
+const char *progname = "check_mysql";
 #define REVISION "$Revision$"
 #define COPYRIGHT "1999-2002"
 
@@ -32,7 +32,6 @@ unsigned int db_port = MYSQL_PORT;
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-int check_disk (int usp, int free_disk);
 void print_help (void);
 void print_usage (void);
 
@@ -178,7 +177,7 @@ process_arguments (int argc, char **argv)
                        db_port = atoi (optarg);
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (PROGNAME, REVISION);
+                       print_revision (progname, REVISION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -207,7 +206,7 @@ process_arguments (int argc, char **argv)
        if (strlen(db) == 0 && argc > c)
                db = argv[c++];
 
-       if (is_intnonneg (argv[c]))
+       if (is_intnonneg (argv[c]) && argc > c)
                db_port = atoi (argv[c++]);
 
        return validate_arguments ();
@@ -230,7 +229,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (PROGNAME, REVISION);
+       print_revision (progname, REVISION);
        printf
                ("Copyright (c) 2000 Didi Rieder/Karl DeBisschop\n\n"
                 "This plugin is for testing a mysql server.\n");
@@ -267,5 +266,5 @@ print_usage (void)
        printf
                ("Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password]\n"
                 "       %s --help\n"
-                "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+                "       %s --version\n", progname, progname, progname);
 }