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

Let print_execi and print_texeci call fill_p for filling p

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-10 19:04:31 +01:00
parent 9fefa79551
commit 36ad680a98
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/exec.cc
View File

@ -310,6 +310,14 @@ void print_execp(struct text_object *obj, char *p, int p_max_size)
free(buf); free(buf);
} }
void fill_p(struct execi_data *ed, struct text_object *obj, char *p, int p_max_size) {
if(obj->parse == true) {
struct text_object subroot;
parse_conky_vars(&subroot, ed->buffer, p, p_max_size);
free_text_objects(&subroot);
} else snprintf(p, p_max_size, "%s", ed->buffer);
}
void print_execi(struct text_object *obj, char *p, int p_max_size) void print_execi(struct text_object *obj, char *p, int p_max_size)
{ {
struct execi_data *ed = (struct execi_data *)obj->data.opaque; struct execi_data *ed = (struct execi_data *)obj->data.opaque;
@ -323,11 +331,7 @@ void print_execi(struct text_object *obj, char *p, int p_max_size)
read_exec(ed->cmd, ed->buffer, text_buffer_size); read_exec(ed->cmd, ed->buffer, text_buffer_size);
ed->last_update = current_update_time; ed->last_update = current_update_time;
} }
if(obj->parse == true) { fill_p(ed, obj, p, p_max_size);
struct text_object subroot;
parse_conky_vars(&subroot, ed->buffer, p, p_max_size);
free_text_objects(&subroot);
} else snprintf(p, p_max_size, "%s", ed->buffer);
} }
void print_texeci(struct text_object *obj, char *p, int p_max_size) void print_texeci(struct text_object *obj, char *p, int p_max_size)
@ -348,11 +352,7 @@ void print_texeci(struct text_object *obj, char *p, int p_max_size)
} }
} else { } else {
std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex()); std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex());
if(obj->parse == true) { fill_p(ed, obj, p, p_max_size);
struct text_object subroot;
parse_conky_vars(&subroot, ed->buffer, p, p_max_size);
free_text_objects(&subroot);
} else snprintf(p, p_max_size, "%s", ed->buffer);
} }
} }