Make socket alarm handler customisable (like c459ca07)

[nagiosplug.git] / plugins / check_mysql_query.c

diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 6c5e436798c5c9b205a66bf477f67814640a71c1..802e345611114be73825d39f7b411d56f03fdf2a 100644 (file)
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -6,8 +6,6 @@
 * Copyright (c) 2006-2007 Nagios Plugins Development Team
 * Original code from check_mysql, copyright 1999 Didi Rieder
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_mysql_query plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_mysql_query";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -192,7 +188,7 @@ process_arguments (int argc, char **argv)
                return ERROR;
 
        while (1) {
-               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:s:q:w:c:", longopts, &option);
+               c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option);
 
                if (c == -1 || c == EOF)
                        break;
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
                        verbose++;
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -271,7 +267,7 @@ validate_arguments (void)
                db_host = strdup("");
 
        if (db_pass == NULL)
-               db_pass == strdup("");
+               db_pass = strdup("");
 
        if (db == NULL)
                db = strdup("");
@@ -286,7 +282,7 @@ print_help (void)
        char *myport;
        asprintf (&myport, "%d", MYSQL_PORT);
 
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf (_(COPYRIGHT), copyright, email);