aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-11-11 15:06:06 +0100
committerHarald Welte <laforge@gnumonks.org>2016-11-11 15:24:24 +0100
commit1554f80f5e271ed2ffb918127a234a3804cedef4 (patch)
tree36431cbdf628de6cc29b6b890f05fa9e19db2619
parentbf173a3df5dce2c875f057bcfbffcf4b8c642fe5 (diff)
statsd: Fix compiler warning (int32_t vs. int64_t)
Fixes the following compiler warning: stats_statsd.c: In function ‘osmo_stats_reporter_create_statsd’: stats_statsd.c:54:18: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] srep->send_item = osmo_stats_reporter_statsd_send_item; Change-Id: Id36914906e0982f6ac092a311210727de66b343a
-rw-r--r--include/osmocom/core/stats.h2
-rw-r--r--src/stats.c4
-rw-r--r--src/stats_statsd.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h
index 96f687e5..f754e41d 100644
--- a/include/osmocom/core/stats.h
+++ b/include/osmocom/core/stats.h
@@ -78,7 +78,7 @@ struct osmo_stats_reporter {
int (*send_item)(struct osmo_stats_reporter *srep,
const struct osmo_stat_item_group *statg,
const struct osmo_stat_item_desc *desc,
- int32_t value);
+ int64_t value);
};
struct osmo_stats_config {
diff --git a/src/stats.c b/src/stats.c
index 5f1d028b..1efc8cd8 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -62,7 +62,7 @@ static int osmo_stats_reporter_log_send_counter(struct osmo_stats_reporter *srep
int64_t value, int64_t delta);
static int osmo_stats_reporter_log_send_item(struct osmo_stats_reporter *srep,
const struct osmo_stat_item_group *statg,
- const struct osmo_stat_item_desc *desc, int value);
+ const struct osmo_stat_item_desc *desc, int64_t value);
static int update_srep_config(struct osmo_stats_reporter *srep)
{
@@ -429,7 +429,7 @@ static int osmo_stats_reporter_log_send_counter(struct osmo_stats_reporter *srep
static int osmo_stats_reporter_log_send_item(struct osmo_stats_reporter *srep,
const struct osmo_stat_item_group *statg,
- const struct osmo_stat_item_desc *desc, int value)
+ const struct osmo_stat_item_desc *desc, int64_t value)
{
return osmo_stats_reporter_log_send(srep, "i",
statg->desc->group_name_prefix, statg->idx,
diff --git a/src/stats_statsd.c b/src/stats_statsd.c
index 3cecec30..8b53881e 100644
--- a/src/stats_statsd.c
+++ b/src/stats_statsd.c
@@ -32,6 +32,7 @@
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/stat_item.h>
#include <osmocom/core/msgb.h>
+#include <osmocom/core/stats.h>
static int osmo_stats_reporter_statsd_send_counter(struct osmo_stats_reporter *srep,
const struct rate_ctr_group *ctrg,