check_snmp now considers strings returned by SNMP that contain just

[nagiosplug.git] / plugins / check_swap.c

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 04cc1aee4c22c93a76f9ce79f3d1c23605bd807b..ce1f6022900590028464323742142a4a243da732 100644 (file)
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -6,8 +6,6 @@
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -26,12 +24,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_swap";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -463,7 +459,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 ();
@@ -507,7 +503,7 @@ validate_arguments (void)
                return ERROR;
        }
        else if (warn_percent < crit_percent) {
-               usage4 
+               usage4
                        (_("Warning percentage should be more than critical percentage"));
        }
        else if (warn_size_bytes < crit_size_bytes) {
@@ -522,7 +518,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf (_(COPYRIGHT), copyright, email);
 
@@ -532,8 +528,8 @@ print_help (void)
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
-       printf (_(UT_EXTRA_OPTS));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
        printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
@@ -545,18 +541,13 @@ print_help (void)
   printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
   printf (" %s\n", "-a, --allswaps");
   printf ("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
-       printf (_(UT_VERBOSE));
+       printf (UT_VERBOSE);
 
        printf ("\n");
   printf ("%s\n", _("Notes:"));
   printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
-#endif
-
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 
@@ -564,7 +555,7 @@ print_help (void)
 void
 print_usage (void)
 {
-       printf (_("Usage:"));
+       printf ("%s\n", _("Usage:"));
   printf ("%s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
   printf ("%s [-av] -w <bytes_free> -c <bytes_free>\n", progname);
 }