Changeset 2290 for trunk/src/kash/input.c

Timestamp:

Feb 27, 2009, 5:08:07 AM (16 years ago)

Author:

bird

Message:

kash: malloc/free/friends gets a psh.

File:

• trunk/src/kash/input.c (modified) (6 diffs)

trunk/src/kash/input.c

@@ -343 +343 @@
 /*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
         if (psh->parsefile->strpush) {
-                sp = ckmalloc(sizeof (struct strpush));
+                sp = ckmalloc(psh, sizeof (struct strpush));
                 sp->prev = psh->parsefile->strpush;
                 psh->parsefile->strpush = sp;
@@ -373 +373 @@
         psh->parsefile->strpush = sp->prev;
         if (sp != &(psh->parsefile->basestrpush))
-                ckfree(sp);
+                ckfree(psh, sp);
         INTON;
 }
@@ -415 +415 @@
         if (push) {
                 pushfile(psh);
-                psh->parsefile->buf = ckmalloc(BUFSIZ);
+                psh->parsefile->buf = ckmalloc(psh, BUFSIZ);
         }
         if (psh->parsefile->fd > 0)
@@ -421 +421 @@
         psh->parsefile->fd = fd;
         if (psh->parsefile->buf == NULL)
-                psh->parsefile->buf = ckmalloc(BUFSIZ);
+                psh->parsefile->buf = ckmalloc(psh, BUFSIZ);
         psh->parselleft = psh->parsenleft = 0;
         psh->plinno = 1;
@@ -460 +460 @@
         psh->parsefile->nextc = psh->parsenextc;
         psh->parsefile->linno = psh->plinno;
-        pf = (struct parsefile *)ckmalloc(sizeof (struct parsefile));
+        pf = (struct parsefile *)ckmalloc(psh, sizeof (struct parsefile));
         pf->prev = psh->parsefile;
         pf->fd = -1;
@@ -478 +478 @@
                 shfile_close(&psh->fdtab, pf->fd);
         if (pf->buf)
-                ckfree(pf->buf);
+                ckfree(psh, pf->buf);
         while (pf->strpush)
                 popstring(psh);
         psh->parsefile = pf->prev;
-        ckfree(pf);
+        ckfree(psh, pf);
         psh->parsenleft = psh->parsefile->nleft;
         psh->parselleft = psh->parsefile->lleft;