Changeset d4927a7 for util.c

Timestamp:

Feb 11, 2011, 4:31:46 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

3472845

Parents:

ddbbcffa

git-author:

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

git-committer:

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

Message:

Replace owl_strdup with g_strdup.

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

File:

• util.c (modified) (7 diffs)

util.c

@@ -292 +292 @@
 }
 
-/* hooks for doing memory allocation et. al. in owl */
-
-char *owl_strdup(const char *s1)
-{
-  return(g_strdup(s1));
-}
-
 /* allocates memory and returns the string or null.
  * caller must free the string. 
@@ -363 +356 @@
 
   if (getenv("DISPLAY")) {
-    out=owl_strdup(getenv("DISPLAY"));
+    out=g_strdup(getenv("DISPLAY"));
   } else if ((tmp=ttyname(fileno(stdout)))!=NULL) {
-    out=owl_strdup(tmp);
+    out=g_strdup(tmp);
     if (!strncmp(out, "/dev/", 5)) {
       g_free(out);
-      out=owl_strdup(tmp+5);
+      out=g_strdup(tmp+5);
     }
   } else {
-    out=owl_strdup("unknown");
+    out=g_strdup("unknown");
   }
   return(out);
@@ -384 +377 @@
   char  *tmp, *ptr1, *ptr2, *out;
 
-  ptr1=tmp=owl_strdup(in);
+  ptr1=tmp=g_strdup(in);
   while (ptr1[0]=='\n') {
     ptr1++;
@@ -394 +387 @@
   }
 
-  out=owl_strdup(ptr1);
+  out=g_strdup(ptr1);
   g_free(tmp);
   return(out);
@@ -545 +538 @@
   }
 
-  start = owl_strdup(class);
+  start = g_strdup(class);
   end = start + strlen(start) - 1;
   while(end > start && *end == 'd' && *(end-1) == '.') {
@@ -601 +594 @@
   }
   else {
-    r = owl_strdup("");
+    r = g_strdup("");
   }
   return r;
@@ -630 +623 @@
   char *out;
   if (g_utf8_validate(in, -1, NULL)) {
-    out = owl_strdup(in);
+    out = g_strdup(in);
   } else {
-    out = owl_strdup("");
+    out = g_strdup("");
   }
   return out;