maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric. 

This should take a "const char*" not a "char &".

Summary:
Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric.

This passes the MI tests on Mac OS X.

Reviewers: ki.stfu, abidh, domipheus

Subscribers: lldb-commits-list

Differential Revision: http://reviews.llvm.org/D10906

llvm-svn: 241322
This commit is contained in:
Bruce Mitchener 2015-07-03 07:28:11 +00:00
parent d30f5ffddc
commit 68dc553fda
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
View File

@ -383,7 +383,7 @@ CMICmnLLDBDebugSessionInfo::MIResponseFormThreadInfo(const SMICmdData &vCmdData,
const MIchar *pThreadName = rThread.GetName();
const MIuint len = (pThreadName != nullptr) ? CMIUtilString(pThreadName).length() : 0;
const bool bHaveName = ((pThreadName != nullptr) && (len > 0) && (len < 32) &&
CMIUtilString::IsAllValidAlphaAndNumeric(*pThreadName)); // 32 is arbitary number
CMIUtilString::IsAllValidAlphaAndNumeric(pThreadName)); // 32 is arbitary number
const MIchar *pThrdFmt = bHaveName ? "%s" : "Thread %d";
CMIUtilString strThread;
if (bHaveName)

11
lldb/tools/lldb-mi/MIUtilString.cpp
View File

@ -475,21 +475,20 @@ CMIUtilString::ExtractNumberFromHexadecimal(MIint64 &vwrNumber) const
// Details: Determine if the text is all valid alpha numeric characters. Letters can be
// either upper or lower case.
// Type: Static method.
// Args: vrText - (R) The text data to examine.
// Args: vpText - (R) The text data to examine.
// Return: bool - True = yes all alpha, false = one or more chars is non alpha.
// Throws: None.
//--
bool
CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar &vrText)
CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar *vpText)
{
const MIuint len = ::strlen(&vrText);
const MIuint len = ::strlen(vpText);
if (len == 0)
return false;
MIchar *pPtr = const_cast<MIchar *>(&vrText);
for (MIuint i = 0; i < len; i++, pPtr++)
for (MIuint i = 0; i < len; i++, vpText++)
{
const MIchar c = *pPtr;
const MIchar c = *vpText;
if (::isalnum((int)c) == 0)
return false;
}

2
lldb/tools/lldb-mi/MIUtilString.h
View File

@ -35,7 +35,7 @@ class CMIUtilString : public std::string
static CMIUtilString Format(const CMIUtilString vFormating, ...);
static CMIUtilString FormatBinary(const MIuint64 vnDecimal);
static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs);
static bool IsAllValidAlphaAndNumeric(const MIchar &vrText);
static bool IsAllValidAlphaAndNumeric(const MIchar *vpText);
static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs);
static CMIUtilString ConvertToPrintableASCII(const char vChar);
static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16);