performance

[unix-history] / usr / src / bin / csh / parse.c

diff --git a/usr/src/bin/csh/parse.c b/usr/src/bin/csh/parse.c
index c721592..7ca7dda 100644 (file)
--- a/usr/src/bin/csh/parse.c
+++ b/usr/src/bin/csh/parse.c
@@ -1,4 +1,6 @@
-static char *sccsid = "@(#)parse.c 4.1 %G%";
+#ifndef lint
+static char *sccsid = "@(#)parse.c     4.2 (Berkeley) %G%";
+#endif

 
 #include "sh.h"
 
 
 #include "sh.h"
 


@@ -118,7 +120,7 @@ asyn3(p1, p2)
                char *cp = alout.next->word;
 
                alout.next->word = strspl("\200", cp);
                char *cp = alout.next->word;
 
                alout.next->word = strspl("\200", cp);

-               xfree(cp);
+               XFREE(cp)

        }
        p1 = freenod(p1, redid ? p2 : p1->next);
        if (alout.next != &alout) {
        }
        p1 = freenod(p1, redid ? p2 : p1->next);
        if (alout.next != &alout) {


@@ -126,8 +128,8 @@ asyn3(p1, p2)
                alout.prev->prev->next = p1->next;
                alout.next->prev = p1;
                p1->next = alout.next;
                alout.prev->prev->next = p1->next;
                alout.next->prev = p1;
                p1->next = alout.next;

-               xfree(alout.prev->word);
-               xfree((char *)(alout.prev));
+               XFREE(alout.prev->word)
+               XFREE((char *)alout.prev)

        }
        reset();                /* throw! */
 }
        }
        reset();                /* throw! */
 }


@@ -139,9 +141,9 @@ freenod(p1, p2)
        register struct wordent *retp = p1->prev;
 
        while (p1 != p2) {
        register struct wordent *retp = p1->prev;
 
        while (p1 != p2) {

-               xfree(p1->word);
+               XFREE(p1->word)

                p1 = p1->next;
                p1 = p1->next;

-               xfree((char *)(p1->prev));
+               XFREE((char *)p1->prev)

        }
        retp->next = p2;
        p2->prev = retp;
        }
        retp->next = p2;
        p2->prev = retp;


@@ -491,7 +493,7 @@ again:
        if (n < 0)
                n = 0;
        t = (struct command *) calloc(1, sizeof (*t));
        if (n < 0)
                n = 0;
        t = (struct command *) calloc(1, sizeof (*t));

-       av = (char **) calloc(n + 1, sizeof (char **));
+       av = (char **) calloc((unsigned) (n + 1), sizeof (char **));

        t->t_dcom = av;
        n = 0;
        if (p2->word[0] == ')')
        t->t_dcom = av;
        n = 0;
        if (p2->word[0] == ')')


@@ -599,8 +601,8 @@ freesyn(t)
 
        case TCOM:
                for (v = t->t_dcom; *v; v++)
 
        case TCOM:
                for (v = t->t_dcom; *v; v++)

-                       xfree(*v);
-               xfree((char *)(t->t_dcom));
+                       XFREE(*v)
+               XFREE((char *)t->t_dcom)

                goto lr;
 
        case TPAR:
                goto lr;
 
        case TPAR:


@@ -608,7 +610,8 @@ freesyn(t)
                /* fall into ... */
 
 lr:
                /* fall into ... */
 
 lr:

-               xfree(t->t_dlef), xfree(t->t_drit);
+               XFREE(t->t_dlef)
+               XFREE(t->t_drit)

                break;
 
        case TAND:
                break;
 
        case TAND:


@@ -618,5 +621,5 @@ lr:
                freesyn(t->t_dcar), freesyn(t->t_dcdr);
                break;
        }
                freesyn(t->t_dcar), freesyn(t->t_dcdr);
                break;
        }

-       xfree((char *)t);
+       XFREE((char *)t)

 }
 }