X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_latency.c;h=41af00cb14188b5e51f8a9d0e3d3e559e16a2967;hb=db35efb33e81d0a013e09a8a6ffa362ad5962f7c;hp=d570ab696166b54e47887b4d1f33b8111a8d9197;hpb=ff17a1ce15e2bb1ea43c05974a17901ca43bc0d7;p=collectd.git diff --git a/src/utils_latency.c b/src/utils_latency.c index d570ab69..41af00cb 100644 --- a/src/utils_latency.c +++ b/src/utils_latency.c @@ -32,6 +32,10 @@ #include #include +#ifndef LLONG_MAX +# define LLONG_MAX 9223372036854775807LL +#endif + #ifndef HISTOGRAM_NUM_BINS # define HISTOGRAM_NUM_BINS 1000 #endif @@ -72,7 +76,7 @@ struct latency_counter_s * So, if the required bin width is 300, then new bin width will be 512 as it is * the next nearest power of 2. */ -void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */ +static void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */ { /* This function is called because the new value is above histogram's range. * First find the required bin width: @@ -113,14 +117,13 @@ void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */ CDTIME_T_TO_DOUBLE (new_bin_width)); } /* }}} void change_bin_width */ -latency_counter_t *latency_counter_create () /* {{{ */ +latency_counter_t *latency_counter_create (void) /* {{{ */ { latency_counter_t *lc; - lc = malloc (sizeof (*lc)); + lc = calloc (1, sizeof (*lc)); if (lc == NULL) return (NULL); - memset (lc, 0, sizeof (*lc)); latency_counter_reset (lc); lc->bin_width = HISTOGRAM_DEFAULT_BIN_WIDTH; @@ -159,7 +162,7 @@ void latency_counter_add (latency_counter_t *lc, cdtime_t latency) /* {{{ */ bin = (latency - 1) / lc->bin_width; if (bin >= HISTOGRAM_NUM_BINS) { - ERROR ("utils_latency: latency_counter_add: Invalid bin %lu", bin); + ERROR ("utils_latency: latency_counter_add: Invalid bin: %"PRIu64, bin); return; } }