Changeset 35 for trunk/src/kmk/var.c

Timestamp:

Mar 18, 2003, 4:58:49 AM (22 years ago)

Author:

bird

Message:

emx is kind of working again...

File:

• trunk/src/kmk/var.c (modified) (23 diffs)

trunk/src/kmk/var.c

@@ -412 +412 @@
 {
     Var *v = (Var *) vp;
-    free(v->name);
+    efree(v->name);
     Buf_Destroy(v->val, TRUE);
-    free((Address) v);
+    efree((Address) v);
 }
 
@@ -505 +505 @@
     if (ctxt == VAR_CMD) {
         #ifdef USE_KLIB
-        kEnvSet(name, val);
+        kEnvSet(name, val, TRUE);
         #else
         setenv(name, val, 1);
@@ -593 +593 @@
         return(FALSE);
     } else if (v->flags & VAR_FROM_ENV) {
-        free(v->name);
+        efree(v->name);
         Buf_Destroy(v->val, TRUE);
-        free((char *)v);
+        efree((char *)v);
     }
     return(TRUE);
@@ -626 +626 @@
         if (v->flags & VAR_FROM_ENV) {
             Buf_Destroy(v->val, FALSE);
-            free((Address) v);
+            efree((Address) v);
             *frp = p;
         }
@@ -1168 +1168 @@
     regerror(err, pat, errbuf, errlen);
     Error("%s: %s", str, errbuf);
-    free(errbuf);
+    efree(errbuf);
 }
 
@@ -1422 +1422 @@
                     Buf_AddBytes(buf, strlen(cp2), (Byte *) cp2);
                     if (freeIt)
-                        free(cp2);
+                        efree(cp2);
                     cp += len - 1;
                 } else {
@@ -1535 +1535 @@
     Boolean         err;        /* TRUE if undefined variables are an error */
     int             *lengthPtr; /* OUT: The length of the specification */
-    Boolean         *freePtr;   /* OUT: TRUE if caller should free result */
+    Boolean         *freePtr;   /* OUT: TRUE if caller should efree result */
 {
     register char   *tstr;      /* Pointer into str */
@@ -1630 +1630 @@
                                 Buf_AddBytes(buf, strlen(rval), (Byte *) rval);
                                 if (rfree)
-                                        free(rval);
+                                        efree(rval);
                         }
                         tstr += rlen - 1;
@@ -1708 +1708 @@
                         /*
                          * Resulting string is dynamically allocated, so
-                         * tell caller to free it.
+                         * tell caller to efree it.
                          */
                         *freePtr = TRUE;
@@ -1936 +1936 @@
                     }
                     if (copy) {
-                        free(pattern);
+                        efree(pattern);
                     }
                     break;
@@ -1990 +1990 @@
                                 Buf_AddBytes(buf, strlen(cp2), (Byte *)cp2);
                                 if (freeIt) {
-                                    free(cp2);
+                                    efree(cp2);
                                 }
                                 cp += len - 1;
@@ -2014 +2014 @@
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
-                            free(str);
+                            efree(str);
                         }
                         Buf_Destroy(buf, TRUE);
@@ -2061 +2061 @@
                             cp += len - 1;
                             if (freeIt) {
-                                free(cp2);
+                                efree(cp2);
                             }
                         } else if (*cp == '&') {
@@ -2079 +2079 @@
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
-                            free(str);
+                            efree(str);
                         }
                         Buf_Destroy(buf, TRUE);
@@ -2108 +2108 @@
                      * Free the two strings.
                      */
-                    free(pattern.lhs);
-                    free(pattern.rhs);
+                    efree(pattern.lhs);
+                    efree(pattern.rhs);
                     break;
                 }
@@ -2129 +2129 @@
                         *lengthPtr = cp - start + 1;
                         if (*freePtr)
-                            free(str);
+                            efree(str);
                         if (delim != '\0')
                             Error("Unclosed substitution for %s (%c missing)",
@@ -2138 +2138 @@
                     if ((pattern.replace = VarGetPattern(ctxt, err, &cp,
                         delim, NULL, NULL, NULL)) == NULL){
-                        free(re);
+                        efree(re);
 
                         /* was: goto cleanup */
                         *lengthPtr = cp - start + 1;
                         if (*freePtr)
-                            free(str);
+                            efree(str);
                         if (delim != '\0')
                             Error("Unclosed substitution for %s (%c missing)",
@@ -2165 +2165 @@
 
                     error = regcomp(&pattern.re, re, REG_EXTENDED);
-                    free(re);
+                    efree(re);
                     if (error)  {
                         *lengthPtr = cp - start + 1;
                         VarREError(error, &pattern.re, "RE substitution error");
-                        free(pattern.replace);
+                        efree(pattern.replace);
                         return (var_Error);
                     }
@@ -2183 +2183 @@
                                        (ClientData) &pattern);
                     regfree(&pattern.re);
-                    free(pattern.replace);
-                    free(pattern.matches);
+                    efree(pattern.replace);
+                    efree(pattern.matches);
                     break;
                 }
@@ -2327 +2327 @@
 
             if (*freePtr) {
-                free (str);
+                efree (str);
             }
             str = newStr;
@@ -2357 +2357 @@
         } else {
             /*
-             * Returning the value unmodified, so tell the caller to free
+             * Returning the value unmodified, so tell the caller to efree
              * the thing.
              */
@@ -2363 +2363 @@
         }
         Buf_Destroy(v->val, destroy);
-        free((Address)v);
+        efree((Address)v);
     } else if (v->flags & VAR_JUNK) {
         /*
-         * Perform any free'ing needed and set *freePtr to FALSE so the caller
-         * doesn't try to free a static pointer.
+         * Perform any efree'ing needed and set *freePtr to FALSE so the caller
+         * doesn't try to efree a static pointer.
          */
         if (*freePtr) {
-            free(str);
+            efree(str);
         }
         *freePtr = FALSE;
         Buf_Destroy(v->val, TRUE);
-        free((Address)v);
+        efree((Address)v);
         if (dynamic) {
             str = emalloc(*lengthPtr + 1);
@@ -2541 +2541 @@
                 Buf_AddBytes (buf, strlen (val), (Byte *)val);
                 if (doFree) {
-                    free ((Address)val);
+                    efree ((Address)val);
                 }
             }