diff options
| -rw-r--r-- | src/lib/image.c | 3 | ||||
| -rw-r--r-- | src/modules/loaders/loader_pnm.c | 18 | ||||
| -rw-r--r-- | src/modules/loaders/loader_tga.c | 6 |
3 files changed, 9 insertions, 18 deletions
diff --git a/src/lib/image.c b/src/lib/image.c index 2cb7a1a..592e9a4 100644 --- a/src/lib/image.c +++ b/src/lib/image.c @@ -676,8 +676,7 @@ __imlib_TrimLoaderList(char **list, int *num) if (list[i]) free(list[i]); } - if (list) - free(list); + free(list); *num = size; return ret; } diff --git a/src/modules/loaders/loader_pnm.c b/src/modules/loaders/loader_pnm.c index c77628e..229a270 100644 --- a/src/modules/loaders/loader_pnm.c +++ b/src/modules/loaders/loader_pnm.c @@ -279,8 +279,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (idata) - free(idata); + free(idata); fclose(f); return 2; } @@ -372,8 +371,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (idata) - free(idata); + free(idata); fclose(f); return 2; } @@ -465,8 +463,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (data) - free(data); + free(data); fclose(f); return 2; } @@ -533,8 +530,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (data) - free(data); + free(data); fclose(f); return 2; } @@ -591,8 +587,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (data) - free(data); + free(data); fclose(f); return 2; } @@ -660,8 +655,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!progress(im, per, 0, pl, im->w, l)) { - if (data) - free(data); + free(data); fclose(f); return 2; } diff --git a/src/modules/loaders/loader_tga.c b/src/modules/loaders/loader_tga.c index 2070166..80fb749 100644 --- a/src/modules/loaders/loader_tga.c +++ b/src/modules/loaders/loader_tga.c @@ -156,8 +156,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity) l = y - pl; if (!progress(im, per, 0, (y - l), im->w, l)) { - if (buf) - free(buf); + free(buf); fclose(f); return 2; } @@ -173,8 +172,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity) /* write the image data */ fwrite(buf, 1, im->w * im->h * ((im->flags & F_HAS_ALPHA) ? 4 : 3), f); - if (buf) - free(buf); + free(buf); fclose(f); return 1; } |