Changeset: f69132ff9259 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f69132ff9259
Modified Files:
gdk/gdk_atoms.c
monetdb5/modules/atoms/uuid.c
Branch: Oct2020
Log Message:
Some atomtostring fixes were not backported into Oct2020
diffs (31 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -882,7 +882,8 @@ hgeToStr(char **dst, size_t *len, const
if (is_hge_nil(*src)) {
if (external) {
assert(*len >= strlen("nil") + 1);
- return (ssize_t) strcpy(*dst, "nil");
+ strcpy(*dst, "nil");
+ return 3;
}
assert(*len >= strlen(str_nil) + 1);
strcpy(*dst, str_nil);
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
@@ -96,10 +96,12 @@ UUIDtoString(str *retval, size_t *len, c
if (is_uuid_nil(value)) {
if (external) {
assert(*len >= strlen("nil") + 1);
- return (ssize_t) strcpy(*retval, "nil");
+ strcpy(*retval, "nil");
+ return 3;
}
assert(*len >= strlen(str_nil) + 1);
- return (ssize_t) strcpy(*retval, str_nil);
+ strcpy(*retval, str_nil);
+ return 1;
}
#ifdef HAVE_UUID
uuid_unparse_lower(value->u, *retval);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
