Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Code Issues Releases Activity

drop useless ifblock.str

Browse Source
This commit is contained in:
Phil Sutter 2009-10-29 03:41:23 +01:00
parent 66c187e7a1
commit 9a770295d1
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conky.c
View File

@ -1414,13 +1414,16 @@ void generate_text_internal(char *p, int p_max_size,
free(tmp_info); free(tmp_info);
} }
OBJ(if_existing) { OBJ(if_existing) {
if (obj->data.ifblock.str char *spc;
&& !check_contains(obj->data.ifblock.s,
obj->data.ifblock.str)) { spc = strchr(obj->data.ifblock.s, ' ');
if (!spc && access(obj->data.ifblock.s, F_OK)) {
DO_JUMP; DO_JUMP;
} else if (obj->data.ifblock.s } else if (spc) {
&& access(obj->data.ifblock.s, F_OK)) { *spc = '\0';
if (check_contains(obj->data.ifblock.s, spc + 1))
DO_JUMP; DO_JUMP;
*spc = ' ';
} }
} }
OBJ(if_mounted) { OBJ(if_mounted) {

15
src/core.c
View File

@ -557,17 +557,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->sub = malloc(sizeof(struct text_object)); obj->sub = malloc(sizeof(struct text_object));
extract_variable_text_internal(obj->sub, arg); extract_variable_text_internal(obj->sub, arg);
END OBJ_IF_ARG(if_existing, 0, "if_existing needs an argument or two") END OBJ_IF_ARG(if_existing, 0, "if_existing needs an argument or two")
char buf1[256], buf2[256]; obj->data.ifblock.s = strndup(arg, text_buffer_size);
int r = sscanf(arg, "%255s %255[^\n]", buf1, buf2);
if (r == 1) {
obj->data.ifblock.s = strndup(buf1, text_buffer_size);
obj->data.ifblock.str = NULL;
} else {
obj->data.ifblock.s = strndup(buf1, text_buffer_size);
obj->data.ifblock.str = strndup(buf2, text_buffer_size);
}
DBGP("if_existing: '%s' '%s'", obj->data.ifblock.s, obj->data.ifblock.str);
END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument") END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument")
obj->data.ifblock.s = strndup(arg, text_buffer_size); obj->data.ifblock.s = strndup(arg, text_buffer_size);
#ifdef __linux__ #ifdef __linux__
@ -1284,7 +1274,6 @@ void free_text_objects(struct text_object *root, int internal)
case OBJ_if_mounted: case OBJ_if_mounted:
case OBJ_if_running: case OBJ_if_running:
free(data.ifblock.s); free(data.ifblock.s);
free(data.ifblock.str);
break; break;
case OBJ_head: case OBJ_head:
case OBJ_tail: case OBJ_tail:
@ -1314,7 +1303,6 @@ void free_text_objects(struct text_object *root, int internal)
break; break;
case OBJ_if_gw: case OBJ_if_gw:
free(data.ifblock.s); free(data.ifblock.s);
free(data.ifblock.str);
case OBJ_gw_iface: case OBJ_gw_iface:
case OBJ_gw_ip: case OBJ_gw_ip:
free_gateway_info(); free_gateway_info();
@ -1519,7 +1507,6 @@ void free_text_objects(struct text_object *root, int internal)
break; break;
case OBJ_if_smapi_bat_installed: case OBJ_if_smapi_bat_installed:
free(data.ifblock.s); free(data.ifblock.s);
free(data.ifblock.str);
break; break;
#endif /* IBM */ #endif /* IBM */
#ifdef NVIDIA #ifdef NVIDIA

1
src/text_object.h
View File

@ -441,7 +441,6 @@ struct text_object {
struct text_object *next; struct text_object *next;
char *s; char *s;
int i; int i;
char *str;
} ifblock; } ifblock;
} data; } data;