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

Use free_and_zero in conky.cc and core.cc where appropriate

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-23 22:06:04 +01:00
parent c9447ddb8e
commit f236523f30
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/conky.cc
View File

@ -1487,7 +1487,7 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
j++;
}
}
if (tmpcolour) free(tmpcolour);
free_and_zero(tmpcolour);
if (h > cur_y_add
&& h > font_h) {
cur_y_add = h;
@ -2258,9 +2258,7 @@ static void main_loop(void)
XFixesDestroyRegion(display, x11_stuff.region2);
XFixesDestroyRegion(display, x11_stuff.part);
#endif /* BUILD_XDAMAGE */
if (disp) {
free(disp);
}
free_and_zero(disp);
}
#endif /* BUILD_X11 */
free_and_zero(overwrite_file);
@ -2371,12 +2369,8 @@ void clean_up(void *memtofree1, void* memtofree2)
#endif
conftree_empty(currentconffile);
currentconffile = NULL;
if(memtofree1) {
free(memtofree1);
}
if(memtofree2) {
free(memtofree2);
}
free_and_zero(memtofree1);
free_and_zero(memtofree2);
timed_thread::destroy_registered_threads();
free_and_zero(info.cpu_usage);
@ -2931,8 +2925,7 @@ char load_config_file(const char *f)
if (!value || x_initialised == YES) {
CONF_ERR;
} else {
if (disp)
free(disp);
free_and_zero(disp);
disp = strdup(value);
}
}
@ -3279,9 +3272,7 @@ char load_config_file(const char *f)
variable_substitute(value, buffer, 256);
if (buffer[0] != '\0') {
if (current_mail_spool) {
free(current_mail_spool);
}
free_and_zero(current_mail_spool);
current_mail_spool = strndup(buffer, text_buffer_size);
}
} else {
@ -4260,9 +4251,7 @@ int main(int argc, char **argv)
case 'V':
print_version(); /* doesn't return */
case 'c':
if (current_config) {
free(current_config);
}
free_and_zero(current_config);
current_config = strndup(optarg, max_user_text);
break;
case 'q':
@ -4282,8 +4271,7 @@ int main(int argc, char **argv)
window.window = strtol(optarg, 0, 0);
break;
case 'X':
if (disp)
free(disp);
free_and_zero(disp);
disp = strdup(optarg);
break;
#endif /* BUILD_X11 */

9
src/core.cc
View File

@ -442,7 +442,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long
SCAN_CPU(arg, obj->data.i);
buf = scan_graph(obj, arg, 1);
DBGP2("Adding $cpugraph for CPU %d", obj->data.i);
if (buf) free(buf);
free_and_zero(buf);
obj->callbacks.graphval = &cpu_barval;
END OBJ(loadgraph, &update_load_average)
scan_loadgraph_arg(obj, arg);
@ -863,7 +863,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long
char *buf = 0;
buf = scan_graph(obj, arg, 1);
if (buf) free(buf);
free_and_zero(buf);
obj->callbacks.graphval = &mem_barval;
#endif /* BUILD_X11*/
END OBJ(mixer, 0)
@ -1612,7 +1612,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long
END OBJ(apcupsd_loadgraph, &update_apcupsd)
char* buf = 0;
buf = scan_graph(obj, arg, 100);
if (buf) free(buf);
free_and_zero(buf);
obj->callbacks.graphval = &apcupsd_loadbarval;
#endif /* BUILD_X11 */
END OBJ(apcupsd_loadgauge, &update_apcupsd)
@ -1865,8 +1865,7 @@ void free_text_objects(struct text_object *root)
free_text_objects(obj->sub);
free_and_zero(obj->sub);
}
if(obj->special_data)
free(obj->special_data);
free_and_zero(obj->special_data);
free(obj);
}