From 96d6a116316e15c7684ae1ad8ff639f4e768e9fe Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Dec 2004 15:39:46 +0000 Subject: [PATCH] added returntype BaseString& for ndb_upper and ndb_lower instead of void uppercase printout ndb/include/util/BaseString.hpp: added returntype BaseString& for ndb_upper and ndb_lower instead of void ndb/src/mgmclient/CommandInterpreter.cpp: uppercase printout --- ndb/include/util/BaseString.hpp | 10 ++++++---- ndb/src/mgmclient/CommandInterpreter.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp index 066a24f294e..02a6a3b3e66 100644 --- a/ndb/include/util/BaseString.hpp +++ b/ndb/include/util/BaseString.hpp @@ -48,10 +48,10 @@ public: bool empty() const; /** @brief Convert to uppercase */ - void ndb_toupper(); + BaseString& ndb_toupper(); /** @brief Convert to lowercase */ - void ndb_tolower(); + BaseString& ndb_tolower(); /** @brief Assigns from a char * */ BaseString& assign(const char* s); @@ -206,16 +206,18 @@ BaseString::empty() const return m_len == 0; } -inline void +inline BaseString& BaseString::ndb_toupper() { for(unsigned i = 0; i < length(); i++) m_chr[i] = toupper(m_chr[i]); + return *this; } -inline void +inline BaseString& BaseString::ndb_tolower() { for(unsigned i = 0; i < length(); i++) m_chr[i] = tolower(m_chr[i]); + return *this; } inline bool diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp index 3a9b3c47376..53c0e3b673e 100644 --- a/ndb/src/mgmclient/CommandInterpreter.cpp +++ b/ndb/src/mgmclient/CommandInterpreter.cpp @@ -1249,7 +1249,7 @@ CommandInterpreter::executeClusterLog(char* parameters) printError(); DBUG_VOID_RETURN; } - ndbout << item << " " << (res_enable ? "enabled":"disabled") << endl; + ndbout << BaseString(item).ndb_toupper().c_str() << " " << (res_enable ? "enabled":"disabled") << endl; item = strtok_r(NULL, " ", &tmpPtr); } while(item != NULL);