kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=688ab0edba3a1bec7feb0d3bef273d434a125049
commit 688ab0edba3a1bec7feb0d3bef273d434a125049 Author: Kim Woelders <[email protected]> Date: Sat Nov 20 16:47:40 2021 +0100 Drop unnecessary free() NULL argument checks --- src/lib/dynamic_filters.c | 3 +-- src/lib/file.c | 3 +-- src/lib/font_load.c | 9 +++------ src/lib/font_main.c | 3 +-- src/lib/image.c | 13 +++++-------- src/lib/loaders.c | 3 +-- src/lib/polygon.c | 3 +-- src/lib/rend.c | 18 ++++++------------ src/lib/ximage.c | 3 +-- src/modules/loaders/loader_argb.c | 3 +-- 10 files changed, 21 insertions(+), 40 deletions(-) diff --git a/src/lib/dynamic_filters.c b/src/lib/dynamic_filters.c index 91ab6fe..1d86156 100644 --- a/src/lib/dynamic_filters.c +++ b/src/lib/dynamic_filters.c @@ -114,8 +114,7 @@ __imlib_dynamic_filters_init() } } FREESHOW; - if (list) - free(list); + free(list); } } diff --git a/src/lib/file.c b/src/lib/file.c index caa322a..d5a5242 100644 --- a/src/lib/file.c +++ b/src/lib/file.c @@ -288,8 +288,7 @@ __imlib_FileFreeDirList(char **l, int num) if (!l) return; while (num--) - if (l[num]) - free(l[num]); + free(l[num]); free(l); } diff --git a/src/lib/font_load.c b/src/lib/font_load.c index 3212866..26ddad9 100644 --- a/src/lib/font_load.c +++ b/src/lib/font_load.c @@ -341,10 +341,8 @@ __imlib_font_flush_last(void) __imlib_hash_foreach(fn->glyphs, font_flush_free_glyph_cb, NULL); __imlib_hash_free(fn->glyphs); - if (fn->file) - free(fn->file); - if (fn->name) - free(fn->name); + free(fn->file); + free(fn->name); FT_Done_Face(fn->ft.face); free(fn); } @@ -393,8 +391,7 @@ __imlib_font_del_font_path(const char *path) { if (!strcmp(path, fpath[i])) { - if (fpath[i]) - free(fpath[i]); + free(fpath[i]); fpath_num--; for (j = i; j < fpath_num; j++) fpath[j] = fpath[j + 1]; diff --git a/src/lib/font_main.c b/src/lib/font_main.c index d83858c..1133a0a 100644 --- a/src/lib/font_main.c +++ b/src/lib/font_main.c @@ -295,8 +295,7 @@ __imlib_hash_add(Imlib_Hash * hash, const char *key, const void *data) if (imlib_list_alloc_error()) { _imlib_hash_alloc_error = 1; - if (el->key) - free(el->key); + free(el->key); free(el); return hash; } diff --git a/src/lib/image.c b/src/lib/image.c index 6164cf0..b3364e9 100644 --- a/src/lib/image.c +++ b/src/lib/image.c @@ -106,14 +106,12 @@ __imlib_ConsumeImage(ImlibImage * im) if (im->real_file && im->real_file != im->file) free(im->real_file); - if (im->file) - free(im->file); - if (im->key) - free(im->key); + free(im->file); + free(im->key); if ((IMAGE_FREE_DATA(im)) && (im->data)) __imlib_FreeData(im); - if (im->format) - free(im->format); + free(im->format); + free(im); #ifdef BUILD_X11 @@ -328,8 +326,7 @@ __imlib_ConsumeImagePixmap(ImlibImagePixmap * ip) XFreePixmap(ip->display, ip->pixmap); if (ip->mask) XFreePixmap(ip->display, ip->mask); - if (ip->file) - free(ip->file); + free(ip->file); free(ip); } diff --git a/src/lib/loaders.c b/src/lib/loaders.c index 0be8c8b..dc232fb 100644 --- a/src/lib/loaders.c +++ b/src/lib/loaders.c @@ -151,8 +151,7 @@ __imlib_ProduceLoader(const char *file) static void __imlib_ConsumeLoader(ImlibLoader * l) { - if (l->file) - free(l->file); + free(l->file); if (l->handle) dlclose(l->handle); if (l->formats) diff --git a/src/lib/polygon.c b/src/lib/polygon.c index b8e3b8a..c06df45 100644 --- a/src/lib/polygon.c +++ b/src/lib/polygon.c @@ -61,8 +61,7 @@ __imlib_polygon_add_point(ImlibPoly poly, int x, int y) void __imlib_polygon_free(ImlibPoly poly) { - if (poly->points) - free(poly->points); + free(poly->points); free(poly); } diff --git a/src/lib/rend.c b/src/lib/rend.c index 692b354..03fe3b9 100644 --- a/src/lib/rend.c +++ b/src/lib/rend.c @@ -333,8 +333,7 @@ __imlib_RenderImage(Display * d, ImlibImage * im, if (!xim) { __imlib_FreeScaleInfo(scaleinfo); - if (back) - free(back); + free(back); return; } if (m) @@ -344,8 +343,7 @@ __imlib_RenderImage(Display * d, ImlibImage * im, { __imlib_ConsumeXImage(d, xim); __imlib_FreeScaleInfo(scaleinfo); - if (back) - free(back); + free(back); return; } memset(mxim->data, 0, mxim->bytes_per_line * mxim->height); @@ -361,8 +359,7 @@ __imlib_RenderImage(Display * d, ImlibImage * im, if (m) __imlib_ConsumeXImage(d, mxim); __imlib_FreeScaleInfo(scaleinfo); - if (back) - free(back); + free(back); return; } } @@ -426,8 +423,7 @@ __imlib_RenderImage(Display * d, ImlibImage * im, if (m) __imlib_ConsumeXImage(d, mxim); __imlib_FreeScaleInfo(scaleinfo); - if (back) - free(back); + free(back); return; } memcpy(buf, im->data + ((y + sy) * im->w), @@ -463,12 +459,10 @@ __imlib_RenderImage(Display * d, ImlibImage * im, h -= LINESIZE; } /* free up our buffers and poit tables */ - if (buf) - free(buf); + free(buf); if (scaleinfo) __imlib_FreeScaleInfo(scaleinfo); - if (back) - free(back); + free(back); /* if we changed diplays or depth since last time... free old gc */ if ((gc) && ((last_depth != depth) || (disp != d))) { diff --git a/src/lib/ximage.c b/src/lib/ximage.c index df2917f..eacd89a 100644 --- a/src/lib/ximage.c +++ b/src/lib/ximage.c @@ -330,8 +330,7 @@ __imlib_FlushXImage(Display * d) if (list_num == 0) { - if (xim_cache) - free(xim_cache); + free(xim_cache); xim_cache = NULL; } else diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c index 93d1be1..7ad292f 100644 --- a/src/modules/loaders/loader_argb.c +++ b/src/modules/loaders/loader_argb.c @@ -165,8 +165,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity) quit: /* finish off */ #ifdef WORDS_BIGENDIAN - if (buf) - free(buf); + free(buf); #endif fclose(f); --
