1 files changed, 18 insertions, 14 deletions

diff --git a/plugins/utils.c b/plugins/utils.c
index f7f8952..ebdae2e 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -601,13 +601,13 @@ char *perfdata (const char *label,
 char *perfdata_uint64 (const char *label,
  uint64_t val,
  const char *uom,
- int warnp,
+ int warnp, /* Warning present */
  uint64_t warn,
- int critp,
+ int critp, /* Critical present */
  uint64_t crit,
- int minp,
+ int minp, /* Minimum present */
  uint64_t minv,
- int maxp,
+ int maxp, /* Maximum present */
  uint64_t maxv)
 {
         char *data = NULL;
@@ -618,20 +618,22 @@ char *perfdata_uint64 (const char *label,
                 xasprintf (&data, "%s=%ld%s;", label, val, uom);
 
         if (warnp)
-                xasprintf (&data, "%s%ld;", data, warn);
+                xasprintf (&data, "%s%lu;", data, warn);
         else
                 xasprintf (&data, "%s;", data);
 
         if (critp)
-                xasprintf (&data, "%s%ld;", data, crit);
+                xasprintf (&data, "%s%lu;", data, crit);
         else
                 xasprintf (&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%ld", data, minv);
+                xasprintf (&data, "%s%lu;", data, minv);
+        else
+                xasprintf (&data, "%s;", data);
 
         if (maxp)
-                xasprintf (&data, "%s;%ld", data, maxv);
+                xasprintf (&data, "%s%lu", data, maxv);
 
         return data;
 }
@@ -640,13 +642,13 @@ char *perfdata_uint64 (const char *label,
 char *perfdata_int64 (const char *label,
  int64_t val,
  const char *uom,
- int warnp,
+ int warnp, /* Warning present */
  int64_t warn,
- int critp,
+ int critp, /* Critical present */
  int64_t crit,
- int minp,
+ int minp, /* Minimum present */
  int64_t minv,
- int maxp,
+ int maxp, /* Maximum present */
  int64_t maxv)
 {
         char *data = NULL;
@@ -667,10 +669,12 @@ char *perfdata_int64 (const char *label,
                 xasprintf (&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%ld", data, minv);
+                xasprintf (&data, "%s%ld;", data, minv);
+        else
+                xasprintf (&data, "%s;", data);
 
         if (maxp)
-                xasprintf (&data, "%s;%ld", data, maxv);
+                xasprintf (&data, "%s%ld", data, maxv);
 
         return data;
 }