From 2f8187933fe4ec8ae644dfe5d44ad3708f59dc71 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Thu, 18 Aug 2011 17:56:32 +0000 Subject: [PATCH] Use StringRef, rather than C string APIs. llvm-svn: 137958 --- clang/lib/Driver/Tools.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 295ab32aeeae..ca8b7d4bb993 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2448,18 +2448,19 @@ darwin::CC1::getDependencyFileName(const ArgList &Args, void darwin::CC1::RemoveCC1UnsupportedArgs(ArgStringList &CmdArgs) const { for (ArgStringList::iterator it = CmdArgs.begin(), ie = CmdArgs.end(); it != ie;) { - const char *Option = *it; + + StringRef Option = *it; // We only remove warning options. - if (strncmp(Option, "-W", 2)) { + if (!Option.startswith("-W")) { ++it; continue; } - if (strncmp(Option, "-Wno-", 5)) - Option = &Option[2]; + if (Option.startswith("-Wno-")) + Option = Option.substr(5); else - Option = &Option[5]; + Option = Option.substr(2); bool RemoveOption = llvm::StringSwitch(Option) .Case("address-of-temporary", true)