s/ostream/iostream/; s/diag/file_diag/

diff --git a/id3v2-grep.cc b/id3v2-grep.cc
index 90bbeea..be463ce 100644 (file)
--- a/id3v2-grep.cc
+++ b/id3v2-grep.cc
@@ -2,7 +2,7 @@ extern "C" {
 #include <unistd.h>
 }
 
-#include <ostream>
+#include <iostream>
 #include <sstream>
 #include <string>
 
@@ -19,7 +19,7 @@ using std::stringstream;
 const string FRAME_ID_OPT("id");
 const string FRAME_TEXT_OPT("text");
 
-static bool diag = true;
+static bool file_diag = true;
 static enum { PRINT_BOTH, PRINT_FILE, PRINT_MATCH, PRINT_NONE,
               PRINT_DEFAULT } print = PRINT_DEFAULT;
 static enum { GREP_BOTH, GREP_ID, GREP_TEXT } grep_frame = GREP_BOTH;
@@ -85,7 +85,7 @@ main(int argc, char **argv)
             print = PRINT_NONE;
             break;
         case 's':
-            diag = false;
+            file_diag = false;
             break;
         case 'Q':
             if (optarg == FRAME_ID_OPT) {
@@ -125,7 +125,7 @@ main(int argc, char **argv)
         char *fn = *argv;
         TagLib::MPEG::File f(fn);
         if (!f.isValid()) {
-            if (diag) {
+            if (file_diag) {
                 cerr << "failed to open " << fn << endl;
             }
             bad_files++;