MonetDB: default - Changed BUNtail and friends to return a void ...

[Sjoerd Mullender]

Changeset: d4192d34d271 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4192d34d271
Modified Files:
        gdk/ChangeLog
        gdk/gdk.h
        gdk/gdk_logger.c
Branch: default
Log Message:

Changed BUNtail and friends to return a void * instead of char *.
This means that when assigning to a pointer variable a cast can be
omitted.


diffs (72 lines):

diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Tue Oct 30 2018 Sjoerd Mullender <sjo...@acm.org>
+- The BUNtail, BUNtvar, BUNtloc, and BUNtpos macros (and Tloc and Tpos)
+  now return a `void *' instead of a `char *'.
+
 * Tue Aug 21 2018 Sjoerd Mullender <sjo...@acm.org>
 - Function PROPdestroy now takes a BAT* parameter.
 
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1203,7 +1203,7 @@ gdk_export BUN BUNfnd(BAT *b, const void
 
 #define tailsize(b,p)  ((b)->ttype?((size_t)(p))<<(b)->tshift:0)
 
-#define Tloc(b,p)      ((b)->theap.base+(((size_t)(p))<<(b)->tshift))
+#define Tloc(b,p)      ((void *)((b)->theap.base+(((size_t)(p))<<(b)->tshift)))
 
 typedef var_t stridx_t;
 #define SIZEOF_STRIDX_T SIZEOF_VAR_T
@@ -1226,7 +1226,7 @@ typedef var_t stridx_t;
 
 #define BUNtloc(bi,p)  Tloc((bi).b,p)
 #define BUNtpos(bi,p)  Tpos(&(bi),p)
-#define BUNtvar(bi,p)  (assert((bi).b->ttype && (bi).b->tvarsized), 
Tbase((bi).b)+BUNtvaroff(bi,p))
+#define BUNtvar(bi,p)  (assert((bi).b->ttype && (bi).b->tvarsized), (void *) 
(Tbase((bi).b)+BUNtvaroff(bi,p)))
 #define BUNtail(bi,p)  
((bi).b->ttype?(bi).b->tvarsized?BUNtvar(bi,p):BUNtloc(bi,p):BUNtpos(bi,p))
 
 /* return the oid value at BUN position p from the (v)oid bat b
@@ -2370,13 +2370,13 @@ BATdescriptor(bat i)
        return b;
 }
 
-static inline char *
+static inline void *
 Tpos(BATiter *bi, BUN p)
 {
        bi->tvid = bi->b->tseqbase;
        if (!is_oid_nil(bi->tvid))
                bi->tvid += p;
-       return (char*)&bi->tvid;
+       return (void*)&bi->tvid;
 }
 
 #endif
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1364,7 +1364,7 @@ bm_subcommit(logger *lg, BAT *list_bid, 
                if (debug & 1)
                        fprintf(stderr, "#commit new %s (%d) %s\n",
                                BBPname(col), col,
-                               (list_bid == catalog_bid) ? BUNtvar(iter, p) : 
"snapshot");
+                               (list_bid == catalog_bid) ? (char *) 
BUNtvar(iter, p) : "snapshot");
                assert(col);
                n[i++] = col;
        }
@@ -1376,7 +1376,7 @@ bm_subcommit(logger *lg, BAT *list_bid, 
                        if (debug & 1)
                                fprintf(stderr, "#commit extra %s %s\n",
                                        name,
-                                       (list_bid == catalog_bid) ? 
BUNtvar(iter, p) : "snapshot");
+                                       (list_bid == catalog_bid) ? (char *) 
BUNtvar(iter, p) : "snapshot");
                        assert(BBPindex(name));
                        n[i++] = BBPindex(name);
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list