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

move extract_object_args_to_sub() to a more convenient place

Browse Source
This commit is contained in:
Phil Sutter 2009-12-28 02:57:12 +01:00
parent 0d2770ab33
commit 46bd87b05e
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conky.h
View File

@ -317,6 +317,8 @@ void set_update_interval(double interval);
void parse_conky_vars(struct text_object *, const char *, char *, int); void parse_conky_vars(struct text_object *, const char *, char *, int);
void extract_object_args_to_sub(struct text_object *, const char *);
void generate_text_internal(char *, int, struct text_object); void generate_text_internal(char *, int, struct text_object);
int percent_print(char *, int, unsigned); int percent_print(char *, int, unsigned);

7
src/core.cc
View File

@ -1798,6 +1798,13 @@ int extract_variable_text_internal(struct text_object *retval, const char *const
return 0; return 0;
} }
void extract_object_args_to_sub(struct text_object *obj, const char *args)
{
obj->sub = (struct text_object *)malloc(sizeof(struct text_object));
memset(obj->sub, 0, sizeof(struct text_object));
extract_variable_text_internal(obj->sub, args);
}
/* Frees the list of text objects root points to. */ /* Frees the list of text objects root points to. */
void free_text_objects(struct text_object *root) void free_text_objects(struct text_object *root)
{ {

7
src/proc.c
View File

@ -103,13 +103,6 @@ int inlist(struct ll_string* front, char* string) {
return 0; return 0;
} }
void extract_object_args_to_sub(struct text_object *obj, const char *args)
{
obj->sub = malloc(sizeof(struct text_object));
memset(obj->sub, 0, sizeof(struct text_object));
extract_variable_text_internal(obj->sub, args);
}
void print_pid_chroot(struct text_object *obj, char *p, int p_max_size) { void print_pid_chroot(struct text_object *obj, char *p, int p_max_size) {
char pathbuf[64]; char pathbuf[64];
char buf[max_user_text]; char buf[max_user_text];

3
src/proc.h
View File

@ -36,9 +36,6 @@
extern "C" { extern "C" {
#endif #endif
/* XXX: this should go global */
void extract_object_args_to_sub(struct text_object *, const char *);
void print_pid_chroot(struct text_object *obj, char *p, int p_max_size); void print_pid_chroot(struct text_object *obj, char *p, int p_max_size);
void print_pid_cmdline(struct text_object *obj, char *p, int p_max_size); void print_pid_cmdline(struct text_object *obj, char *p, int p_max_size);
void print_pid_cwd(struct text_object *obj, char *p, int p_max_size); void print_pid_cwd(struct text_object *obj, char *p, int p_max_size);