Hello,

Previously in csh(1) the xfree() function was removed in favour
of regular free(). This patch removes a couple of NULL checks
before free().

- Michael

PS: Thanks for putting hostname in the default prompt!


Index: csh.c
===================================================================
RCS file: /cvs/src/bin/csh/csh.c,v
retrieving revision 1.42
diff -u -p -u -r1.42 csh.c
--- csh.c       12 Dec 2017 00:18:58 -0000      1.42
+++ csh.c       15 Dec 2017 08:50:48 -0000
@@ -1013,10 +1013,8 @@ process(bool catch)
                printprompt();
            (void) fflush(cshout);
        }
-       if (seterr) {
-           free(seterr);
-           seterr = NULL;
-       }
+       free(seterr);
+       seterr = NULL;
 
        /*
         * Echo not only on VERBOSE, but also with history expansion. If there
Index: dol.c
===================================================================
RCS file: /cvs/src/bin/csh/dol.c,v
retrieving revision 1.20
diff -u -p -u -r1.20 dol.c
--- dol.c       26 Dec 2015 13:48:38 -0000      1.20
+++ dol.c       15 Dec 2017 08:50:48 -0000
@@ -408,8 +408,7 @@ Dgetdol(void)
        if (dimen || bitset)
            stderror(ERR_SYNTAX);
        if (backpid != 0) {
-           if (dolbang)
-               free(dolbang);
+           free(dolbang);
            setDolp(dolbang = putn(backpid));
        }
        goto eatbrac;
Index: error.c
===================================================================
RCS file: /cvs/src/bin/csh/error.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 error.c
--- error.c     26 Dec 2015 13:48:38 -0000      1.12
+++ error.c     15 Dec 2017 08:50:48 -0000
@@ -346,10 +346,8 @@ stderror(int id, ...)
        }
     }
 
-    if (seterr) {
-       free(seterr);
-       seterr = NULL;
-    }
+    free(seterr);
+    seterr = NULL;
 
     if ((v = pargv) != NULL)
        pargv = 0, blkfree(v);
Index: func.c
===================================================================
RCS file: /cvs/src/bin/csh/func.c,v
retrieving revision 1.35
diff -u -p -u -r1.35 func.c
--- func.c      30 Aug 2017 06:42:21 -0000      1.35
+++ func.c      15 Dec 2017 08:50:48 -0000
@@ -824,8 +824,7 @@ wfree(void)
 
        if (wp->w_fe0)
            blkfree(wp->w_fe0);
-       if (wp->w_fename)
-           free(wp->w_fename);
+       free(wp->w_fename);
        free(wp);
     }
 }
@@ -929,8 +928,7 @@ dounsetenv(Char **v, struct command *t)
     int     i, maxi;
     static Char *name = NULL;
 
-    if (name)
-       free(name);
+    free(name);
     /*
      * Find the longest environment variable
      */

Reply via email to