Changeset 34509d5 for functions.c

Timestamp:

Dec 23, 2007, 7:48:01 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

93ee554

Parents:

9a6cc40

Message:

GLib/Unicode branch - adding glib dependency.

Linking BarnOwl to GLib. 

Cleaning up some malloc/realloc/strdup/free code, moving to owl_*
functions for each.

Changing to GLib memory allocation functions.

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -3025 +3025 @@
 
   /* first, create the filter */
-  f=malloc(sizeof(owl_filter));
-  buff=malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
+  f=owl_malloc(sizeof(owl_filter));
+  buff=owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
   strcpy(buff, "class");
   if (!strcmp(class, "*")) {
@@ -3314 +3314 @@
           if (ret==0) {
             for (x=0; x<numlocs; x++) {
-              line=malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
+              line=owl_malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
               tmp=short_zuser(user);
               sprintf(line, "  %-10.10s %-24.24s %-12.12s  %20.20s\n",
@@ -3420 +3420 @@
           _exit(127);
         }
-        parsed=realloc(parsed, sizeof(*parsed) * (myargc+1));
+        parsed=owl_realloc(parsed, sizeof(*parsed) * (myargc+1));
         parsed[myargc] = NULL;