From eaabbd8b46c4b666b5f5b970b6e2f6d37138be74 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 8 Feb 2010 18:38:55 +0000 Subject: Reapply r95546, no intended change in performance or functionality. llvm-svn: 95552 --- clang/lib/Checker/CocoaConventions.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'clang/lib/Checker/CocoaConventions.cpp') diff --git a/clang/lib/Checker/CocoaConventions.cpp b/clang/lib/Checker/CocoaConventions.cpp index ff3a0c97b41..3ba887ccc7e 100644 --- a/clang/lib/Checker/CocoaConventions.cpp +++ b/clang/lib/Checker/CocoaConventions.cpp @@ -131,19 +131,18 @@ cocoa::NamingConvention cocoa::deriveNamingConvention(Selector S) { return C; } -bool cocoa::isRefType(QualType RetTy, const char* prefix, - const char* name) { - +bool cocoa::isRefType(QualType RetTy, llvm::StringRef Prefix, + llvm::StringRef Name) { // Recursively walk the typedef stack, allowing typedefs of reference types. while (TypedefType* TD = dyn_cast(RetTy.getTypePtr())) { llvm::StringRef TDName = TD->getDecl()->getIdentifier()->getName(); - if (TDName.startswith(prefix) && TDName.endswith("Ref")) + if (TDName.startswith(Prefix) && TDName.endswith("Ref")) return true; RetTy = TD->getDecl()->getUnderlyingType(); } - if (!name) + if (Name.empty()) return false; // Is the type void*? @@ -152,7 +151,7 @@ bool cocoa::isRefType(QualType RetTy, const char* prefix, return false; // Does the name start with the prefix? - return llvm::StringRef(name).startswith(prefix); + return Name.startswith(Prefix); } bool cocoa::isCFObjectRef(QualType T) { -- cgit v1.2.3