Changeset 2290 for trunk/src/kash/expand.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/expand.c (modified) (6 diffs)

trunk/src/kash/expand.c

@@ -309 +309 @@
                         INTOFF;
                         ifsp = psh->ifsfirst.next->next;
-                        ckfree(psh->ifsfirst.next);
+                        ckfree(psh, psh->ifsfirst.next);
                         psh->ifsfirst.next = ifsp;
                         INTON;
@@ -329 +329 @@
                 INTOFF;
                 ifsp = psh->ifslastp->next->next;
-                ckfree(psh->ifslastp->next);
+                ckfree(psh, psh->ifslastp->next);
                 psh->ifslastp->next = ifsp;
                 INTON;
@@ -463 +463 @@
                 shfile_close(&psh->fdtab, in.fd);
         if (in.buf)
-                ckfree(in.buf);
+                ckfree(psh, in.buf);
         if (in.jp)
                 psh->back_exitstatus = waitforjob(psh, in.jp);
@@ -922 +922 @@
                         return;
                 }
-                ifsp = (struct ifsregion *)ckmalloc(sizeof (struct ifsregion));
+                ifsp = (struct ifsregion *)ckmalloc(psh, sizeof (struct ifsregion));
                 psh->ifslastp->next = ifsp;
         }
@@ -1045 +1045 @@
                 INTOFF;
                 ifsp = psh->ifsfirst.next->next;
-                ckfree(psh->ifsfirst.next);
+                ckfree(psh, psh->ifsfirst.next);
                 psh->ifsfirst.next = ifsp;
                 INTON;
@@ -1086 +1086 @@
                 if (psh->expdir == NULL) {
                         size_t i = strlen(str->text);
-                        psh->expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
+                        psh->expdir = ckmalloc(psh, i < 2048 ? 2048 : i); /* XXX */
                 }
 
                 expmeta(psh, psh->expdir, str->text);
-                ckfree(psh->expdir);
+                ckfree(psh, psh->expdir);
                 psh->expdir = NULL;
                 INTON;