Changeset 35b6eb9 for util.c

Timestamp:

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

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

ddbbcffa

Parents:

96828e4

git-author:

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

git-committer:

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

Message:

Replace owl_realloc with g_renew.

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

File:

• util.c (modified) (4 diffs)

util.c

@@ -304 +304 @@
 }
 
-void *owl_realloc(void *ptr, size_t size)
-{
-  return(g_realloc(ptr, size));
-}
-
 /* allocates memory and returns the string or null.
  * caller must free the string. 
@@ -696 +691 @@
     if ((target + 1) > size) {
       size += BUFSIZ;
-      *s = owl_realloc(*s, size);
+      *s = g_renew(char, *s, size);
     }
     if (c == EOF)
@@ -713 +708 @@
 /* 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
- * g_malloc; it will be owl_realloc'd as appropriate.  The caller must
+ * g_malloc; it will be g_renew'd as appropriate.  The caller must
  * eventually free it.  (This is roughly the interface of getline in the gnu
  * libc).
@@ -739 +734 @@
 
   while (1) {
-    buf = owl_realloc(buf, size + BUFSIZ);
+    buf = g_renew(char, buf, size + BUFSIZ);
     p = &buf[size];
     size += BUFSIZ;