Revert "Ugly hack to enable really quiet running of VLC."

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 8949fd5f6005e8383623bcec6f66be9110db9b02..657b1be84b207df72aab55b7bd3e984010d63e44 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -47,7 +47,6 @@ extern char *FromLocale (const char *);
 #include <time.h>
 #include <pthread.h>
 #include <unistd.h>
-#include <string.h>
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
@@ -55,7 +54,7 @@ extern char *FromLocale (const char *);
 int main( int i_argc, const char *ppsz_argv[] )
 {
 #ifdef __APPLE__
-    /* The so-called POSIX-compliant MacOS X is not.
+    /* The so-called POSIX-compliant MacOS X is not. 
      * SIGPIPE fires even when it is blocked in all threads! */
     signal (SIGPIPE, SIG_IGN);
 #endif
@@ -75,8 +74,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 
 #ifndef __APPLE__
     /* This clutters OSX GUI error logs */
-    if (i_argc > 1 && strcmp(ppsz_argv[1], "--quiet")) /* dirty hack to enable really quiet runing of vlc */
-        fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
+    fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
 #endif
 
 #ifdef HAVE_PUTENV
@@ -92,7 +90,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* Synchronously intercepted POSIX signals.
      *
      * In a threaded program such as VLC, the only sane way to handle signals
-     * is to block them in all thread but one - this is the only way to
+     * is to block them in all threads but one - this is the only way to
      * predict which thread will receive them. If any piece of code depends
      * on delivery of one of this signal it is intrinsically not thread-safe
      * and MUST NOT be used in VLC, whether we like it or not.