You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by hz...@apache.org on 2016/02/01 22:49:35 UTC
[3/9] incubator-trafodion git commit: fix comments for jira 1720
fix comments for jira 1720
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3efa7313
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3efa7313
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3efa7313
Branch: refs/heads/master
Commit: 3efa7313c51b31b4d1a3be28a84a083a63dd0178
Parents: 12a0c3e
Author: Cloud User <ce...@ming01.novalocal>
Authored: Tue Jan 12 15:56:46 2016 +0000
Committer: Cloud User <ce...@ming01.novalocal>
Committed: Tue Jan 12 15:56:46 2016 +0000
----------------------------------------------------------------------
core/sql/common/csconvert.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3efa7313/core/sql/common/csconvert.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/csconvert.cpp b/core/sql/common/csconvert.cpp
index f94ec2a..a18b1c3 100644
--- a/core/sql/common/csconvert.cpp
+++ b/core/sql/common/csconvert.cpp
@@ -1306,7 +1306,7 @@ int gbk2utf8(char *inbuf,size_t inlen,char *outbuf,size_t outlen)
/* convert gbk string into UTF8 */
int gbkToUtf8(char* gbkString, size_t gbklen,
- char* result ,size_t outlen, int addNullAtEnd)
+ char* result ,size_t outlen, bool addNullAtEnd)
{
int originalOutlen = outlen;
int finalLength = gbk2utf8 ( gbkString, gbklen, result, outlen);
@@ -1315,7 +1315,7 @@ int gbkToUtf8(char* gbkString, size_t gbklen,
//the result is allocated with lenght originalOutlen + 1
//so no overrun is possible
- if ( addNullAtEnd > 0 )
+ if ( addNullAtEnd )
{
if(originalOutlen >= finalLength )
result[finalLength] = 0;