Module: monitoring-plugins
Branch: master
Commit: 24f21473fb493edf7fced3b4f680c99123145014
Author: Lorenz Kästle <12514511+rincewinds...@users.noreply.github.com>
Date: Wed Feb 19 16:59:32 2025 +0100
URL:
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=24f21473
Use asprintf in lib directly instead of xasprintf
---
lib/output.c | 32 ++++++++++++++++----------------
lib/perfdata.c | 36 ++++++++++++++++++------------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/lib/output.c b/lib/output.c
index 62a00fed..4c5041c8 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -23,7 +23,7 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
int added = 0;
if (check.perfdata != NULL) {
- added = xasprintf(&result, "%s",
pd_list_to_string(*check.perfdata));
+ added = asprintf(&result, "%s",
pd_list_to_string(*check.perfdata));
}
if (check.subchecks == NULL) {
@@ -35,10 +35,10 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck
check) {
while (subchecks != NULL) {
if (added > 0) {
- added = xasprintf(&result, "%s%s", result,
fmt_subcheck_perfdata(subchecks->subcheck));
+ added = asprintf(&result, "%s%s", result,
fmt_subcheck_perfdata(subchecks->subcheck));
} else {
// TODO free previous result here?
- added = xasprintf(&result, "%s", result,
fmt_subcheck_perfdata(subchecks->subcheck));
+ added = asprintf(&result, "%s",
fmt_subcheck_perfdata(subchecks->subcheck));
}
subchecks = subchecks->next;
@@ -185,7 +185,7 @@ char *get_subcheck_summary(mp_check check) {
subchecks = subchecks->next;
}
char *result = NULL;
- xasprintf(&result, "ok=%d, warning=%d, critical=%d, unknown=%d", ok,
warning, critical, unknown);
+ asprintf(&result, "ok=%d, warning=%d, critical=%d, unknown=%d", ok,
warning, critical, unknown);
return result;
}
@@ -238,7 +238,7 @@ char *mp_fmt_output(mp_check check) {
check.summary = get_subcheck_summary(check);
}
- xasprintf(&result, "%s: %s",
state_text(mp_compute_check_state(check)), check.summary);
+ asprintf(&result, "%s: %s",
state_text(mp_compute_check_state(check)), check.summary);
return result;
case MP_FORMAT_ONE_LINE: {
@@ -251,12 +251,12 @@ char *mp_fmt_output(mp_check check) {
check.summary = get_subcheck_summary(check);
}
- xasprintf(&result, "%s: %s",
state_text(mp_compute_check_state(check)), check.summary);
+ asprintf(&result, "%s: %s",
state_text(mp_compute_check_state(check)), check.summary);
mp_subcheck_list *subchecks = check.subchecks;
while (subchecks != NULL) {
- xasprintf(&result, "%s - %s", result,
fmt_subcheck_output(MP_FORMAT_ONE_LINE, subchecks->subcheck, 1));
+ asprintf(&result, "%s - %s", result,
fmt_subcheck_output(MP_FORMAT_ONE_LINE, subchecks->subcheck, 1));
subchecks = subchecks->next;
}
@@ -267,12 +267,12 @@ char *mp_fmt_output(mp_check check) {
check.summary = get_subcheck_summary(check);
}
- xasprintf(&result, "[%s] - %s",
state_text(mp_compute_check_state(check)), check.summary);
+ asprintf(&result, "[%s] - %s",
state_text(mp_compute_check_state(check)), check.summary);
mp_subcheck_list *subchecks = check.subchecks;
while (subchecks != NULL) {
- xasprintf(&result, "%s\n%s", result,
fmt_subcheck_output(MP_FORMAT_ICINGA_WEB_2, subchecks->subcheck, 1));
+ asprintf(&result, "%s\n%s", result,
fmt_subcheck_output(MP_FORMAT_ICINGA_WEB_2, subchecks->subcheck, 1));
subchecks = subchecks->next;
}
@@ -281,16 +281,16 @@ char *mp_fmt_output(mp_check check) {
while (subchecks != NULL) {
if (pd_string == NULL) {
- xasprintf(&pd_string, "%s",
fmt_subcheck_perfdata(subchecks->subcheck));
+ asprintf(&pd_string, "%s",
fmt_subcheck_perfdata(subchecks->subcheck));
} else {
- xasprintf(&pd_string, "%s %s", pd_string,
fmt_subcheck_perfdata(subchecks->subcheck));
+ asprintf(&pd_string, "%s %s", pd_string,
fmt_subcheck_perfdata(subchecks->subcheck));
}
subchecks = subchecks->next;
}
if (pd_string != NULL && strlen(pd_string) > 0) {
- xasprintf(&result, "%s|%s", result, pd_string);
+ asprintf(&result, "%s|%s", result, pd_string);
}
break;
@@ -358,23 +358,23 @@ static inline char *fmt_subcheck_output(mp_output_format
output_format, mp_subch
switch (output_format) {
case MP_FORMAT_ICINGA_WEB_2:
- xasprintf(&result, "%s\\_[%s] - %s",
generate_indentation_string(indentation),
state_text(mp_compute_subcheck_state(check)),
+ asprintf(&result, "%s\\_[%s] - %s",
generate_indentation_string(indentation),
state_text(mp_compute_subcheck_state(check)),
check.output);
subchecks = check.subchecks;
while (subchecks != NULL) {
- xasprintf(&result, "%s\n%s", result,
fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
+ asprintf(&result, "%s\n%s", result,
fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
subchecks = subchecks->next;
}
return result;
case MP_FORMAT_ONE_LINE:
- xasprintf(&result, "[%s] - %s",
state_text(mp_compute_subcheck_state(check)), check.output);
+ asprintf(&result, "[%s] - %s",
state_text(mp_compute_subcheck_state(check)), check.output);
subchecks = check.subchecks;
while (subchecks != NULL) {
- xasprintf(&result, " - %s\n%s", result,
fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
+ asprintf(&result, " - %s\n%s", result,
fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
subchecks = subchecks->next;
}
return result;
diff --git a/lib/perfdata.c b/lib/perfdata.c
index f894df39..661756c5 100644
--- a/lib/perfdata.c
+++ b/lib/perfdata.c
@@ -14,13 +14,13 @@ char *pd_value_to_string(const mp_perfdata_value pd) {
switch (pd.type) {
case PD_TYPE_INT:
- xasprintf(&result, "%lli", pd.pd_int);
+ asprintf(&result, "%lli", pd.pd_int);
break;
case PD_TYPE_UINT:
- xasprintf(&result, "%llu", pd.pd_int);
+ asprintf(&result, "%llu", pd.pd_int);
break;
case PD_TYPE_DOUBLE:
- xasprintf(&result, "%f", pd.pd_double);
+ asprintf(&result, "%f", pd.pd_double);
break;
default:
// die here
@@ -33,33 +33,33 @@ char *pd_value_to_string(const mp_perfdata_value pd) {
char *pd_to_string(mp_perfdata pd) {
assert(pd.label != NULL);
char *result = NULL;
- xasprintf(&result, "%s=", pd.label);
+ asprintf(&result, "%s=", pd.label);
- xasprintf(&result, "%s%s", result, pd_value_to_string(pd.value));
+ asprintf(&result, "%s%s", result, pd_value_to_string(pd.value));
if (pd.uom != NULL) {
- xasprintf(&result, "%s%s", result, pd.uom);
+ asprintf(&result, "%s%s", result, pd.uom);
}
if (pd.warn_present) {
- xasprintf(&result, "%s;%s", result,
mp_range_to_string(pd.warn));
+ asprintf(&result, "%s;%s", result, mp_range_to_string(pd.warn));
} else {
- xasprintf(&result, "%s;", result);
+ asprintf(&result, "%s;", result);
}
if (pd.crit_present) {
- xasprintf(&result, "%s;%s", result,
mp_range_to_string(pd.crit));
+ asprintf(&result, "%s;%s", result, mp_range_to_string(pd.crit));
} else {
- xasprintf(&result, "%s;", result);
+ asprintf(&result, "%s;", result);
}
if (pd.min_present) {
- xasprintf(&result, "%s;%s", result, pd_value_to_string(pd.min));
+ asprintf(&result, "%s;%s", result, pd_value_to_string(pd.min));
} else {
- xasprintf(&result, "%s;", result);
+ asprintf(&result, "%s;", result);
}
if (pd.max_present) {
- xasprintf(&result, "%s;%s", result, pd_value_to_string(pd.max));
+ asprintf(&result, "%s;%s", result, pd_value_to_string(pd.max));
}
/*printf("pd_to_string: %s\n", result); */
@@ -71,7 +71,7 @@ char *pd_list_to_string(const pd_list pd) {
char *result = pd_to_string(pd.data);
for (pd_list *elem = pd.next; elem != NULL; elem = elem->next) {
- xasprintf(&result, "%s %s", result, pd_to_string(elem->data));
+ asprintf(&result, "%s %s", result, pd_to_string(elem->data));
}
return result;
@@ -234,17 +234,17 @@ int cmp_perfdata_value(const mp_perfdata_value a, const
mp_perfdata_value b) {
char *mp_range_to_string(const mp_range input) {
char *result = "";
if (input.alert_on_inside_range == INSIDE) {
- xasprintf(&result, "@");
+ asprintf(&result, "@");
}
if (input.start_infinity) {
- xasprintf(&result, "%s~:", result);
+ asprintf(&result, "%s~:", result);
} else {
- xasprintf(&result, "%s%s:", result,
pd_value_to_string(input.start));
+ asprintf(&result, "%s%s:", result,
pd_value_to_string(input.start));
}
if (!input.end_infinity) {
- xasprintf(&result, "%s%s", result,
pd_value_to_string(input.end));
+ asprintf(&result, "%s%s", result,
pd_value_to_string(input.end));
}
return result;
}
