Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-29 18:18:39 +00:00
Code Issues Releases Activity

Renamed all my_infos to the more-descriptive tmp_info

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1181 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Kevin Lyles 2008-06-21 09:25:03 +00:00
parent e7e874ac61
commit 9a6f79b0e2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/conky.c
View File

@ -4813,7 +4813,7 @@ static void generate_text_internal(char *p, int p_max_size,
} }
OBJ(execp) { OBJ(execp) {
FILE *fp; FILE *fp;
struct information *my_info; struct information *tmp_info;
struct text_object_list *text_objects; struct text_object_list *text_objects;
int length; int length;
@ -4821,9 +4821,9 @@ static void generate_text_internal(char *p, int p_max_size,
fread(p, 1, p_max_size, fp); fread(p, 1, p_max_size, fp);
pclose(fp); pclose(fp);
my_info = malloc(sizeof(struct information)); tmp_info = malloc(sizeof(struct information));
memcpy(my_info, cur, sizeof(struct information)); memcpy(tmp_info, cur, sizeof(struct information));
text_objects = parse_conky_vars(p, p, my_info); text_objects = parse_conky_vars(p, p, tmp_info);
length = strlen(p); length = strlen(p);
@ -4834,7 +4834,7 @@ static void generate_text_internal(char *p, int p_max_size,
free_text_objects(text_objects); free_text_objects(text_objects);
free(text_objects); free(text_objects);
free(my_info); free(tmp_info);
} }
OBJ(execbar) { OBJ(execbar) {
char *p2 = p; char *p2 = p;
@ -4994,14 +4994,14 @@ static void generate_text_internal(char *p, int p_max_size,
} }
OBJ(execpi) { OBJ(execpi) {
struct text_object_list *text_objects = 0; struct text_object_list *text_objects = 0;
struct information *my_info = struct information *tmp_info =
malloc(sizeof(struct information)); malloc(sizeof(struct information));
memcpy(my_info, cur, sizeof(struct information)); memcpy(tmp_info, cur, sizeof(struct information));
if (current_update_time - obj->data.execi.last_update if (current_update_time - obj->data.execi.last_update
< obj->data.execi.interval < obj->data.execi.interval
|| obj->data.execi.interval == 0) { || obj->data.execi.interval == 0) {
text_objects = parse_conky_vars(obj->data.execi.buffer, p, my_info); text_objects = parse_conky_vars(obj->data.execi.buffer, p, tmp_info);
} else { } else {
char *output = obj->data.execi.buffer; char *output = obj->data.execi.buffer;
FILE *fp = popen(obj->data.execi.cmd, "r"); FILE *fp = popen(obj->data.execi.cmd, "r");
@ -5014,12 +5014,12 @@ static void generate_text_internal(char *p, int p_max_size,
output[length - 1] = '\0'; output[length - 1] = '\0';
} }
text_objects = parse_conky_vars(obj->data.execi.buffer, p, my_info); text_objects = parse_conky_vars(obj->data.execi.buffer, p, tmp_info);
obj->data.execi.last_update = current_update_time; obj->data.execi.last_update = current_update_time;
} }
free_text_objects(text_objects); free_text_objects(text_objects);
free(text_objects); free(text_objects);
free(my_info); free(tmp_info);
} }
OBJ(texeci) { OBJ(texeci) {
if (!obj->data.texeci.p_timed_thread) { if (!obj->data.texeci.p_timed_thread) {
@ -5464,10 +5464,10 @@ static void generate_text_internal(char *p, int p_max_size,
} }
OBJ(if_empty) { OBJ(if_empty) {
struct text_object_list *text_objects; struct text_object_list *text_objects;
struct information *my_info = struct information *tmp_info =
malloc(sizeof(struct information)); malloc(sizeof(struct information));
memcpy(my_info, cur, sizeof(struct information)); memcpy(tmp_info, cur, sizeof(struct information));
text_objects = parse_conky_vars(obj->data.ifblock.s, p, my_info); text_objects = parse_conky_vars(obj->data.ifblock.s, p, tmp_info);
if (strlen(p) != 0) { if (strlen(p) != 0) {
i = obj->data.ifblock.pos; i = obj->data.ifblock.pos;
@ -5478,7 +5478,7 @@ static void generate_text_internal(char *p, int p_max_size,
p[0] = '\0'; p[0] = '\0';
free_text_objects(text_objects); free_text_objects(text_objects);
free(text_objects); free(text_objects);
free(my_info); free(tmp_info);
} }
OBJ(if_existing) { OBJ(if_existing) {
struct stat tmp; struct stat tmp;