kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16-epplets.git/commit/?id=d1ca9c1c1c9e797001f2fb3a2829f56a63c8e157
commit d1ca9c1c1c9e797001f2fb3a2829f56a63c8e157 Author: Kim Woelders <[email protected]> Date: Wed Sep 1 19:53:39 2021 +0200 Drop pointer test for free() --- api/epplet.c | 72 ++++++++++++++---------------------------- epplets/ConfigTestEpplet.c | 3 +- epplets/E-Mountbox.c | 50 +++++++++-------------------- epplets/E-Pinger.c | 5 +-- epplets/E-SD.c | 3 +- epplets/E-ScreenSave.c | 6 ++-- epplets/E-ScreenShoot.c | 78 ++++++++++++++++------------------------------ epplets/E-Slides.c | 7 +---- epplets/E-Toolbox.c | 20 +++--------- epplets/E-UrlWatch.c | 42 +++++++++---------------- 10 files changed, 88 insertions(+), 198 deletions(-) diff --git a/api/epplet.c b/api/epplet.c index 1c9eb35..bdcd146 100644 --- a/api/epplet.c +++ b/api/epplet.c @@ -1467,10 +1467,8 @@ Epplet_remove_timer(const char *name) q_first = et->next; if (et->next) et->next->in += et->in; - if (et->name) - free(et->name); - if (et) - free(et); + free(et->name); + free(et); return; } pptr = ptr; @@ -1508,8 +1506,7 @@ Epplet_handle_timer(void) (*(et->func)) (et->data); if (et && et->name) free(et->name); - if (et) - free(et); + free(et); } double @@ -2148,8 +2145,7 @@ Epplet_textbox_insert(Epplet_gadget eg, const char *new_contents) else strcat(s, new_contents); - if (g->contents) - free(g->contents); + free(g->contents); g->contents = s; } @@ -2194,8 +2190,7 @@ Epplet_change_textbox(Epplet_gadget eg, const char *new_contents) if (g->contents == new_contents) return; - else if (g->contents) - free(g->contents); + free(g->contents); if ((s = strchr(new_contents, '\n'))) { @@ -3955,8 +3950,7 @@ Epplet_change_image(Epplet_gadget gadget, int w, int h, const char *image) GADGET_CONFIRM_TYPE(gadget, E_IMAGE); g = (GadImage *) gadget; gg = (GadGeneral *) gadget; - if (g->image) - free(g->image); + free(g->image); g->image = Epplet_find_file(image); g->w = w; g->h = h; @@ -3975,8 +3969,7 @@ Epplet_move_change_image(Epplet_gadget gadget, int x, int y, int w, int h, g = (GadImage *) gadget; gg = (GadGeneral *) gadget; Epplet_draw_image(gadget, 1); - if (g->image) - free(g->image); + free(g->image); g->image = Epplet_find_file(image); g->w = w; g->h = h; @@ -4633,12 +4626,9 @@ Epplet_gadget_destroy(Epplet_gadget gadget) g = (GadButton *) gadget; XDestroyWindow(disp, g->win); XDeleteContext(disp, g->win, xid_context); - if (g->label) - free(g->label); - if (g->image) - free(g->image); - if (g->std) - free(g->std); + free(g->label); + free(g->image); + free(g->std); free(g); } break; @@ -4682,10 +4672,8 @@ Epplet_gadget_destroy(Epplet_gadget gadget) g = (GadToggleButton *) gadget; XDestroyWindow(disp, g->win); XDeleteContext(disp, g->win, xid_context); - if (g->label) - free(g->label); - if (g->image) - free(g->image); + free(g->label); + free(g->image); free(g); } break; @@ -4696,12 +4684,9 @@ Epplet_gadget_destroy(Epplet_gadget gadget) g = (GadPopupButton *) gadget; XDestroyWindow(disp, g->win); XDeleteContext(disp, g->win, xid_context); - if (g->std) - free(g->std); - if (g->label) - free(g->label); - if (g->image) - free(g->image); + free(g->std); + free(g->label); + free(g->image); free(g); } break; @@ -4713,15 +4698,12 @@ Epplet_gadget_destroy(Epplet_gadget gadget) g = (GadPopup *) gadget; for (i = 0; i < g->entry_num; i++) { - if (g->entry[i].label) - free(g->entry[i].label); - if (g->entry[i].image) - free(g->entry[i].image); + free(g->entry[i].label); + free(g->entry[i].image); if (g->entry[i].gadget) Epplet_gadget_destroy(g->entry[i].gadget); } - if (g->entry) - free(g->entry); + free(g->entry); XDestroyWindow(disp, g->win); XDeleteContext(disp, g->win, xid_context); free(g); @@ -4732,8 +4714,7 @@ Epplet_gadget_destroy(Epplet_gadget gadget) GadImage *g; g = (GadImage *) gadget; - if (g->image) - free(g->image); + free(g->image); free(g); } break; @@ -4742,8 +4723,7 @@ Epplet_gadget_destroy(Epplet_gadget gadget) GadLabel *g; g = (GadLabel *) gadget; - if (g->label) - free(g->label); + free(g->label); free(g); } break; @@ -5337,8 +5317,7 @@ Epplet_change_button_label(Epplet_gadget gadget, const char *label) GADGET_CONFIRM_TYPE(gadget, E_BUTTON); g = (GadButton *) gadget; gg = (GadGeneral *) gadget; - if (g->label) - free(g->label); + free(g->label); g->label = Estrdup(label); if (gg->visible) Epplet_draw_button(gadget); @@ -5353,8 +5332,7 @@ Epplet_change_button_image(Epplet_gadget gadget, const char *image) GADGET_CONFIRM_TYPE(gadget, E_BUTTON); g = (GadButton *) gadget; gg = (GadGeneral *) gadget; - if (g->image) - free(g->image); + free(g->image); g->image = Epplet_find_file(image); if (gg->visible) Epplet_draw_button(gadget); @@ -5665,10 +5643,8 @@ Epplet_clear_config(void) for (i = 0; i < config_dict->num_entries; i++) { ci = &(config_dict->entries[i]); - if (ci->key) - free(ci->key); - if (ci->value) - free(ci->value); + free(ci->key); + free(ci->value); } free(config_dict->entries); free(config_dict); diff --git a/epplets/ConfigTestEpplet.c b/epplets/ConfigTestEpplet.c index 29c2af7..35ce297 100644 --- a/epplets/ConfigTestEpplet.c +++ b/epplets/ConfigTestEpplet.c @@ -48,8 +48,7 @@ main(int argc, char **argv) { printf("%s\n", results[i]); } - if (results) - free(results); + free(results); snprintf(s, sizeof(s), "Instance %i", Epplet_get_instance()); Epplet_gadget_show(Epplet_create_label(10, 2, s, 0)); diff --git a/epplets/E-Mountbox.c b/epplets/E-Mountbox.c index 9236f20..7ce97f6 100644 --- a/epplets/E-Mountbox.c +++ b/epplets/E-Mountbox.c @@ -957,14 +957,12 @@ ModifyMountPointType(MountPointType * mpt, const char *key, { if (key) { - if (mpt->key) - free(mpt->key); + free(mpt->key); mpt->key = strdup(key); } if (imagefile) { - if (mpt->imagefile) - free(mpt->imagefile); + free(mpt->imagefile); mpt->imagefile = strdup(imagefile); } } @@ -1000,14 +998,8 @@ DeleteMountPointType(MountPointType * mpt) } /* free it */ - if (mpt->key) - { - free(mpt->key); - } - if (mpt->imagefile) - { - free(mpt->imagefile); - } + free(mpt->key); + free(mpt->imagefile); if (mpt->image) { imlib_context_set_image(mpt->image); @@ -1045,10 +1037,8 @@ FreeMounts(void) { if (current->mountpoint) { - if (current->mountpoint->device) - free(current->mountpoint->device); - if (current->mountpoint->path) - free(current->mountpoint->path); + free(current->mountpoint->device); + free(current->mountpoint->path); free(current->mountpoint); } /* images need _not_ be freed here */ @@ -1068,14 +1058,8 @@ FreeMountPointTypes(void) current = types; while (current) { - if (current->key) - { - free(current->key); - } - if (current->imagefile) - { - free(current->imagefile); - } + free(current->key); + free(current->imagefile); if (current->image) { imlib_context_set_image(current->image); @@ -1193,8 +1177,7 @@ ParseFstab(void) } for (i = 0; i < 4; i++) - if (info[i]) - free(info[i]); + free(info[i]); } fclose(f); @@ -1247,10 +1230,8 @@ ParseProcMounts(void) tile = tile->next; } - if (device) - free(device); - if (path) - free(path); + free(device); + free(path); } fclose(f); @@ -1303,10 +1284,8 @@ ParseEtcMtab(void) tile = tile->next; } - if (device) - free(device); - if (path) - free(path); + free(device); + free(path); } fclose(f); @@ -1786,8 +1765,7 @@ SyncConfigs(void) Epplet_modify_multi_config("TYPEDEF", strings, num_types); for (i = 0; i < num_types; i++) - if (strings[i]) - free(strings[i]); + free(strings[i]); free(strings); } } diff --git a/epplets/E-Pinger.c b/epplets/E-Pinger.c index 355ee9a..88acc1f 100644 --- a/epplets/E-Pinger.c +++ b/epplets/E-Pinger.c @@ -281,10 +281,7 @@ set_host(const char *new_host) return (0); } - if (host) - { - free(host); - } + free(host); for (last_p = new_host + strlen(new_host), c_p = new_host; c_p < last_p; c_p++) diff --git a/epplets/E-SD.c b/epplets/E-SD.c index f64129c..4b78ad8 100644 --- a/epplets/E-SD.c +++ b/epplets/E-SD.c @@ -102,8 +102,7 @@ load_config(void) opt.cloak_anim = atoi(Epplet_query_config_def("CLOAK_ANIM", "4")); opt.cloak_delay = atof(Epplet_query_config_def("CLOAK_DELAY", "3")); opt.draw_interval = atof(Epplet_query_config_def("DRAW_INTERVAL", "0.05")); - if (opt.dir) - free(opt.dir); + free(opt.dir); opt.dir = _Strdup(Epplet_query_config_def("DIRECTORY", "~/")); } diff --git a/epplets/E-ScreenSave.c b/epplets/E-ScreenSave.c index 60d153c..45c8ff6 100644 --- a/epplets/E-ScreenSave.c +++ b/epplets/E-ScreenSave.c @@ -128,8 +128,7 @@ load_config(void) opt.cloak_delay = atof(Epplet_query_config_def("CLOAK_DELAY", "4")); opt.rand_delay = atof(Epplet_query_config_def("RAND_DELAY", "60")); opt.draw_interval = atof(Epplet_query_config_def("DRAW_INTERVAL", "0.1")); - if (opt.lock_cmd) - free(opt.lock_cmd); + free(opt.lock_cmd); opt.lock_cmd = _Strdup(Epplet_query_config_def ("LOCK_COMMAND", "xscreensaver-command -lock &")); @@ -361,8 +360,7 @@ delete_cb(void *data __UNUSED__, Window win __UNUSED__) static void apply_config(void) { - if (opt.lock_cmd) - free(opt.lock_cmd); + free(opt.lock_cmd); opt.lock_cmd = _Strdup(Epplet_textbox_contents(txt)); } diff --git a/epplets/E-ScreenShoot.c b/epplets/E-ScreenShoot.c index a17de96..b3299e3 100644 --- a/epplets/E-ScreenShoot.c +++ b/epplets/E-ScreenShoot.c @@ -192,47 +192,34 @@ load_config(void) opt.cloak_delay = atof(Epplet_query_config_def("CLOAK_DELAY", "4")); opt.rand_delay = atof(Epplet_query_config_def("RAND_DELAY", "60")); opt.draw_interval = atof(Epplet_query_config_def("DRAW_INTERVAL", "0.1")); - if (opt.dir) - free(opt.dir); + free(opt.dir); opt.dir = _Strdup(Epplet_query_config_def("DIRECTORY", "$HOME/")); - if (opt.file_prefix) - free(opt.file_prefix); + free(opt.file_prefix); opt.file_prefix = _Strdup(Epplet_query_config_def("FILE_PREFIX", "shot_")); - if (opt.file_stamp) - free(opt.file_stamp); + free(opt.file_stamp); opt.file_stamp = _Strdup(Epplet_query_config_def("FILE_STAMP", "`date +%d-%m-%y_%H%M%S`")); - if (opt.file_type) - free(opt.file_type); + free(opt.file_type); opt.file_type = _Strdup(Epplet_query_config_def("FILE_TYPE", "jpg")); - if (opt.script) - free(opt.script); + free(opt.script); opt.script = _Strdup(Epplet_query_config_def("SCRIPT_TO_RUN", "scrshot_script")); - if (opt.viewer) - free(opt.viewer); + free(opt.viewer); opt.viewer = _Strdup(Epplet_query_config_def("SHOT_VIEWER", "ee")); - if (opt.ftp_user) - free(opt.ftp_user); + free(opt.ftp_user); opt.ftp_user = _Strdup(Epplet_query_config_def("FTP_USER", "username")); - if (opt.ftp_pass) - free(opt.ftp_pass); + free(opt.ftp_pass); opt.ftp_pass = _Strdup(Epplet_query_config_def("FTP_PASS", "password")); - if (opt.ftp_host) - free(opt.ftp_host); + free(opt.ftp_host); opt.ftp_host = _Strdup(Epplet_query_config_def("FTP_HOST", "ftp.myhost.com")); - if (opt.ftp_dir) - free(opt.ftp_dir); + free(opt.ftp_dir); opt.ftp_dir = _Strdup(Epplet_query_config_def("FTP_DIR", "/images/")); - if (opt.ftp_file) - free(opt.ftp_file); + free(opt.ftp_file); opt.ftp_file = _Strdup(Epplet_query_config_def("FTP_FILE", "shot.jpg")); - if (opt.ftp_temp) - free(opt.ftp_temp); + free(opt.ftp_temp); opt.ftp_temp = _Strdup(Epplet_query_config_def("FTP_TEMP", "uploading.jpg")); - if (opt.grabber) - free(opt.grabber); + free(opt.grabber); opt.grabber = _Strdup(Epplet_query_config_def("SHOT_GRABBER", "import")); } @@ -404,8 +391,7 @@ cb_shot_delay(void *data) static void cb_grabber(void *data) { - if (opt.grabber) - free(opt.grabber); + free(opt.grabber); opt.grabber = _Strdup((char *)data); } @@ -468,41 +454,29 @@ cb_out(void *data __UNUSED__, Window w) static void apply_config(void) { - if (opt.file_prefix) - free(opt.file_prefix); + free(opt.file_prefix); opt.file_prefix = _Strdup(Epplet_textbox_contents(txt_file_prefix)); - if (opt.file_stamp) - free(opt.file_stamp); + free(opt.file_stamp); opt.file_stamp = _Strdup(Epplet_textbox_contents(txt_file_stamp)); - if (opt.file_type) - free(opt.file_type); + free(opt.file_type); opt.file_type = _Strdup(Epplet_textbox_contents(txt_file_type)); - if (opt.viewer) - free(opt.viewer); + free(opt.viewer); opt.viewer = _Strdup(Epplet_textbox_contents(txt_viewer)); - if (opt.script) - free(opt.script); + free(opt.script); opt.script = _Strdup(Epplet_textbox_contents(txt_script)); - if (opt.dir) - free(opt.dir); + free(opt.dir); opt.dir = _Strdup(Epplet_textbox_contents(txt_dir)); - if (opt.ftp_user) - free(opt.ftp_user); + free(opt.ftp_user); opt.ftp_user = _Strdup(Epplet_textbox_contents(txt_ftp_user)); - if (opt.ftp_pass) - free(opt.ftp_pass); + free(opt.ftp_pass); opt.ftp_pass = _Strdup(Epplet_textbox_contents(txt_ftp_pass)); - if (opt.ftp_host) - free(opt.ftp_host); + free(opt.ftp_host); opt.ftp_host = _Strdup(Epplet_textbox_contents(txt_ftp_host)); - if (opt.ftp_dir) - free(opt.ftp_dir); + free(opt.ftp_dir); opt.ftp_dir = _Strdup(Epplet_textbox_contents(txt_ftp_dir)); - if (opt.ftp_file) - free(opt.ftp_file); + free(opt.ftp_file); opt.ftp_file = _Strdup(Epplet_textbox_contents(txt_ftp_file)); - if (opt.ftp_temp) - free(opt.ftp_temp); + free(opt.ftp_temp); opt.ftp_temp = _Strdup(Epplet_textbox_contents(txt_ftp_temp)); } diff --git a/epplets/E-Slides.c b/epplets/E-Slides.c index abe6953..680c36b 100644 --- a/epplets/E-Slides.c +++ b/epplets/E-Slides.c @@ -673,12 +673,7 @@ get_images(char *image_path) unsigned int i; for (i = 0; i < image_cnt; i++) - { - if (filenames[i]) - { - free(filenames[i]); - } - } + free(filenames[i]); free(filenames); } image_cnt = cnt; diff --git a/epplets/E-Toolbox.c b/epplets/E-Toolbox.c index 02de714..ff1e050 100644 --- a/epplets/E-Toolbox.c +++ b/epplets/E-Toolbox.c @@ -139,10 +139,7 @@ create_gadget(int n) button_cb, &buttons[n]); Epplet_gadget_show(buttons[n].gad); } - if (std) - { - free(std); - } + free(std); } static void @@ -152,18 +149,9 @@ delete_gadget(int n) { return; } - if (buttons[n].prog) - { - free(buttons[n].prog); - } - if (buttons[n].label) - { - free(buttons[n].label); - } - if (buttons[n].image) - { - free(buttons[n].image); - } + free(buttons[n].prog); + free(buttons[n].label); + free(buttons[n].image); if (buttons[n].gad && buttons[n].popup == -1) { Epplet_gadget_destroy(buttons[n].gad); diff --git a/epplets/E-UrlWatch.c b/epplets/E-UrlWatch.c index a6dc4c7..5bd7350 100644 --- a/epplets/E-UrlWatch.c +++ b/epplets/E-UrlWatch.c @@ -109,31 +109,25 @@ load_config(void) opt.do_new_url_command = atoi(Epplet_query_config_def("RUN_COMMAND_ON_NEW_URL", "1")); /* If reloading, free the old string before assigning a new one */ - if (opt.www_command) - free(opt.www_command); + free(opt.www_command); opt.www_command = _Strdup(Epplet_query_config_def ("WWW_COMMAND", "gnome-moz-remote --newwin \"%s\" &")); - if (opt.ftp_command) - free(opt.ftp_command); + free(opt.ftp_command); opt.ftp_command = _Strdup(Epplet_query_config_def ("FTP_COMMAND", "gnome-moz-remote --newwin \"%s\" &")); - if (opt.get_command) - free(opt.get_command); + free(opt.get_command); opt.get_command = _Strdup(Epplet_query_config_def ("GET_COMMAND", "Eterm -O -e wget \"%s\" &")); - if (opt.url_save_file) - free(opt.url_save_file); + free(opt.url_save_file); snprintf(buf, sizeof(buf), "%s/.Urls", home); opt.url_save_file = _Strdup(Epplet_query_config_def("URL_SAVE_FILE", buf)); - if (opt.url_file) - free(opt.url_file); + free(opt.url_file); snprintf(buf, sizeof(buf), "%s/.te/.urls", home); opt.url_file = _Strdup(Epplet_query_config_def("URL_CHECK_FILE", buf)); - if (opt.new_url_command) - free(opt.new_url_command); + free(opt.new_url_command); snprintf(buf, sizeof(buf), "esdplay %s/wooeep.wav &", Epplet_data_dir()); opt.new_url_command = _Strdup(Epplet_query_config_def("NEW_URL_COMMAND", buf)); @@ -161,23 +155,17 @@ static void apply_config(void) { /* Apply options from settings dialog */ - if (opt.new_url_command) - free(opt.new_url_command); + free(opt.new_url_command); opt.new_url_command = _Strdup(Epplet_textbox_contents(txt_new_url_command)); - if (opt.url_save_file) - free(opt.url_save_file); + free(opt.url_save_file); opt.url_save_file = _Strdup(Epplet_textbox_contents(txt_url_save_file)); - if (opt.url_file) - free(opt.url_file); + free(opt.url_file); opt.url_file = _Strdup(Epplet_textbox_contents(txt_url_file)); - if (opt.www_command) - free(opt.www_command); + free(opt.www_command); opt.www_command = _Strdup(Epplet_textbox_contents(txt_www_command)); - if (opt.ftp_command) - free(opt.ftp_command); + free(opt.ftp_command); opt.ftp_command = _Strdup(Epplet_textbox_contents(txt_ftp_command)); - if (opt.get_command) - free(opt.get_command); + free(opt.get_command); opt.get_command = _Strdup(Epplet_textbox_contents(txt_get_command)); if (opt.check_url_file) Epplet_timer(check_url_file, NULL, 1, "URLCHECK_TIMER"); @@ -496,8 +484,7 @@ validate_url(const char *url) if (!url) return NULL; - if (orig_ret) - free(orig_ret); + free(orig_ret); ret = orig_ret = _Strdup(url); @@ -648,8 +635,7 @@ display_string(const char *string) { D(("In display_string: String -->%s<--\n", string)); - if (dtext.str) - free(dtext.str); + free(dtext.str); dtext.str = _Strdup(string); dtext.len = strlen(string); dtext.pos = 0; --
