Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 05:12:41 +00:00
Code Issues Releases Activity

use gen_print_nothing for $apcupsd

Browse Source
This commit is contained in:
Phil Sutter 2009-11-28 23:05:14 +01:00
parent 37cbdcf89b
commit 8da8b26ddf
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/apcupsd.c
View File

@ -229,14 +229,6 @@ void update_apcupsd(void) {
return; 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) uint8_t apcupsd_loadbarval(struct text_object *obj)
{ {
(void)obj; (void)obj;

1
src/apcupsd.h
View File

@ -51,7 +51,6 @@ typedef struct apcupsd_s {
/* Service routine for the conky main thread */ /* Service routine for the conky main thread */
void update_apcupsd(void); void update_apcupsd(void);
void print_apcupsd_nop(struct text_object *, char *, int);
uint8_t apcupsd_loadbarval(struct text_object *); uint8_t apcupsd_loadbarval(struct text_object *);
void print_apcupsd_name(struct text_object *, char *, int); void print_apcupsd_name(struct text_object *, char *, int);

2
src/core.c
View File

@ -1492,7 +1492,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
info.apcupsd.port = htons(port); info.apcupsd.port = htons(port);
strncpy(info.apcupsd.host, host, sizeof(info.apcupsd.host)); 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) END OBJ(apcupsd_name, &update_apcupsd)
obj->callbacks.print = &print_apcupsd_name; obj->callbacks.print = &print_apcupsd_name;
END OBJ(apcupsd_model, &update_apcupsd) END OBJ(apcupsd_model, &update_apcupsd)