MonetDB: Jun2016 - Don't use the words "private" and "register" ...

[Sjoerd Mullender]

Changeset: d88f6b8569ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d88f6b8569ac
Modified Files:
        common/stream/stream.h
        gdk/gdk.h
Branch: Jun2016
Log Message:

Don't use the words "private" and "register" in public .h files.


diffs (64 lines):

diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -246,10 +246,10 @@ typedef enum mnstr_errors {
  * private pointer is passed on to the callback functions when they
  * are invoked. */
 stream_export stream *callback_stream(
-       void *private,
-       ssize_t (*read) (void *private, void *buf, size_t elmsize, size_t cnt),
-       void (*close) (void *private),
-       void (*destroy) (void *private),
+       void *priv,
+       ssize_t (*read) (void *priv, void *buf, size_t elmsize, size_t cnt),
+       void (*close) (void *priv),
+       void (*destroy) (void *priv),
        const char *name);
 
 stream_export stream* stream_blackhole_create(void);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1307,7 +1307,7 @@ gdk_export bte ATOMelmshift(int sz);
 
 #define bunfastapp(b, t)                                               \
        do {                                                            \
-               register BUN _p = BUNlast(b);                           \
+               BUN _p = BUNlast(b);                                    \
                assert((b)->htype == TYPE_void);                        \
                if (_p >= BATcapacity(b)) {                             \
                        if (_p == BUN_MAX || BATcount(b) == BUN_MAX) {  \
@@ -2563,10 +2563,10 @@ gdk_export void *THRdata[THREADDATA];
 #ifndef GDK_NOLINK
 
 static inline bat
-BBPcheck(register bat x, register const char *y)
+BBPcheck(bat x, const char *y)
 {
        if (x && x != bat_nil) {
-               register bat z = abs(x);
+               bat z = abs(x);
 
                if (z >= getBBPsize() || BBP_logical(z) == NULL) {
                        CHECKDEBUG fprintf(stderr,"#%s: range error %d\n", y, 
(int) x);
@@ -2578,9 +2578,9 @@ BBPcheck(register bat x, register const 
 }
 
 static inline BAT *
-BATdescriptor(register bat i)
+BATdescriptor(bat i)
 {
-       register BAT *b = NULL;
+       BAT *b = NULL;
 
        if (BBPcheck(i, "BATdescriptor")) {
                BBPfix(i);
@@ -2610,7 +2610,7 @@ Tpos(BATiter *bi, BUN p)
 }
 
 static inline BAT *
-BATmirror(register BAT *b)
+BATmirror(BAT *b)
 {
        if (b == NULL)
                return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list