MonetDB: Oct2020 - Merge with Jun2020 branch.

[Sjoerd Mullender]

Changeset: e39b28036e7c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e39b28036e7c
Modified Files:
        gdk/gdk_atoms.h
        sql/server/sql_scan.c
Branch: Oct2020
Log Message:

Merge with Jun2020 branch.


diffs (33 lines):

diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -396,7 +396,7 @@ strEQ(const char *l, const char *r)
 static inline bool __attribute__((__pure__))
 strNil(const char *s)
 {
-       return s == NULL || *s == '\200';
+       return s == NULL || (s[0] == '\200' && s[1] == '\0');
 }
 
 static inline size_t __attribute__((__pure__))
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -30,7 +30,7 @@
 char *
 query_cleaned(sql_allocator *sa, const char *query)
 {
-       char *q, *r, *c;
+       char *q, *r, *c = NULL;
        int lines = 0;
        int quote = 0;          /* inside quotes ('..', "..", {..}) */
        bool bs = false;                /* seen a backslash in a quoted string 
*/
@@ -42,8 +42,6 @@ query_cleaned(sql_allocator *sa, const c
        if(!r)
                return NULL;
 
-       (void) c;
-
        for (q = r; *query; query++) {
                if (incomment1) {
                        if (*query == '/' && query[-1] == '*') {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list