From 5de27daf93c167a0108d8549db3f89055656a0e7 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 22 Sep 2009 03:27:52 +0000 Subject: Switch a few clients over to StringLiteral::getString. - Switching all of them out-of-my-current-scope-of-interest, sorry. llvm-svn: 82515 --- clang/lib/Sema/SemaChecking.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 1e26c3507bb..0da06a99d59 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -447,17 +447,13 @@ bool Sema::CheckObjCString(Expr *Arg) { return true; } - const char *Data = Literal->getStrData(); - unsigned Length = Literal->getByteLength(); - - for (unsigned i = 0; i < Length; ++i) { - if (!Data[i]) { - Diag(getLocationOfStringLiteralByte(Literal, i), - diag::warn_cfstring_literal_contains_nul_character) - << Arg->getSourceRange(); - break; - } - } + llvm::StringRef Str = Literal->getString(); + size_t NullLoc = Str.find('\0'); + + if (NullLoc != llvm::StringRef::npos) + Diag(getLocationOfStringLiteralByte(Literal, NullLoc), + diag::warn_cfstring_literal_contains_nul_character) + << Arg->getSourceRange(); return false; } -- cgit v1.2.3