Changeset ddbbcffa for message.c

Timestamp:

Feb 11, 2011, 4:31:42 PM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

d4927a7

Parents:

35b6eb9

git-author:

Anders Kaseorg <andersk@mit.edu> (08/27/09 00:52:41)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:42)

Message:

Replace owl_free with g_free.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Karl Ramm <kcr@mit.edu>

File:

• message.c (modified) (16 diffs)

message.c

@@ -68 +68 @@
     p=owl_list_get_element(&(m->attributes), i);
     if (owl_pair_get_key(p) == attrname) {
-      owl_free(owl_pair_get_value(p));
+      g_free(owl_pair_get_value(p));
       pair = p;
       break;
@@ -134 +134 @@
     }
     owl_fmtext_append_normal(fm, buff);
-    owl_free(buff);
+    g_free(buff);
   }
 }
@@ -611 +611 @@
       out = g_list_prepend(out, owl_strdup(user));
     }
-    owl_free(shortuser);
+    g_free(shortuser);
     user = strtok(NULL, " ");
   }
 
-  owl_free(recip);
-  owl_free(cc);
+  g_free(recip);
+  g_free(cc);
 
   return(out);
@@ -749 +749 @@
       /* Collapse any identical entries */
       while (cc->next && strcasecmp(cc->data, cc->next->data) == 0) {
-        owl_free(cc->data);
+        g_free(cc->data);
         cc = g_list_delete_link(cc, cc);
       }
@@ -756 +756 @@
       g_string_append(recips, tmp);
 
-      owl_free(tmp);
-      owl_free(cc->data);
+      g_free(tmp);
+      g_free(cc->data);
       cc = g_list_delete_link(cc, cc);
 
@@ -793 +793 @@
   
   /* save the time, we need to nuke the string saved by message_init */
-  if (m->timestr) owl_free(m->timestr);
+  if (m->timestr) g_free(m->timestr);
   m->time=n->z_time.tv_sec;
   m->timestr=owl_strdup(ctime(&(m->time)));
@@ -821 +821 @@
       tmp=owl_zephyr_get_field(n, 1);
       owl_message_set_attribute(m, "loginhost", tmp);
-      owl_free(tmp);
+      g_free(tmp);
 
       tmp=owl_zephyr_get_field(n, 3);
       owl_message_set_attribute(m, "logintty", tmp);
-      owl_free(tmp);
+      g_free(tmp);
     }
 
@@ -868 +868 @@
     tmp2=owl_util_stripnewlines(tmp);
     owl_message_set_body(m, tmp2);
-    owl_free(tmp2);
+    g_free(tmp2);
   } else {
     owl_message_set_body(m, tmp);
   }
-  owl_free(tmp);
+  g_free(tmp);
 
   /* if zcrypt is enabled try to decrypt the message */
@@ -891 +891 @@
 
     rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
-    owl_free(zcrypt);
+    g_free(zcrypt);
 
     if(!rv && !status) {
@@ -899 +899 @@
       }
       owl_message_set_body(m, out);
-      owl_free(out);
+      g_free(out);
     } else if(out) {
-      owl_free(out);
+      g_free(out);
     }
   }
@@ -957 +957 @@
   owl_function_debugmsg("create_pseudo_login: host is %s", host ? host : "");
   owl_message_set_hostname(m, host ? host : "");
-  owl_free(longuser);
+  g_free(longuser);
 }
 
@@ -978 +978 @@
     owl_message_set_recipient(m,
                               longzuser); /* only gets the first user, must fix */
-    owl_free(longzuser);
+    g_free(longzuser);
   }
   owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
@@ -987 +987 @@
   replyline = owl_zwrite_get_replyline(z);
   owl_message_set_zwriteline(m, replyline);
-  owl_free(replyline);
+  g_free(replyline);
 
   owl_message_set_body(m, body);
@@ -1018 +1018 @@
   }
 #endif
-  if (m->timestr) owl_free(m->timestr);
+  if (m->timestr) g_free(m->timestr);
 
   /* free all the attributes */
@@ -1024 +1024 @@
   for (i=0; i<j; i++) {
     p=owl_list_get_element(&(m->attributes), i);
-    owl_free(owl_pair_get_value(p));
-    owl_free(p);
+    g_free(owl_pair_get_value(p));
+    g_free(p);
   }
 
@@ -1036 +1036 @@
 {
   owl_message_cleanup(m);
-  owl_free(m);
-}
+  g_free(m);
+}