X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftarget_notification.c;h=d850a684907c0b9c960d8c432f2465110bced39b;hb=6e6efef36b63acffa8d83f1d778db799c6ab5bc0;hp=5eaa427528183e2ac70ad47ec647ffb21034eb9f;hpb=de21923bcdbd01827f445eb1f573778b7bfa5202;p=collectd.git diff --git a/src/target_notification.c b/src/target_notification.c index 5eaa4275..d850a684 100644 --- a/src/target_notification.c +++ b/src/target_notification.c @@ -126,7 +126,7 @@ static int tn_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ int status; int i; - data = (tn_data_t *) malloc (sizeof (*data)); + data = malloc (sizeof (*data)); if (data == NULL) { ERROR ("tn_create: malloc failed."); @@ -181,7 +181,7 @@ static int tn_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ if (status != 0) { - tn_destroy ((void *) data); + tn_destroy ((void *) &data); return (status); } @@ -199,7 +199,7 @@ static int tn_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ gauge_t *rates; int rates_failed; - int i; + size_t i; if ((ds == NULL) || (vl == NULL) || (user_data == NULL)) return (-EINVAL); @@ -256,12 +256,12 @@ static int tn_invoke (const data_set_t *ds, value_list_t *vl, /* {{{ */ /* If this is a gauge value, use the current value. */ if (ds->ds[i].type == DS_TYPE_GAUGE) ssnprintf (value_str, sizeof (value_str), - "%g", (double) vl->values[i].gauge); + GAUGE_FORMAT, (double) vl->values[i].gauge); /* If it's a counter, try to use the current rate. This may fail, if the * value has been renamed. */ else if (rates != NULL) ssnprintf (value_str, sizeof (value_str), - "%g", (double) rates[i]); + GAUGE_FORMAT, (double) rates[i]); /* Since we don't know any better, use the string `unknown'. */ else sstrncpy (value_str, "unknown", sizeof (value_str));