diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-24 19:49:45 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-24 19:49:45 +0000 |
| commit | 4cf158b0acdc5da37ab2db8c9824f337c0339728 (patch) | |
| tree | 49a26ff477a7dd17b9215a0f285b429be959f722 | |
| parent | 45c94a288d2f226e06d901deb2514434f21dad20 (diff) | |
| download | mariadb-git-4cf158b0acdc5da37ab2db8c9824f337c0339728.tar.gz | |
bug fix
| -rw-r--r-- | ndb/src/common/mgmcommon/InitConfigFileParser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp index a811c1a5e49..26bb147964c 100644 --- a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp +++ b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp @@ -222,8 +222,8 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { char tmpLine[MAX_LINE_LENGTH]; char fname[MAX_LINE_LENGTH], rest[MAX_LINE_LENGTH]; char* t; - const char separator_list[]= {':', '='}; - char separator= 0; + const char *separator_list[]= {":", "="}; + const char *separator= 0; if (ctx.m_currentSection == NULL){ ctx.reportError("Value specified outside section"); @@ -236,7 +236,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { // Check if a separator exists in line // ************************************* for(int i= 0; i < sizeof(separator_list); i++) { - if(strchr(tmpLine, separator_list[i])) { + if(strchr(tmpLine, separator_list[i][0])) { separator= separator_list[i]; break; } @@ -250,13 +250,13 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { // ******************************************* // Get pointer to substring before separator // ******************************************* - t = strtok(tmpLine, ":"); + t = strtok(tmpLine, separator); // ***************************************** // Count number of tokens before separator // ***************************************** if (sscanf(t, "%120s%120s", fname, rest) != 1) { - ctx.reportError("Multiple names before \'%c\'", separator); + ctx.reportError("Multiple names before \'%c\'", separator[0]); return false; } if (!ctx.m_currentInfo->contains(fname)) { |