X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_scale.c;h=af224f109d6bb8de19066b8c472a6557d6058d3e;hb=565c731a4353d1453b65dc9a4267e1f8e4740c06;hp=5c5e9aac330ee9be2038c8ba886bfe257b3c5ced;hpb=4f628540dda92235841ff070ada671de03d8e962;p=collectd.git

diff --git a/src/target_scale.c b/src/target_scale.c
index 5c5e9aac..af224f10 100644
--- a/src/target_scale.c
+++ b/src/target_scale.c
@@ -87,16 +87,16 @@ static int ts_invoke_counter (const data_set_t *ds, value_list_t *vl, /* {{{ */
 		/* Calcualte the rate */
 		if (prev_counter > curr_counter) /* => counter overflow */
 		{
-			if (prev_counter <= 4294967295) /* 32 bit overflow */
-				difference = (4294967295 - prev_counter) + curr_counter;
+			if (prev_counter <= 4294967295UL) /* 32 bit overflow */
+				difference = (4294967295UL - prev_counter) + curr_counter;
 			else /* 64 bit overflow */
-				difference = (18446744073709551615U - prev_counter) + curr_counter;
+				difference = (18446744073709551615ULL - prev_counter) + curr_counter;
 		}
 		else /* no overflow */
 		{
 			difference = curr_counter - prev_counter;
 		}
-		rate = ((double) difference) / ((double) vl->interval);
+		rate = ((double) difference) / CDTIME_T_TO_DOUBLE (vl->interval);
 
 		/* Modify the rate. */
 		if (!isnan (data->factor))
@@ -105,7 +105,7 @@ static int ts_invoke_counter (const data_set_t *ds, value_list_t *vl, /* {{{ */
 			rate += data->offset;
 
 		/* Calculate the internal counter. */
-		int_fraction += (rate * ((double) vl->interval));
+		int_fraction += (rate * CDTIME_T_TO_DOUBLE (vl->interval));
 		difference = (uint64_t) int_fraction;
 		int_fraction -= ((double) difference);
 		int_counter  += difference;
@@ -199,7 +199,7 @@ static int ts_invoke_derive (const data_set_t *ds, value_list_t *vl, /* {{{ */
 
 		/* Calcualte the rate */
 		difference = curr_derive - prev_derive;
-		rate = ((double) difference) / ((double) vl->interval);
+		rate = ((double) difference) / CDTIME_T_TO_DOUBLE (vl->interval);
 
 		/* Modify the rate. */
 		if (!isnan (data->factor))
@@ -208,7 +208,7 @@ static int ts_invoke_derive (const data_set_t *ds, value_list_t *vl, /* {{{ */
 			rate += data->offset;
 
 		/* Calculate the internal derive. */
-		int_fraction += (rate * ((double) vl->interval));
+		int_fraction += (rate * CDTIME_T_TO_DOUBLE (vl->interval));
 		if (int_fraction < 0.0) /* handle negative integer rounding correctly */
 			difference = ((int64_t) int_fraction) - 1;
 		else
@@ -263,7 +263,7 @@ static int ts_invoke_absolute (const data_set_t *ds, value_list_t *vl, /* {{{ */
 	if (status != 0)
 		int_fraction = 0.0;
 
-	rate = ((double) curr_absolute) / ((double) vl->interval);
+	rate = ((double) curr_absolute) / CDTIME_T_TO_DOUBLE (vl->interval);
 
 	/* Modify the rate. */
 	if (!isnan (data->factor))
@@ -272,7 +272,7 @@ static int ts_invoke_absolute (const data_set_t *ds, value_list_t *vl, /* {{{ */
 		rate += data->offset;
 
 	/* Calculate the new absolute. */
-	int_fraction += (rate * ((double) vl->interval));
+	int_fraction += (rate * CDTIME_T_TO_DOUBLE (vl->interval));
 	curr_absolute = (uint64_t) int_fraction;
 	int_fraction -= ((double) curr_absolute);
 
@@ -302,11 +302,15 @@ static int ts_config_set_double (double *ret, oconfig_item_t *ci) /* {{{ */
 
 static int ts_destroy (void **user_data) /* {{{ */
 {
+	ts_data_t **data;
+
 	if (user_data == NULL)
 		return (-EINVAL);
 
-	free (*user_data);
-	*user_data = NULL;
+	data = (ts_data_t **) user_data;
+
+	free (*data);
+	*data = NULL;
 
 	return (0);
 } /* }}} int ts_destroy */