From 31160e846912db39aa89665fb96e09fdf8c7ec22 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 8 Apr 2010 15:54:07 +0000 Subject: [PATCH] CIndex: move extractUSRSuffix out of extern "C" and simplify it. llvm-svn: 100773 --- clang/tools/CIndex/CIndexUSRs.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/clang/tools/CIndex/CIndexUSRs.cpp b/clang/tools/CIndex/CIndexUSRs.cpp index 379320c31c85..e90d965a1cd3 100644 --- a/clang/tools/CIndex/CIndexUSRs.cpp +++ b/clang/tools/CIndex/CIndexUSRs.cpp @@ -259,6 +259,10 @@ void USRGenerator::GenObjCProtocol(llvm::StringRef prot) { // API hooks. //===----------------------------------------------------------------------===// +static inline llvm::StringRef extractUSRSuffix(llvm::StringRef s) { + return s.startswith("c:") ? s.substr(2) : ""; +} + extern "C" { CXString clang_getCursorUSR(CXCursor C) { @@ -276,12 +280,6 @@ CXString clang_getCursorUSR(CXCursor C) { return createCXString(SUG.str(), true); } -static inline llvm::StringRef extractUSRSuffix(llvm::StringRef s) { - if (!(s.size() >= 2 && s[0] == 'c' && s[1] == ':')) - return ""; - return s.substr(2); -} - CXString clang_constructUSR_ObjCIvar(const char *name, CXString classUSR) { StringUSRGenerator SUG; SUG << extractUSRSuffix(clang_getCString(classUSR));