From 199b6b941d86fc99a3e609acb82a03d16572cfcd Mon Sep 17 00:00:00 2001
From: Renato Golin <renato.golin@linaro.org>
Date: Mon, 14 Nov 2016 13:09:24 +0000
Subject: Revert "llvm-strings: support printing the filename"

Also,

Revert "test: remove the archive before modifying it"
Revert "test: explicitly use gnu format"

This reverts commits r286778, r286729 and r286767, as they are randomly failing
on many bots (AArch64, x86_64).

llvm-svn: 286820
---
 llvm/tools/llvm-strings/llvm-strings.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'llvm/tools/llvm-strings/llvm-strings.cpp')

diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp
index cb0fb96..6e5e2f2 100644
--- a/llvm/tools/llvm-strings/llvm-strings.cpp
+++ b/llvm/tools/llvm-strings/llvm-strings.cpp
@@ -29,19 +29,7 @@ static cl::list<std::string> InputFileNames(cl::Positional,
                                             cl::desc("<input object files>"),
                                             cl::ZeroOrMore);
 
-static cl::opt<bool>
-    PrintFileName("print-file-name",
-                  cl::desc("Print the name of the file before each string"));
-static cl::alias PrintFileNameShort("f", cl::desc(""),
-                                    cl::aliasopt(PrintFileName));
-
-static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
-  auto print = [&OS, FileName](StringRef L) {
-    if (PrintFileName)
-      OS << FileName << ": ";
-    OS << L << '\n';
-  };
-
+static void strings(raw_ostream &OS, StringRef Contents) {
   const char *P = nullptr, *E = nullptr, *S = nullptr;
   for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {
     if (std::isgraph(*P) || std::isblank(*P)) {
@@ -49,12 +37,12 @@ static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
         S = P;
     } else if (S) {
       if (P - S > 3)
-        print(StringRef(S, P - S));
+        OS << StringRef(S, P - S) << '\n';
       S = nullptr;
     }
   }
   if (S && E - S > 3)
-    print(StringRef(S, E - S));
+    OS << StringRef(S, E - S) << '\n';
 }
 
 int main(int argc, char **argv) {
@@ -72,8 +60,7 @@ int main(int argc, char **argv) {
     if (std::error_code EC = Buffer.getError())
       errs() << File << ": " << EC.message() << '\n';
     else
-      strings(llvm::outs(), File == "-" ? "{standard input}" : File,
-              Buffer.get()->getMemBufferRef().getBuffer());
+      strings(llvm::outs(), Buffer.get()->getMemBufferRef().getBuffer());
   }
 
   return EXIT_SUCCESS;
-- 
cgit v1.1