Following-up on diagnostics obtained by running code through C++

compiler. Idea: allocator functions return char * instead of void *,
like malloc did in classic pre-ANSI C. That way we are forced to
use a cast except when the target pointer is char * already.

1 files changed, 5 insertions, 4 deletions

diff --git a/stream.c b/stream.c
index 21b3806f..d3168eec 100644
--- a/stream.c
+++ b/stream.c
@@ -158,7 +158,7 @@ static wchar_t *snarf_line(struct stdio_handle *h)
 
     if (fill >= size) {
       size_t newsize = size ? size * 2 : min_size;
-      buf = chk_realloc(buf, newsize * sizeof *buf);
+      buf = (wchar_t *) chk_realloc(buf, newsize * sizeof *buf);
       size = newsize;
     }
 
@@ -170,7 +170,7 @@ static wchar_t *snarf_line(struct stdio_handle *h)
   }
 
   if (buf)
-    buf = chk_realloc(buf, fill * sizeof *buf);
+    buf = (wchar_t *) chk_realloc(buf, fill * sizeof *buf);
 
   return buf;
 }
@@ -409,7 +409,7 @@ static obj_t *string_out_put_string(obj_t *stream, obj_t *str)
     }
 
     if (so->size != old_size)
-      so->buf = chk_realloc(so->buf, so->size * sizeof *so->buf);
+      so->buf = (wchar_t *) chk_realloc(so->buf, so->size * sizeof *so->buf);
     wmemcpy(so->buf + so->fill, s, len + 1);
     so->fill += len;
     return t;
@@ -546,7 +546,8 @@ obj_t *get_string_from_stream(obj_t *stream)
     if (!so)
       return out;
 
-    so->buf = chk_realloc(so->buf, (so->fill + 1) * sizeof *so->buf);
+    so->buf = (wchar_t *) chk_realloc(so->buf,
+                                      (so->fill + 1) * sizeof *so->buf);
     out = string_own(so->buf);
     free(so);
     return out;