From 12ff58be34eec08ead23893610ca0b6cb9a15f45 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Tue, 24 Nov 2015 15:50:32 +0200 Subject: [PATCH] Use sizeof instead of magic number --- modules/godbcbackend/sodbc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/godbcbackend/sodbc.cc b/modules/godbcbackend/sodbc.cc index 10c1b274d0..6b03c5f099 100644 --- a/modules/godbcbackend/sodbc.cc +++ b/modules/godbcbackend/sodbc.cc @@ -276,11 +276,11 @@ SSqlStatement* SODBCStatement::nextRow(row_t& row) row.push_back( "" ); } else { SQLCHAR coldata[128*1024]; - result = SQLGetData( d_statement, i + 1, SQL_C_CHAR, (SQLPOINTER) coldata, 131702, &len ); - std::string strres = std::string(reinterpret_cast(coldata), std::min(131701,len)); // do not use nil byte + result = SQLGetData( d_statement, i + 1, SQL_C_CHAR, (SQLPOINTER) coldata, sizeof(coldata), &len); + std::string strres = std::string(reinterpret_cast(coldata), std::min(sizeof(coldata)-1,len)); // do not use nil byte while(result == SQL_SUCCESS_WITH_INFO && len > 0) { // all data is consumed if len < 1 - result = SQLGetData( d_statement, i + 1, SQL_C_CHAR, (SQLPOINTER) coldata, 131702, &len ); - strres = strres + std::string(reinterpret_cast(coldata), std::min(131701,len)); + result = SQLGetData( d_statement, i + 1, SQL_C_CHAR, (SQLPOINTER) coldata, sizeof(coldata), &len ); + strres = strres + std::string(reinterpret_cast(coldata), std::min(sizeof(coldata)-1,len)); cerr<<"len="<