Changeset: 78229b042032 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78229b042032
Modified Files:
monetdb5/modules/atoms/uuid.c
Branch: default
Log Message:
Messed up some pointers
diffs (30 lines):
diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -348,7 +348,7 @@ UUIDuuid2str_bulk(bat *res, const bat *b
struct canditer ci;
oid off;
bool nils = false;
- char buf[UUID_STRLEN + 2];
+ char buf[UUID_STRLEN + 2], **pbuf = (char **) &buf;
size_t l = sizeof(buf);
ssize_t (*conv)(char **, size_t *, const void *, bool) =
BATatoms[TYPE_uuid].atomToStr;
@@ -373,7 +373,7 @@ UUIDuuid2str_bulk(bat *res, const bat *b
oid p = (canditer_next_dense(&ci) - off);
uuid v = vals[p];
- if (conv((char**)buf, &l, &v, false) < 0) { /* it
should be never be reallocated */
+ if (conv(pbuf, &l, &v, false) < 0) { /* it should never
be reallocated */
msg = createException(MAL,
"batcalc.uuid2strbulk", GDK_EXCEPTION);
goto bailout;
}
@@ -388,7 +388,7 @@ UUIDuuid2str_bulk(bat *res, const bat *b
oid p = (canditer_next(&ci) - off);
uuid v = vals[p];
- if (conv((char**)buf, &l, &v, false) < 0) { /* it
should be never be reallocated */
+ if (conv(pbuf, &l, &v, false) < 0) { /* it should never
be reallocated */
msg = createException(MAL,
"batcalc.uuid2strbulk", GDK_EXCEPTION);
goto bailout;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
