Changeset 96828e4 for util.c

Timestamp:

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

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

35b6eb9

Parents:

9518a85

git-author:

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

git-committer:

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

Message:

Replace owl_malloc with g_new and g_new0.

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

File:

• util.c (modified) (4 diffs)

util.c

@@ -41 +41 @@
   struct passwd *pw;
 
-  out=owl_malloc(MAXPATHLEN+1);
+  out=g_new(char, MAXPATHLEN+1);
   out[0]='\0';
   j=strlen(in);
@@ -294 +294 @@
 /* hooks for doing memory allocation et. al. in owl */
 
-void *owl_malloc(size_t size)
-{
-  return(g_malloc(size));
-}
-
 void owl_free(void *ptr)
 {
@@ -593 +588 @@
   if (g_utf8_validate(in, -1, NULL)) {
     const char *s, *p;
-    r = owl_malloc(strlen(in)+1);
+    r = g_new(char, strlen(in)+1);
     r[0] = '\0';
     s = in;
@@ -718 +713 @@
 /* Read a line from fp, allocating memory to hold it, returning the number of
  * byte read.  *s should either be NULL or a pointer to memory allocated with
- * owl_malloc; it will be owl_realloc'd as appropriate.  The caller must
+ * g_malloc; it will be owl_realloc'd as appropriate.  The caller must
  * eventually free it.  (This is roughly the interface of getline in the gnu
  * libc).