Changeset: 0164894786e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0164894786e6
Modified Files:
gdk/gdk_atoms.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/uuid.c
Branch: Oct2020
Log Message:
gcc 11 optimized build fixes. On null atom cases we don't need to call our
custom strcpy_len function, just do strcpy
diffs (47 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -881,8 +881,10 @@ hgeToStr(char **dst, size_t *len, const
atommem(hgeStrlen);
if (is_hge_nil(*src)) {
if (external) {
- return (ssize_t) strcpy_len(*dst, "nil", 4);
+ assert(*len >= strlen("nil") + 1);
+ return (ssize_t) strcpy(*dst, "nil");
}
+ assert(*len >= strlen(str_nil) + 1);
strcpy(*dst, str_nil);
return 1;
}
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -185,8 +185,10 @@ JSONtoString(str *s, size_t *len, const
return -1;
}
if (external) {
- return (ssize_t) strcpy_len(*s, "nil", 4);
+ assert(*len >= strlen("nil") + 1);
+ return (ssize_t) strcpy(*s, "nil");
}
+ assert(*len >= strlen(str_nil) + 1);
strcpy(*s, str_nil);
return 1;
}
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
@@ -95,9 +95,11 @@ UUIDtoString(str *retval, size_t *len, c
}
if (is_uuid_nil(value)) {
if (external) {
- return (ssize_t) strcpy_len(*retval, "nil", 4);
+ assert(*len >= strlen("nil") + 1);
+ return (ssize_t) strcpy(*retval, "nil");
}
- return (ssize_t) strcpy_len(*retval, str_nil, 2);
+ assert(*len >= strlen(str_nil) + 1);
+ return (ssize_t) strcpy(*retval, str_nil);
}
#ifdef HAVE_UUID
uuid_unparse_lower(value->u, *retval);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
