Changeset: 490f8b344ff8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=490f8b344ff8
Modified Files:
clients/odbc/driver/ODBCUtil.c
Branch: Jul2017
Log Message:
Adjust length correctly.
diffs (75 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;
@@ -585,7 +585,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;
@@ -695,7 +695,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;
@@ -705,7 +705,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;
@@ -719,7 +719,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;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
