code cleanup: s/if (X) free(X);/free(X);/

3 files changed, 8 insertions, 15 deletions

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 50818a6..64e4f44 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -5343,7 +5343,7 @@ _smart_pty_command(void *data)
                             termpty_block_insert(sd->pty, repch, blk);
                          }
                     }
-                  if (link) free(link);
+                  free(link);
                   EINA_LIST_FREE(strs, pp) free(pp);
                }
              return;
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 8c035e6..c1590f2 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -503,8 +503,8 @@ termpty_new(const char *cmd, Eina_Bool login_shell, const char *cd,
    termpty_save_register(ty);
    return ty;
 err:
-   if (ty->screen) free(ty->screen);
-   if (ty->screen2) free(ty->screen2);
+   free(ty->screen);
+   free(ty->screen2);
    if (ty->fd >= 0) close(ty->fd);
    if (ty->slavefd >= 0) close(ty->slavefd);
    free(ty);
@@ -577,10 +577,9 @@ termpty_free(Termpty *ty)
         free(ty->back);
         ty->back = NULL;
      }
-   if (ty->screen) free(ty->screen);
-   if (ty->screen2) free(ty->screen2);
-   if (ty->buf) free(ty->buf);
-   memset(ty, 0, sizeof(Termpty));
+   free(ty->screen);
+   free(ty->screen2);
+   free(ty->buf);
    free(ty);
 }
 
diff --git a/src/bin/tyls.c b/src/bin/tyls.c
index f381b32..8469ff7 100644
--- a/src/bin/tyls.c
+++ b/src/bin/tyls.c
@@ -483,16 +483,10 @@ fileicon(const char *path)
    name = ecore_file_file_get(path);
    if (name)
      {
-        char *ts;
-             
         if (ecore_file_is_dir(path)) isdir = EINA_TRUE;
-        ts = ecore_file_readlink(path);
-        if (ts)
-          {
-             free(ts);
-          }
+        free(ecore_file_readlink(path));
         if (ecore_file_can_exec(path)) isexec = EINA_TRUE;
-        
+
         if (isdir) return filematch(name, dmatch);
         else if (isexec) return filematch(name, xmatch);
         else return filematch(name, fmatch);