From: Florian Forster Date: Fri, 10 Sep 2010 15:14:25 +0000 (+0200) Subject: Fix compiler warnings. X-Git-Tag: v4.0.0~4 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3a5182f49dd2bf9e617566a8a9ec7689db4f4f8b;p=collection4.git Fix compiler warnings. --- diff --git a/src/data_provider.h b/src/data_provider.h index 30f3670..87025f2 100644 --- a/src/data_provider.h +++ b/src/data_provider.h @@ -39,10 +39,10 @@ struct dp_data_point_s typedef struct dp_data_point_s dp_data_point_t; /* Callback passed to the "get_idents" function. */ -typedef int (*dp_get_idents_callback) (const graph_ident_t *, void *); +typedef int (*dp_get_idents_callback) (graph_ident_t *, void *); /* Callback passed to the "get_ident_ds_names" function. */ -typedef int (*dp_list_get_ident_ds_names_callback) (const graph_ident_t *, +typedef int (*dp_list_get_ident_ds_names_callback) (graph_ident_t *, const char *ds_name, void *); /* Callback passed to the "get_ident_data" function. */ diff --git a/src/graph_ident.c b/src/graph_ident.c index d16cb5b..7f37035 100644 --- a/src/graph_ident.c +++ b/src/graph_ident.c @@ -580,7 +580,7 @@ static int ident_data_to_json__get_ident_data ( } /* }}} int ident_data_to_json__get_ident_data */ /* Called for each DS name */ -static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ */ +static int ident_data_to_json__get_ds_name (graph_ident_t *ident, /* {{{ */ const char *ds_name, void *user_data) { ident_data_to_json__data_t *data = user_data; @@ -605,7 +605,7 @@ static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ * return (status); } /* }}} int ident_data_to_json__get_ds_name */ -int ident_data_to_json (const graph_ident_t *ident, /* {{{ */ +int ident_data_to_json (graph_ident_t *ident, /* {{{ */ dp_time_t begin, dp_time_t end, yajl_gen handler) { diff --git a/src/graph_ident.h b/src/graph_ident.h index 6d033b3..5f7b2d4 100644 --- a/src/graph_ident.h +++ b/src/graph_ident.h @@ -92,7 +92,7 @@ char *ident_to_string (const graph_ident_t *ident); char *ident_to_file (const graph_ident_t *ident); int ident_to_json (const graph_ident_t *ident, yajl_gen handler); -int ident_data_to_json (const graph_ident_t *ident, +int ident_data_to_json (graph_ident_t *ident, dp_time_t begin, dp_time_t end, yajl_gen handler); diff --git a/src/graph_list.c b/src/graph_list.c index d767ef9..b969d4c 100644 --- a/src/graph_list.c +++ b/src/graph_list.c @@ -210,7 +210,7 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */ return (0); } /* }}} int gl_register_file */ -static int gl_register_ident (const graph_ident_t *ident, /* {{{ */ +static int gl_register_ident (graph_ident_t *ident, /* {{{ */ __attribute__((unused)) void *user_data) { /* TODO: Check for duplicates if multiple data providers are used. */