change str_sprintf to snprintf
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5889cba4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5889cba4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5889cba4 Branch: refs/heads/master Commit: 5889cba42707e1115d30f5d4bb0cb65ed9f8d073 Parents: 68e8329 Author: Sandhya Sundaresan <[email protected]> Authored: Thu Oct 19 21:21:24 2017 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Thu Oct 19 21:21:24 2017 +0000 ---------------------------------------------------------------------- core/sql/cli/Statement.cpp | 11 +++++++---- core/sql/executor/ExHdfsScan.cpp | 4 ++-- core/sql/exp/ExpLOBaccess.cpp | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/cli/Statement.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp index adbacc8..6d847f0 100644 --- a/core/sql/cli/Statement.cpp +++ b/core/sql/cli/Statement.cpp @@ -2056,8 +2056,7 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si, if ((failedLocBufLen > 0) && (strlen(failedLocBuf) > 0)) { char errBuf[strlen(si->tableName()) + 100 + failedLocBufLen]; - str_sprintf(errBuf, "%s (fileLoc: %s)", - si->tableName(), failedLocBuf); + snprintf(errBuf,sizeof(errBuf), "%s (fileLoc: %s)", si->tableName(), failedLocBuf); diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND) << DgString0(errBuf); } @@ -2075,9 +2074,13 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si, if (retcode == 1) // check failed { char errStr[2000]; - str_sprintf(errStr, "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s", + /* str_sprintf(errStr, "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s", si->modTS(), failedModTS, - (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir())); + (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));*/ + snprintf(errStr,sizeof(errStr), + "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s", + si->modTS(), failedModTS, + (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir())); diagsArea << DgSqlCode(-EXE_HIVE_DATA_MOD_CHECK_ERROR) << DgString0(errStr); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/executor/ExHdfsScan.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp index 8bef800..f49ad06 100644 --- a/core/sql/executor/ExHdfsScan.cpp +++ b/core/sql/executor/ExHdfsScan.cpp @@ -622,8 +622,8 @@ ExWorkProcRetcode ExHdfsScanTcb::work() { char errBuf[strlen(hdfsScanTdb().tableName()) + strlen(hdfsFileName_) + 100]; - str_sprintf(errBuf, "%s (fileLoc: %s)", - hdfsScanTdb().tableName(), hdfsFileName_); + snprintf(errBuf, sizeof(errBuf),"%s (fileLoc: %s)", + hdfsScanTdb().tableName(), hdfsFileName_); ExRaiseSqlError(getHeap(), &diagsArea, (ExeErrorCode)(EXE_TABLE_NOT_FOUND), NULL, NULL, NULL, NULL, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/exp/ExpLOBaccess.cpp ---------------------------------------------------------------------- diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp index 13137d4..58febe9 100644 --- a/core/sql/exp/ExpLOBaccess.cpp +++ b/core/sql/exp/ExpLOBaccess.cpp @@ -457,7 +457,7 @@ Ex_Lob_Error ExLob::dataModCheck( ? (*failedLocBufLen-1) : failedFileLen); Int32 hdfserror = errno; char hdfsErrStr[20]; - sprintf(hdfsErrStr,"(errno %d)",errno); + snprintf(hdfsErrStr,sizeof(hdfsErrStr),"(errno %d)",errno); str_cpy_and_null(failedLocBuf, dirPath, copyLen, '\0', ' ', TRUE); str_cat_c(failedLocBuf,hdfsErrStr);
