Changeset ddbbcffa for util.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:

• util.c (modified) (10 diffs)

util.c

@@ -178 +178 @@
     /* TODO: when we move to requiring glib 2.22+, use
      * g_ptr_array_new_with_free_func. */
-    g_ptr_array_foreach(argv, (GFunc)owl_free, NULL);
+    g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
     g_ptr_array_free(argv, true);
     *argc = -1;
@@ -262 +262 @@
 
 /* Returns a quoted version of arg suitable for placing in a
- * command-line. Result should be freed with owl_free. */
+ * command-line. Result should be freed with g_free. */
 char *owl_arg_quote(const char *arg)
 {
@@ -293 +293 @@
 
 /* hooks for doing memory allocation et. al. in owl */
-
-void owl_free(void *ptr)
-{
-  g_free(ptr);
-}
 
 char *owl_strdup(const char *s1)
@@ -372 +367 @@
     out=owl_strdup(tmp);
     if (!strncmp(out, "/dev/", 5)) {
-      owl_free(out);
+      g_free(out);
       out=owl_strdup(tmp+5);
     }
@@ -400 +395 @@
 
   out=owl_strdup(ptr1);
-  owl_free(tmp);
+  g_free(tmp);
   return(out);
 }
@@ -484 +479 @@
     owl_function_error("Cannot open %s (for writing): %s",
                        actual_filename, strerror(errno));
-    owl_free(newfile);
+    g_free(newfile);
     fclose(old);
     free(actual_filename);
@@ -495 +490 @@
     unlink(newfile);
     fclose(new);
-    owl_free(newfile);
+    g_free(newfile);
     fclose(old);
     free(actual_filename);
@@ -506 +501 @@
     else
       numremoved++;
-  owl_free(buf);
+  g_free(buf);
 
   fclose(new);
@@ -516 +511 @@
     if (link(actual_filename, backupfile) != 0) {
       owl_function_error("Cannot link %s: %s", backupfile, strerror(errno));
-      owl_free(backupfile);
+      g_free(backupfile);
       unlink(newfile);
-      owl_free(newfile);
+      g_free(newfile);
       return -1;
     }
-    owl_free(backupfile);
+    g_free(backupfile);
   }
 
@@ -531 +526 @@
 
   unlink(newfile);
-  owl_free(newfile);
+  g_free(newfile);
 
   g_free(actual_filename);