MonetDB: pushcands - Merge with default branch.

[Sjoerd Mullender]

Changeset: 7abe7eaec8d8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7abe7eaec8d8
Branch: pushcands
Log Message:

Merge with default branch.


diffs (28 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -956,7 +956,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);
@@ -1363,10 +1364,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
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list