summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/check_mrtgtraf.c18
-rw-r--r--plugins/check_swap.c12
2 files changed, 15 insertions, 15 deletions
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 8cc6ec3..cdb50f3 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -175,18 +175,18 @@ main (int argc, char **argv)
175 result = STATE_WARNING; 175 result = STATE_WARNING;
176 } 176 }
177 177
178 asprintf (&error_message, _("%s. In = %0.1f %s, %s. Out = %0.1f %s\n"), 178 asprintf (&error_message, _("%s. In = %0.1f %s, %s. Out = %0.1f %s|%s %s\n"),
179 (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate, 179 (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
180 incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"), 180 incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"),
181 adjusted_outgoing_rate, outgoing_speed_rating, 181 adjusted_outgoing_rate, outgoing_speed_rating,
182 perfdata("in", adjusted_incoming_rate, incoming_speed_rating, 182 perfdata("in", (long) adjusted_incoming_rate, incoming_speed_rating,
183 incoming_warning_threshold, incoming_warning_threshold, 183 (int) incoming_warning_threshold, (long) incoming_warning_threshold,
184 incoming_critical_threshold, incoming_critical_threshold, 184 (int) incoming_critical_threshold, (long) incoming_critical_threshold,
185 TRUE, 0, TRUE, incoming_speed_rating), 185 TRUE, 0, TRUE, (long) incoming_speed_rating),
186 perfdata("in", adjusted_outgoing_rate, outgoing_speed_rating, 186 perfdata("in", (long) adjusted_outgoing_rate, outgoing_speed_rating,
187 outgoing_warning_threshold, outgoing_warning_threshold, 187 (int) outgoing_warning_threshold, (long) outgoing_warning_threshold,
188 outgoing_critical_threshold, outgoing_critical_threshold, 188 (int) outgoing_critical_threshold, (long) outgoing_critical_threshold,
189 TRUE, 0, TRUE, outgoing_speed_rating)); 189 TRUE, 0, TRUE, (long) outgoing_speed_rating));
190 190
191 printf (_("Traffic %s - %s\n"), state_text(result), error_message); 191 printf (_("Traffic %s - %s\n"), state_text(result), error_message);
192 192
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 3bf7d43..6a578ab 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -224,13 +224,13 @@ main (int argc, char **argv)
224 asprintf (&status, _(" %d%% free (%lu MB out of %lu MB)%s"), 224 asprintf (&status, _(" %d%% free (%lu MB out of %lu MB)%s"),
225 (100 - percent_used), free_swap, total_swap, status); 225 (100 - percent_used), free_swap, total_swap, status);
226 226
227 asprintf (&perf, "%s", perfdata ("swap", free_swap, "MB", 227 asprintf (&perf, "%s", perfdata ("swap", (long) free_swap, "MB",
228 TRUE, max (warn_size/1024, warn_percent/100.0*total_swap), 228 TRUE, (long) max (warn_size/1024, warn_percent/100.0*total_swap),
229 TRUE, max (crit_size/1024, crit_percent/100.0*total_swap), 229 TRUE, (long) max (crit_size/1024, crit_percent/100.0*total_swap),
230 TRUE, 0, 230 TRUE, 0,
231 TRUE, total_swap)); 231 TRUE, (long) total_swap));
232 die (result, "SWAP %s:%s |%s\n", state_text (result), status, perf); 232 printf ("SWAP %s:%s |%s\n", state_text (result), status, perf);
233 return STATE_UNKNOWN; 233 return result;
234} 234}
235 235
236 236