rrdtool.c: Suppress compiler warnings with a cast

Add a typedef that can be used to cast function pointers for
queue_work().

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>

diff --git a/process.h b/process.h
index c72830b72ee5c1ff74ebad870a39f88ca1ebf687..4134d30969895411c780435f9312ade19741965f 100644 (file)
--- a/process.h
+++ b/process.h
@@ -14,6 +14,7 @@
 struct event_handler;
 
 typedef int (handle_event_fn_t)(struct event_handler *);
 struct event_handler;
 
 typedef int (handle_event_fn_t)(struct event_handler *);

+typedef int (work_fn_t)(void *);

 
 struct event_handler {
        int fd;
 
 struct event_handler {
        int fd;

diff --git a/rrdtool.c b/rrdtool.c
index 43b3571da5fcfbd7e2d23ad6726f77f20eb15914..0651e45e0a83dd6f0a81e4b9d1ed4e7954686b01 100644 (file)
--- a/rrdtool.c
+++ b/rrdtool.c
@@ -102,7 +102,7 @@ int rrdtool_draw_images(struct rrd_image **image)
        int i;
        for (i = 0; image[i]; i++)
                queue_work(WORK_PRIORITY_LOW, "rrdtool_draw_image",
        int i;
        for (i = 0; image[i]; i++)
                queue_work(WORK_PRIORITY_LOW, "rrdtool_draw_image",

-                       rrdtool_draw_image, image[i]);
+                       (work_fn_t *)rrdtool_draw_image, image[i]);

 
        return 0;
 }
 
        return 0;
 }


@@ -297,7 +297,7 @@ int rrdtool_update_data(struct rrd_database *rrd)
        rrd->last_update = time(0);
 
        return queue_work(WORK_PRIORITY_HIGH, "rrdtool_update_data",
        rrd->last_update = time(0);
 
        return queue_work(WORK_PRIORITY_HIGH, "rrdtool_update_data",

-                       do_rrdtool_update_data, rrd);
+                       (work_fn_t *)do_rrdtool_update_data, rrd);

 }
 
 /*
 }
 
 /*