Changeset 35b6eb9

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>

Files:

• dict.c (modified) (1 diff)
• editwin.c (modified) (1 diff)
• list.c (modified) (1 diff)
• text.c (modified) (1 diff)
• util.c (modified) (4 diffs)
• zephyr.c (modified) (2 diffs)

dict.c

@@ -96 +96 @@
     if (d->size + 1 > d->avail) {
       int avail = MAX(d->avail * GROWBY, d->size + 1);
-      d->els = owl_realloc(d->els, avail * sizeof(owl_dict_el));
+      d->els = g_renew(owl_dict_el, d->els, avail);
       d->avail = avail;
       if (d->els==NULL) return(-1);

editwin.c

@@ -654 +654 @@
   if (need > 0) {
     size = e->allocated + need + INCR - (need % INCR);
-    e->buff = owl_realloc(e->buff, size);
+    e->buff = g_renew(char, e->buff, size);
     e->allocated = size;
   }

list.c

@@ -26 +26 @@
   if ((l->size+n) > l->avail) {
     int avail = MAX(l->avail * GROWBY, l->size + n);
-    ptr = owl_realloc(l->list, avail * sizeof(void *));
+    ptr = g_renew(void *, l->list, avail);
     if (ptr==NULL) abort();
     l->list=ptr;

text.c

@@ -286 +286 @@
     if (!strncmp(in+inpos, from, fromlen)) {
       outlen += tolen;
-      out = owl_realloc(out, outlen);
+      out = g_renew(char, out, outlen);
       strcpy(out+outpos, to);
       inpos += fromlen;

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;

zephyr.c

@@ -286 +286 @@
     if (count >= subSize) {
       subSize *= 2;
-      subs = owl_realloc(subs, sizeof(ZSubscription_t) * subSize);
+      subs = g_renew(ZSubscription_t, subs, subSize);
     }
     
@@ -397 +397 @@
       if (count == numSubs) {
         numSubs *= 2;
-        subs = owl_realloc(subs, numSubs * sizeof(ZSubscription_t));
+        subs = g_renew(ZSubscription_t, subs, numSubs);
       }