Changeset ddbbcffa for global.c

Timestamp:

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

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, 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:

• global.c (modified) (6 diffs)

global.c

@@ -96 +96 @@
   cd = owl_sprintf("%s/%s", g->homedir, OWL_CONFIG_DIR);
   owl_global_set_confdir(g, cd);
-  owl_free(cd);
+  g_free(cd);
 
   owl_messagelist_create(&(g->msglist));
@@ -379 +379 @@
  */
 void owl_global_set_confdir(owl_global *g, const char *cd) {
-  owl_free(g->confdir);
+  g_free(g->confdir);
   g->confdir = owl_strdup(cd);
-  owl_free(g->startupfile);
+  g_free(g->startupfile);
   g->startupfile = owl_sprintf("%s/startup", cd);
 }
@@ -528 +528 @@
 
 void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
-  if (g->startupargs) owl_free(g->startupargs);
+  if (g->startupargs) g_free(g->startupargs);
   g->startupargs = g_strjoinv(" ", argv);
 }
@@ -564 +564 @@
   e->g->filterlist = g_list_remove(e->g->filterlist, e->f);
   owl_filter_delete(e->f);
-  owl_free(e);
+  g_free(e);
 }
 
@@ -699 +699 @@
   char *sn_escaped;
   g->aim_loggedin=1;
-  if (g->aim_screenname) owl_free(g->aim_screenname);
-  if (g->aim_screenname_for_filters) owl_free(g->aim_screenname_for_filters);
+  if (g->aim_screenname) g_free(g->aim_screenname);
+  if (g->aim_screenname_for_filters) g_free(g->aim_screenname_for_filters);
   g->aim_screenname=owl_strdup(screenname);
   sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   g->aim_screenname_for_filters = owl_arg_quote(sn_escaped);
-  owl_free(sn_escaped);
+  g_free(sn_escaped);
 }
 
@@ -967 +967 @@
     path = owl_sprintf("%s.%d", filename, getpid());
     fd = open(path, O_CREAT|O_WRONLY|O_EXCL, 0600);
-    owl_free(path);
+    g_free(path);
 
     if (fd >= 0)
       g->debug_file = fdopen(fd, "a");
 
-    owl_free(open_file);
+    g_free(open_file);
     open_file = owl_strdup(filename);
   }