diff --git a/src/apcupsd.c b/src/apcupsd.c index 5c701c49..143e2a74 100644 --- a/src/apcupsd.c +++ b/src/apcupsd.c @@ -229,14 +229,6 @@ void update_apcupsd(void) { return; } -/* this is just a NOP for the $apcupsd object */ -void print_apcupsd_nop(struct text_object *obj, char *p, int p_max_size) -{ - (void)obj; - (void)p; - (void)p_max_size; -} - uint8_t apcupsd_loadbarval(struct text_object *obj) { (void)obj; diff --git a/src/apcupsd.h b/src/apcupsd.h index 787b6989..db6ff02f 100644 --- a/src/apcupsd.h +++ b/src/apcupsd.h @@ -51,7 +51,6 @@ typedef struct apcupsd_s { /* Service routine for the conky main thread */ void update_apcupsd(void); -void print_apcupsd_nop(struct text_object *, char *, int); uint8_t apcupsd_loadbarval(struct text_object *); void print_apcupsd_name(struct text_object *, char *, int); diff --git a/src/core.c b/src/core.c index 0ae6e89c..f17669dd 100644 --- a/src/core.c +++ b/src/core.c @@ -1492,7 +1492,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long info.apcupsd.port = htons(port); strncpy(info.apcupsd.host, host, sizeof(info.apcupsd.host)); } - obj->callbacks.print = &print_apcupsd_nop; + obj->callbacks.print = &gen_print_nothing; END OBJ(apcupsd_name, &update_apcupsd) obj->callbacks.print = &print_apcupsd_name; END OBJ(apcupsd_model, &update_apcupsd)