Changeset ddbbcffa for zwrite.c

Timestamp:

Feb 11, 2011, 4:31:42 PM (14 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:

• zwrite.c (modified) (12 diffs)

zwrite.c

@@ -145 +145 @@
   if(msg) {
     owl_zwrite_set_message(z, msg);
-    owl_free(msg);
+    g_free(msg);
   }
 
@@ -181 +181 @@
     }
     send_ping(to, z->class, z->inst);
-    owl_free(to);
+    g_free(to);
   }
 
@@ -189 +189 @@
 void owl_zwrite_set_message_raw(owl_zwrite *z, const char *msg)
 {
-  if (z->message) owl_free(z->message);
+  if (z->message) g_free(z->message);
   z->message = owl_validate_utf8(msg);
 }
@@ -199 +199 @@
   char *tmp = NULL, *tmp2;
 
-  if (z->message) owl_free(z->message);
+  if (z->message) g_free(z->message);
 
   j=owl_list_get_size(&(z->recips));
@@ -211 +211 @@
         toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i));
       }
-      owl_free(tmp);
+      g_free(tmp);
       tmp = NULL;
     }
@@ -217 +217 @@
     tmp2 = owl_text_expand_tabs(tmp);
     z->message=owl_sprintf("%s\n%s", toline, tmp2);
-    owl_free(toline);
-    owl_free(tmp);
-    owl_free(tmp2);
+    g_free(toline);
+    g_free(tmp);
+    g_free(tmp2);
   } else {
     tmp=owl_validate_utf8(msg);
     z->message=owl_text_expand_tabs(tmp);
-    owl_free(tmp);
+    g_free(tmp);
   }
 }
@@ -258 +258 @@
       if (ret != 0)
         break;
-      owl_free(to);
+      g_free(to);
       to = NULL;
     }
@@ -265 +265 @@
     ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
   }
-  owl_free(to);
+  g_free(to);
   return ret;
 }
@@ -301 +301 @@
 void owl_zwrite_set_opcode(owl_zwrite *z, const char *opcode)
 {
-  if (z->opcode) owl_free(z->opcode);
+  if (z->opcode) g_free(z->opcode);
   z->opcode=owl_validate_utf8(opcode);
 }
@@ -318 +318 @@
 void owl_zwrite_set_zsig(owl_zwrite *z, const char *zsig)
 {
-  if(z->zsig) owl_free(z->zsig);
+  if(z->zsig) g_free(z->zsig);
   z->zsig = owl_strdup(zsig);
 }
@@ -362 +362 @@
 {
   owl_zwrite_cleanup(z);
-  owl_free(z);
+  g_free(z);
 }
 
 void owl_zwrite_cleanup(owl_zwrite *z)
 {
-  owl_list_cleanup(&(z->recips), &owl_free);
-  if (z->cmd) owl_free(z->cmd);
-  if (z->zwriteline) owl_free(z->zwriteline);
-  if (z->class) owl_free(z->class);
-  if (z->inst) owl_free(z->inst);
-  if (z->opcode) owl_free(z->opcode);
-  if (z->realm) owl_free(z->realm);
-  if (z->message) owl_free(z->message);
-  if (z->zsig) owl_free(z->zsig);
+  owl_list_cleanup(&(z->recips), &g_free);
+  if (z->cmd) g_free(z->cmd);
+  if (z->zwriteline) g_free(z->zwriteline);
+  if (z->class) g_free(z->class);
+  if (z->inst) g_free(z->inst);
+  if (z->opcode) g_free(z->opcode);
+  if (z->realm) g_free(z->realm);
+  if (z->message) g_free(z->message);
+  if (z->zsig) g_free(z->zsig);
 }
 
@@ -381 +381 @@
  * Returns a zwrite line suitable for replying, specifically the
  * message field is stripped out. Result should be freed with
- * owl_free.
+ * g_free.
  */
 char *owl_zwrite_get_replyline(const owl_zwrite *z)