From 7d6f1ef66499e05cd7ac1ada2a275066a7f1bca6 Mon Sep 17 00:00:00 2001 From: Hiroshi Inoue Date: Tue, 17 Nov 2009 15:44:01 +0000 Subject: [PATCH] Fix a bug reported by Marco Cassiano and suppress some compiler warnings. --- convert.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 6b5fab3..5d8723c 100644 --- a/convert.c +++ b/convert.c @@ -1099,7 +1099,7 @@ inolog("2stime fr=%d\n", std_time.fr); for (i = 0, j = 0; ptr[i]; i++) if (ptr[i] == '.') { - strncpy_null(&new_string[j], lc->decimal_point, strlen(lc->decimal_point)); + strncpy_null(&new_string[j], lc->decimal_point, cbValueMax - j); j += strlen(lc->decimal_point); } else @@ -2902,7 +2902,7 @@ Int4 findIdentifier(const char *str, int ccsc, const char **nextdel) continue; if (sptr == str) /* the first character */ { - if (dquote = (IDENTIFIER_QUOTE == tchar)) + if (dquote = (IDENTIFIER_QUOTE == tchar), dquote) continue; if (!isalpha(tchar)) { @@ -3068,10 +3068,6 @@ inner_process_tokens(QueryParse *qp, QueryBuild *qb) */ else if (oldchar == ODBC_ESCAPE_START) { - int npos = F_NewPos(qb); - BOOL addsp = TRUE; - unsigned char tchar; - if (SQL_ERROR == convert_escape(qp, qb)) { if (0 == qb->errornumber) -- 2.39.5