Changeset: 41169ec0dac2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41169ec0dac2
Modified Files:
sql/server/rel_dump.c
tools/merovingian/client/monetdb.c
Branch: holindex
Log Message:
fixed compilation with Clang (extract from changeset 38b754469d60)
diffs (27 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -973,7 +973,10 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
list *exps;
if (f == cmp_filter) {
- fname = r+*pos, e;
+ // this produces a clang compile error (e
unused)
+ //fname = r+*pos, e;
+ fname = r+*pos;
+
skipIdent(r,pos);
e = r+*pos;
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1190,7 +1190,7 @@ command_set(int argc, char *argv[], mero
for (stats = orig; stats != NULL; stats = stats->next) {
if (type == INHERIT) {
- strncat(property, "=", sizeof(property));
+ strncat(property, "=", sizeof(property) -
strlen(property) - 1);
p = property;
}
out = control_send(&res, mero_host, mero_port,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
