summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-10-23 13:27:30 +0000
committertschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-10-23 13:27:30 +0000
commit19e22eaf9db8afbc7c3533e1b54737539c939973 (patch)
treefcedeb2413193b18da7ad5e1e731f80671c01360
parentd44fa42b8c4cb5bd129c43c1f278e995e9e1bcbb (diff)
downloadlog4cxx-master.tar.gz
LOGCXX-484: Spelling error s/excute/executeHEADmaster
git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1766278 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/changes/changes.xml1
-rw-r--r--src/main/cpp/odbcappender.cpp28
2 files changed, 15 insertions, 14 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6025577..9670343 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -94,6 +94,7 @@
<action issue="LOGCXX-446" type="fix">make install fails, trying to overwrite header files</action>
<action issue="LOGCXX-464" type="fix">TimeBasedRollingPolicy should append as configured on rollover</action>
<action issue="LOGCXX-482" type="fix">Build failure with GCC-6</action>
+ <action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
<action type="update">Behavior of StringHelper::startsWith and endsWith synced</action>
<action type="update">Documented C (class) and M (method) log format keywords.</action>
diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
index f3cfb65..88876cf 100644
--- a/src/main/cpp/odbcappender.cpp
+++ b/src/main/cpp/odbcappender.cpp
@@ -39,18 +39,18 @@ using namespace log4cxx::helpers;
using namespace log4cxx::db;
using namespace log4cxx::spi;
-SQLException::SQLException(short fHandleType,
+SQLException::SQLException(short fHandleType,
void* hInput, const char* prolog,
- log4cxx::helpers::Pool& p)
+ log4cxx::helpers::Pool& p)
: Exception(formatMessage(fHandleType, hInput, prolog, p)) {
}
-SQLException::SQLException(const char* msg)
+SQLException::SQLException(const char* msg)
: Exception(msg) {
}
-SQLException::SQLException(const SQLException& src)
+SQLException::SQLException(const SQLException& src)
: Exception(src) {
}
@@ -69,7 +69,7 @@ const char* SQLException::formatMessage(short fHandleType,
// Get the status records.
i = 1;
while ((rc2 = SQLGetDiagRecA(fHandleType, hInput, i, SqlState, &NativeError,
- Msg, sizeof(Msg), &MsgLen)) != SQL_NO_DATA)
+ Msg, sizeof(Msg), &MsgLen)) != SQL_NO_DATA)
{
strReturn.append((char*) Msg);
i++;
@@ -140,7 +140,7 @@ void ODBCAppender::append(const spi::LoggingEventPtr& event, log4cxx::helpers::P
if (buffer.size() >= bufferSize)
flushBuffer(p);
-#endif
+#endif
}
LogString ODBCAppender::getLogStatement(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const
@@ -168,7 +168,7 @@ void ODBCAppender::execute(const LogString& sql, log4cxx::helpers::Pool& p)
}
SQLWCHAR* wsql;
- encode(&wsql, sql, p);
+ encode(&wsql, sql, p);
ret = SQLExecDirectW(stmt, wsql, SQL_NTS);
if (ret < 0)
@@ -182,7 +182,7 @@ void ODBCAppender::execute(const LogString& sql, log4cxx::helpers::Pool& p)
{
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
}
-
+
throw;
}
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
@@ -243,8 +243,8 @@ ODBCAppender::SQLHDBC ODBCAppender::getConnection(log4cxx::helpers::Pool& p)
encode(&wUser, databaseUser, p);
encode(&wPwd, databasePassword, p);
- ret = SQLConnectW( connection,
- wURL, SQL_NTS,
+ ret = SQLConnectW( connection,
+ wURL, SQL_NTS,
wUser, SQL_NTS,
wPwd, SQL_NTS);
@@ -261,7 +261,7 @@ ODBCAppender::SQLHDBC ODBCAppender::getConnection(log4cxx::helpers::Pool& p)
return connection;
#else
return 0;
-#endif
+#endif
}
void ODBCAppender::close()
@@ -307,7 +307,7 @@ void ODBCAppender::flushBuffer(Pool& p)
}
catch (SQLException& e)
{
- errorHandler->error(LOG4CXX_STR("Failed to excute sql"), e,
+ errorHandler->error(LOG4CXX_STR("Failed to execute sql"), e,
ErrorCode::FLUSH_FAILURE);
}
}
@@ -337,10 +337,10 @@ void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p) {
*dest = Transcoder::wencode(src, p);
}
-void ODBCAppender::encode(unsigned short** dest,
+void ODBCAppender::encode(unsigned short** dest,
const LogString& src, Pool& p) {
// worst case double number of characters from UTF-8 or wchar_t
- *dest = (unsigned short*)
+ *dest = (unsigned short*)
p.palloc((src.size() + 1) * 2 * sizeof(unsigned short));
unsigned short* current = *dest;
for(LogString::const_iterator i = src.begin();