Changeset: 0e0de4ab838a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e0de4ab838a
Modified Files:
clients/odbc/driver/ODBCUtil.c
tools/merovingian/daemon/argvcmds.c
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (87 lines):
diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -456,7 +456,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s%s%s", n, nquery, buf, p);
+ length = (size_t) sprintf(q, "%.*s%s%s", n, nquery,
buf, p);
free(nquery);
nquery = q;
q += n;
@@ -496,7 +496,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s%s%s", n, nquery, buf, p);
+ length = (size_t) sprintf(q, "%.*s%s%s", n, nquery,
buf, p);
free(nquery);
nquery = q;
q += n;
@@ -516,7 +516,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s%s%s", n, nquery, buf, p);
+ length = (size_t) sprintf(q, "%.*s%s%s", n, nquery,
buf, p);
free(nquery);
nquery = q;
q += n;
@@ -538,7 +538,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s%.*s%s", n, nquery, (int) intvl, intv,
p);
+ length = (size_t) sprintf(q, "%.*s%.*s%s", n, nquery,
(int) intvl, intv, p);
free(nquery);
nquery = q;
q += n;
@@ -634,7 +634,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*scall %.*s%s", n, nquery, (int) (procend
- proc), proc, p);
+ length = (size_t) sprintf(q, "%.*scall %.*s%s", n,
nquery, (int) (procend - proc), proc, p);
free(nquery);
nquery = q;
q += n;
@@ -746,7 +746,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s'%s'%s", n,
nquery, dbc->Connected && dbc->uid ? dbc->uid : "", p);
+ length = (size_t) sprintf(q,
"%.*s'%s'%s", n, nquery, dbc->Connected && dbc->uid ? dbc->uid : "", p);
free(nquery);
nquery = q;
q += n;
@@ -756,7 +756,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return NULL;
}
- sprintf(q, "%.*s'%s'%s", n,
nquery, dbc->Connected && dbc->dbname ? dbc->dbname : "", p);
+ length = (size_t) sprintf(q,
"%.*s'%s'%s", n, nquery, dbc->Connected && dbc->dbname ? dbc->dbname : "", p);
free(nquery);
nquery = q;
q += n;
@@ -770,7 +770,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
free(nquery);
return
NULL;
}
- sprintf(q,
"%.*scast(%.*s as %s)%s", n, nquery, (int) args[0].arglen, args[0].argstart,
c->server, p);
+ length =
(size_t) sprintf(q, "%.*scast(%.*s as %s)%s", n, nquery, (int) args[0].arglen,
args[0].argstart, c->server, p);
free(nquery);
nquery = q;
break;
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -30,7 +30,7 @@ command_help(int argc, char *argv[])
int exitcode = 0;
if (argc < 2) {
- printf("usage: monetdbd [ command [ command-options ] ]
<dbfarm>Q\n");
+ printf("usage: monetdbd [ command [ command-options ] ]
<dbfarm>\n");
printf(" where command is one of:\n");
printf(" create, start, stop, get, set, version or help\n");
printf(" use the help command to get help for a particular
command\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
