Changeset: a432794727c0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a432794727c0 Modified Files: gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_logger.c gdk/gdk_strimps.c gdk/gdk_string.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/uuid.c monetdb5/modules/mal/pcre.c Branch: Jan2022 Log Message:
More const
diffs (truncated from 421 to 300 lines):
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -129,7 +129,7 @@ GDKanalyticaldiff(BAT *r, BAT *b, BAT *p
}
} break;
default:{
- ptr v = BUNtail(bi, 0), next;
+ const void *v = BUNtail(bi, 0), *next;
int (*atomcmp) (const void *, const void *) = ATOMcompare(tpe);
if (np) {
for (i = 0; i < cnt; i++) {
@@ -764,7 +764,7 @@ GDKanalyticalpeers(BAT *r, BAT *b, BAT *
}
} break;
default: {
- ptr prev, next;
+ const void *prev, *next;
int (*atomcmp) (const void *, const void *) =
ATOMcompare(b->ttype);
if (preceding) {
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1001,7 +1001,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtvar(bi, k); \
+ const void *next = BUNtvar(bi, k);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1019,7 +1019,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
for (; k < i;) { \
j = k; \
do { \
- void *next = BUNtloc(bi, k); \
+ const void *next = BUNtloc(bi, k);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1043,7 +1043,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
l = i - 1; \
if (ATOMvarsized(tpe)) { \
for (j = l; ; j--) { \
- void *next = BUNtvar(bi, j); \
+ const void *next = BUNtvar(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1065,7 +1065,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
} \
} else { \
for (j = l; ; j--) { \
- void *next = BUNtloc(bi, j); \
+ const void *next = BUNtloc(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1092,10 +1092,10 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
#define ANALYTICAL_MIN_MAX_CALC_OTHERS_ALL_ROWS(GT_LT) \
do { \
- void *curval = (void*) nil; \
+ const void *curval = (void*) nil;
\
if (ATOMvarsized(tpe)) { \
for (j = k; j < i; j++) { \
- void *next = BUNtvar(bi, j); \
+ const void *next = BUNtvar(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1108,7 +1108,7 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
goto cleanup; \
} else { \
for (j = k; j < i; j++) { \
- void *next = BUNtloc(bi, j); \
+ const void *next = BUNtloc(bi, j);
\
if (atomcmp(next, nil) != 0) { \
if (atomcmp(curval, nil) == 0) \
curval = next; \
@@ -1128,14 +1128,14 @@ GDKanalyticallead(BAT *r, BAT *b, BAT *p
do { \
if (ATOMvarsized(tpe)) { \
for (; k < i; k++) { \
- void *next = BUNtvar(bi, k); \
+ const void *next = BUNtvar(bi, k);
\
if ((res = tfastins_nocheckVAR(r, k, next)) !=
GDK_SUCCEED) \
goto cleanup; \
has_nils |= atomcmp(next, nil) == 0; \
} \
} else { \
for (; k < i; k++) { \
- void *next = BUNtloc(bi, k); \
+ const void *next = BUNtloc(bi, k);
\
memcpy(rcast, next, width); \
rcast += width; \
has_nils |= atomcmp(next, nil) == 0; \
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2422,7 +2422,7 @@ string_writer(logger *lg, BAT *b, lng of
}
char *dst = buf;
for(; p < end && sz < bufsz; p++) {
- char *s = BUNtvar(bi, p);
+ const char *s = BUNtvar(bi, p);
size_t len = strlen(s)+1;
if ((sz+len) > bufsz) {
if (len > bufsz)
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -287,7 +287,6 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
{
lng t0 = 0;
BATiter bi;
- str cs;
BUN i, ncand;
size_t hidx;
oid x;
@@ -323,7 +322,7 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
cpp = &cp;
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci) - b->hseqbase;
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs)) {
pi.s = cs;
pi.pos = 0;
@@ -731,7 +730,6 @@ STRMPcreate(BAT *b, BAT *s)
BUN i, ncand;
oid x;
struct canditer ci;
- str cs;
uint64_t *dh;
if ((r = STRMPcreateStrimpHeap(pb, s)) == NULL) {
@@ -745,7 +743,7 @@ STRMPcreate(BAT *b, BAT *s)
bi = bat_iterator(pb);
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci);
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs))
*dh++ = STRMPmakebitstring(cs, r);
else
@@ -973,7 +971,6 @@ STRMPcreate(BAT *b, BAT *s)
lng t0 = 0;
BATiter bi;
BUN i, ncand;
- str cs;
Strimps *h;
uint64_t *dh;
BAT *pb;
@@ -1007,7 +1004,7 @@ STRMPcreate(BAT *b, BAT *s)
bi = bat_iterator(b);
for (i = 0; i < ncand; i++) {
x = canditer_next(&ci) - b->hseqbase;
- cs = (str)BUNtvar(bi, x);
+ const char *cs = BUNtvar(bi, x);
if (!strNil(cs))
*dh++ = STRMPmakebitstring(cs, h);
else
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -749,7 +749,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
oid gid;
BUN i, p, nils = 0;
size_t *restrict lengths = NULL, *restrict lastseplength = NULL,
separator_length = 0, next_length;
- str *restrict astrings = NULL, s, sl;
+ str *restrict astrings = NULL;
BATiter bi, bis = (BATiter) {0};
BAT *bn = NULL;
gdk_return rres = GDK_SUCCEED;
@@ -780,7 +780,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
if (separator) {
for (i = 0; i < ncand; i++) {
p = canditer_next(ci) - seqb;
- s = BUNtvar(bi, p);
+ const char *s = BUNtvar(bi, p);
if (strNil(s)) {
if (!skip_nils) {
nils = 1;
@@ -797,8 +797,8 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
assert(sep != NULL);
for (i = 0; i < ncand; i++) {
p = canditer_next(ci) - seqb;
- s = BUNtvar(bi, p);
- sl = BUNtvar(bis, p);
+ const char *s = BUNtvar(bi, p);
+ const char *sl = BUNtvar(bis, p);
if (strNil(s)) {
if (!skip_nils) {
nils = 1;
@@ -834,7 +834,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
if (separator) {
for (i = 0; i < ncand; i++) {
p = canditer_next(ci) - seqb;
- s = BUNtvar(bi, p);
+ const char *s = BUNtvar(bi, p);
if (strNil(s))
continue;
if (!empty) {
@@ -850,8 +850,8 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
assert(sep != NULL);
for (i = 0; i < ncand; i++) {
p = canditer_next(ci) - seqb;
- s = BUNtvar(bi, p);
- sl = BUNtvar(bis, p);
+ const char *s = BUNtvar(bi, p);
+ const char *sl = BUNtvar(bis, p);
if (strNil(s))
continue;
if (!empty && !strNil(sl)) {
@@ -924,7 +924,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
gid = gids[i] - min;
if (lengths[gid] == (size_t) -1)
continue;
- s = BUNtvar(bi, i);
+ const char *s = BUNtvar(bi, i);
if (!strNil(s)) {
lengths[gid] += strlen(s) +
separator_length;
astrings[gid] = NULL;
@@ -943,8 +943,8 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
gid = gids[i] - min;
if (lengths[gid] == (size_t) -1)
continue;
- s = BUNtvar(bi, i);
- sl = BUNtvar(bis, i);
+ const char *s = BUNtvar(bi, i);
+ const char *sl = BUNtvar(bis, i);
if (!strNil(s)) {
lengths[gid] += strlen(s);
if (!strNil(sl)) {
@@ -998,7 +998,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
if (gids[i] >= min && gids[i] <= max) {
gid = gids[i] - min;
if (astrings[gid]) {
- s = BUNtvar(bi, i);
+ const char *s = BUNtvar(bi, i);
if (strNil(s))
continue;
if
(astrings[gid][lengths[gid]]) {
@@ -1019,8 +1019,8 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
if (gids[i] >= min && gids[i] <= max) {
gid = gids[i] - min;
if (astrings[gid]) {
- s = BUNtvar(bi, i);
- sl = BUNtvar(bis, i);
+ const char *s = BUNtvar(bi, i);
+ const char *sl = BUNtvar(bis,
i);
if (strNil(s))
continue;
if (astrings[gid][lengths[gid]]
&& !strNil(sl)) {
@@ -1178,7 +1178,7 @@ done:
#define compute_next_single_str(START, END) \
do { \
for (oid m = START; m < END; m++) { \
- sb = BUNtvar(bi, m); \
+ const char *sb = BUNtvar(bi, m);
\
\
if (separator) { \
if (!strNil(sb)) { \
@@ -1189,7 +1189,7 @@ done:
} \
} else { /* sep case */ \
assert(sep != NULL); \
- sl = BUNtvar(sepi, m); \
+ const char *sl = BUNtvar(sepi, m);
\
\
if (!strNil(sb)) { \
next_group_length += strlen(sb); \
@@ -1226,7 +1226,7 @@ done:
} \
\
for (oid m = START; m < END; m++) { \
- sb = BUNtvar(bi, m); \
+ const char *sb = BUNtvar(bi, m);
\
\
if (separator) { \
if (strNil(sb)) \
@@ -1241,7 +1241,7 @@ done:
empty = false; \
} else { /* sep case */ \
assert(sep != NULL); \
- sl = BUNtvar(sepi, m); \
+ const char *sl = BUNtvar(sepi, m);
\
\
if (strNil(sb)) \
continue; \
@@ -1269,19 +1269,19 @@ done:
compute_next_single_str(k, i); /* compute the entire string
then slice it starting from the beginning */ \
empty = true; \
for (; k < i;) { \
- str nsep, nstr; \
+ const char *nsep;
\
oid m = k; \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
