Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-06 05:17:57 +00:00
Code Issues Releases Activity

{down,up}speedgraph: convert to match common signature

Browse Source
This commit is contained in:
Phil Sutter 2009-11-08 14:01:14 +01:00
parent 80114f3b1e
commit 80e41032cd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conky.c
View File

@ -1130,7 +1130,7 @@ void generate_text_internal(char *p, int p_max_size,
} }
#ifdef X11 #ifdef X11
OBJ(downspeedgraph) { OBJ(downspeedgraph) {
print_downspeedgraph(obj, p); print_downspeedgraph(obj, p, p_max_size);
} }
#endif /* X11 */ #endif /* X11 */
OBJ(else) { OBJ(else) {
@ -1935,7 +1935,7 @@ void generate_text_internal(char *p, int p_max_size,
} }
#ifdef X11 #ifdef X11
OBJ(upspeedgraph) { OBJ(upspeedgraph) {
print_upspeedgraph(obj, p); print_upspeedgraph(obj, p, p_max_size);
} }
#endif /* X11 */ #endif /* X11 */
OBJ(uptime_short) { OBJ(uptime_short) {

8
src/net_stat.c
View File

@ -206,21 +206,21 @@ void parse_net_stat_graph_arg(struct text_object *obj, const char *arg, void *fr
obj->data.opaque = get_net_stat(DEFAULTNETDEV, obj, free_at_crash); obj->data.opaque = get_net_stat(DEFAULTNETDEV, obj, free_at_crash);
} }
void print_downspeedgraph(struct text_object *obj, char *p) void print_downspeedgraph(struct text_object *obj, char *p, int p_max_size)
{ {
struct net_stat *ns = obj->data.opaque; struct net_stat *ns = obj->data.opaque;
if (!ns) if (!ns || !p_max_size)
return; return;
new_graph(obj, p, ns->recv_speed / 1024.0); new_graph(obj, p, ns->recv_speed / 1024.0);
} }
void print_upspeedgraph(struct text_object *obj, char *p) void print_upspeedgraph(struct text_object *obj, char *p, int p_max_size)
{ {
struct net_stat *ns = obj->data.opaque; struct net_stat *ns = obj->data.opaque;
if (!ns) if (!ns || !p_max_size)
return; return;
new_graph(obj, p, ns->trans_speed / 1024.0); new_graph(obj, p, ns->trans_speed / 1024.0);

4
src/net_stat.h
View File

@ -71,8 +71,8 @@ void print_addrs(struct text_object *, char *, int);
#endif /* __linux__ */ #endif /* __linux__ */
#ifdef X11 #ifdef X11
void parse_net_stat_graph_arg(struct text_object *, const char *, void *); void parse_net_stat_graph_arg(struct text_object *, const char *, void *);
void print_downspeedgraph(struct text_object *, char *); void print_downspeedgraph(struct text_object *, char *, int);
void print_upspeedgraph(struct text_object *, char *); void print_upspeedgraph(struct text_object *, char *, int);
#endif /* X11 */ #endif /* X11 */
#ifdef __linux__ #ifdef __linux__
#ifdef HAVE_IWLIB #ifdef HAVE_IWLIB