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

Fix some coding standard issues and delete a dead conditional. 

llvm-svn: 244959
This commit is contained in:
Eric Christopher 2015-08-13 21:34:35 +00:00
parent e438127b91
commit b64963ecbc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -2491,17 +2491,17 @@ static void handleFormatArgAttr(Sema &S, Decl *D, const AttributeList &Attr) {
if (!checkFunctionOrMethodParameterIndex(S, D, Attr, 1, IdxExpr, Idx)) if (!checkFunctionOrMethodParameterIndex(S, D, Attr, 1, IdxExpr, Idx))
return; return;
// make sure the format string is really a string // Make sure the format string is really a string.
QualType Ty = getFunctionOrMethodParamType(D, Idx); QualType Ty = getFunctionOrMethodParamType(D, Idx);
bool not_nsstring_type = !isNSStringType(Ty, S.Context); bool NotNSStringTy = !isNSStringType(Ty, S.Context);
if (not_nsstring_type && if (NotNSStringTy &&
!isCFStringType(Ty, S.Context) && !isCFStringType(Ty, S.Context) &&
(!Ty->isPointerType() || (!Ty->isPointerType() ||
!Ty->getAs<PointerType>()->getPointeeType()->isCharType())) { !Ty->getAs<PointerType>()->getPointeeType()->isCharType())) {
S.Diag(Attr.getLoc(), diag::err_format_attribute_not) S.Diag(Attr.getLoc(), diag::err_format_attribute_not)
<< (not_nsstring_type ? "a string type" : "an NSString") << "a string type" << IdxExpr->getSourceRange()
<< IdxExpr->getSourceRange() << getFunctionOrMethodParamRange(D, 0); << getFunctionOrMethodParamRange(D, 0);
return; return;
} }
Ty = getFunctionOrMethodResultType(D); Ty = getFunctionOrMethodResultType(D);
@ -2510,7 +2510,7 @@ static void handleFormatArgAttr(Sema &S, Decl *D, const AttributeList &Attr) {
(!Ty->isPointerType() || (!Ty->isPointerType() ||
!Ty->getAs<PointerType>()->getPointeeType()->isCharType())) { !Ty->getAs<PointerType>()->getPointeeType()->isCharType())) {
S.Diag(Attr.getLoc(), diag::err_format_attribute_result_not) S.Diag(Attr.getLoc(), diag::err_format_attribute_result_not)
<< (not_nsstring_type ? "string type" : "NSString") << (NotNSStringTy ? "string type" : "NSString")
<< IdxExpr->getSourceRange() << getFunctionOrMethodParamRange(D, 0); << IdxExpr->getSourceRange() << getFunctionOrMethodParamRange(D, 0);
return; return;
} }