Changeset 27f6487

Timestamp:

Aug 22, 2009, 12:47:44 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f4d4a00

Parents:

0e5afa2

git-author:

Anders Kaseorg <andersk@mit.edu> (08/21/09 23:19:56)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/22/09 00:47:44)

Message:

Consistently use owl_malloc and friends.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• commands.c (modified) (1 diff)
• editwin.c (modified) (1 diff)
• filterelement.c (modified) (1 diff)
• functions.c (modified) (2 diffs)
• global.c (modified) (1 diff)
• message.c (modified) (1 diff)
• select.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

commands.c

@@ -1923 +1923 @@
       newbuff=owl_strdup("");
       while (myargc) {
-        newbuff=realloc(newbuff, strlen(newbuff)+strlen(myargv[0])+5);
+        newbuff=owl_realloc(newbuff, strlen(newbuff)+strlen(myargv[0])+5);
         strcat(newbuff, myargv[0]);
         strcat(newbuff, " ");

editwin.c

@@ -116 +116 @@
   oe_set_mark(e, -1);
   if (e->killbuf != NULL)
-    free(e->killbuf);
+    owl_free(e->killbuf);
   e->killbuf = NULL;
   e->goal_column = -1;

filterelement.c

@@ -217 +217 @@
   fe->field=owl_strdup(field);
   if(owl_regex_create(&(fe->re), re)) {
-    free(fe->field);
+    owl_free(fe->field);
     fe->field = NULL;
     return (-1);

functions.c

@@ -887 +887 @@
     path = owl_util_makepath(file);
     ret=owl_zephyr_loadsubs(path, 1);
-    free(path);
+    owl_free(path);
   }
 
@@ -2847 +2847 @@
 
   /* first, create the filter */
-  f=malloc(sizeof(owl_filter));
+  f=owl_malloc(sizeof(owl_filter));
 
   owl_function_debugmsg("About to filter %s", filter);

global.c

@@ -365 +365 @@
  */
 void owl_global_set_confdir(owl_global *g, const char *cd) {
-  free(g->confdir);
+  owl_free(g->confdir);
   g->confdir = owl_strdup(cd);
-  free(g->startupfile);
+  owl_free(g->startupfile);
   g->startupfile = owl_sprintf("%s/startup", cd);
 }

message.c

@@ -604 +604 @@
       end += strlen(user) + 1;
     }
-    free(shortuser);
+    owl_free(shortuser);
     user = strtok(NULL, " ");
   }

select.c

@@ -170 +170 @@
   }
 
-  d = malloc(sizeof(owl_dispatch));
+  d = owl_malloc(sizeof(owl_dispatch));
   d->fd = fd;
   d->cfunc = owl_perlconfig_dispatch;

zephyr.c

@@ -751 +751 @@
           owl_function_makemsg("Message sent to %s on -c %s -i %s\n", tmp, retnotice->z_class, retnotice->z_class_inst);
         }
-        free(tmp);
+        owl_free(tmp);
       } else {
         /* class / instance message */