MonetDB: Jul2017 - Use void * for generic pointers.

[Sjoerd Mullender]

Changeset: f34dd67e84da for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f34dd67e84da
Modified Files:
        sql/common/sql_mem.c
        sql/include/sql_mem.h
Branch: Jul2017
Log Message:

Use void * for generic pointers.


diffs (52 lines):

diff --git a/sql/common/sql_mem.c b/sql/common/sql_mem.c
--- a/sql/common/sql_mem.c
+++ b/sql/common/sql_mem.c
@@ -72,16 +72,16 @@ sql_allocator *sa_reset( sql_allocator *
 
 #undef sa_realloc
 #undef sa_alloc
-char *sa_realloc( sql_allocator *sa, void *p, size_t sz, size_t oldsz )
+void *sa_realloc( sql_allocator *sa, void *p, size_t sz, size_t oldsz )
 {
-       char *r = sa_alloc(sa, sz);
+       void *r = sa_alloc(sa, sz);
 
-       memcpy(r, (char*)p, oldsz);
+       memcpy(r, p, oldsz);
        return r;
 }
 
 #define round16(sz) ((sz+15)&~15)
-char *sa_alloc( sql_allocator *sa, size_t sz )
+void *sa_alloc( sql_allocator *sa, size_t sz )
 {
        char *r;
        sz = round16(sz);
@@ -118,9 +118,9 @@ char *sa_alloc( sql_allocator *sa, size_
 }
 
 #undef sa_zalloc
-char *sa_zalloc( sql_allocator *sa, size_t sz )
+void *sa_zalloc( sql_allocator *sa, size_t sz )
 {
-       char *r = sa_alloc(sa, sz);
+       void *r = sa_alloc(sa, sz);
 
        if (r)
                memset(r, 0, sz);
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -62,9 +62,9 @@ typedef struct sql_allocator {
 
 extern sql_allocator *sa_create(void);
 extern sql_allocator *sa_reset( sql_allocator *sa );
-extern char *sa_alloc( sql_allocator *sa,  size_t sz );
-extern char *sa_zalloc( sql_allocator *sa,  size_t sz );
-extern char *sa_realloc( sql_allocator *sa,  void *ptr, size_t sz, size_t osz 
);
+extern void *sa_alloc( sql_allocator *sa,  size_t sz );
+extern void *sa_zalloc( sql_allocator *sa,  size_t sz );
+extern void *sa_realloc( sql_allocator *sa,  void *ptr, size_t sz, size_t osz 
);
 extern void sa_destroy( sql_allocator *sa );
 extern char *sa_strndup( sql_allocator *sa, const char *s, size_t l);
 extern char *sa_strdup( sql_allocator *sa, const char *s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list