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

Obsolete threaded_exec_caller with help of previous commit

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-10 15:54:50 +01:00
parent e017870b58
commit 9fefa79551
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/exec.cc
View File

@ -330,11 +330,12 @@ void print_execi(struct text_object *obj, char *p, int p_max_size)
} else snprintf(p, p_max_size, "%s", ed->buffer); } else snprintf(p, p_max_size, "%s", ed->buffer);
} }
char* threaded_exec_caller(struct text_object *obj) { void print_texeci(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;
if (!ed) if (!ed)
return NULL; return;
if (!ed->p_timed_thread) { if (!ed->p_timed_thread) {
/* /*
@ -345,23 +346,13 @@ char* threaded_exec_caller(struct text_object *obj) {
if (!ed->p_timed_thread) { if (!ed->p_timed_thread) {
NORM_ERR("Error creating texeci timed thread"); NORM_ERR("Error creating texeci timed thread");
} }
return NULL;
} else { } else {
std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex()); std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex());
return ed->buffer;
}
}
void print_texeci(struct text_object *obj, char *p, int p_max_size)
{
char* buffer = threaded_exec_caller(obj);
if(buffer != NULL) {
if(obj->parse == true) { if(obj->parse == true) {
struct text_object subroot; struct text_object subroot;
parse_conky_vars(&subroot, buffer, p, p_max_size); parse_conky_vars(&subroot, ed->buffer, p, p_max_size);
free_text_objects(&subroot); free_text_objects(&subroot);
} else snprintf(p, p_max_size, "%s", buffer); } else snprintf(p, p_max_size, "%s", ed->buffer);
} }
} }