Merge branch 'master' into master

1 files changed, 4 insertions, 7 deletions

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index a607da1e..cd965e31 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -34,9 +34,6 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "popen.h"
 #include "utils.h"
-#include <string.h>
-#include <math.h>
-#include <libintl.h>
 
 #ifdef HAVE_DECL_SWAPCTL
 # ifdef HAVE_SYS_PARAM_H
@@ -181,7 +178,7 @@ main (int argc, char **argv)
 #  ifdef _AIX
         if (!allswaps) {
                 xasprintf(&swap_command, "%s", "/usr/sbin/lsps -s");
-                xasprintf(&swap_format, "%s", "%f%*s %f");
+                xasprintf(&swap_format, "%s", "%lu%*s %lu");
                 conv_factor = 1;
         }
 #  endif
@@ -208,9 +205,9 @@ main (int argc, char **argv)
                 temp_buffer = strtok (input_buffer, " \n");
                 while (temp_buffer) {
                         if (strstr (temp_buffer, "blocks"))
-                                sprintf (str, "%s %s", str, "%f");
+                                sprintf (str, "%s %s", str, "%lu");
                         else if (strstr (temp_buffer, "dskfree"))
-                                sprintf (str, "%s %s", str, "%f");
+                                sprintf (str, "%s %s", str, "%lu");
                         else
                                 sprintf (str, "%s %s", str, "%*s");
                         temp_buffer = strtok (NULL, " \n");
@@ -555,7 +552,7 @@ validate_arguments (void)
         }
         else if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) {
                 /* This is NOT triggered if warn and crit are different units, e.g warn is percentage
-                 * and crit is absolut. We cannot determine the condition at this point since we
+                 * and crit is absolute. We cannot determine the condition at this point since we
                  * dont know the value of total swap yet
                  */
                 usage4(_("Warning should be more than critical"));