"#if HAVE_FOO" -> "#ifdef HAVE_FOO"

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index f35debc3aa92e137165360320499f040ff90d163..906b489cb6e66eeea7022ad140fd049dd4799b1c 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -35,7 +35,11 @@
 #include <vlc_common.h>
 
 #include <stdarg.h>                                       /* va_list for BSD */
-#include <locale.h>
+#ifdef __APPLE__
+# include <xlocale.h>
+#elif defined(HAVE_LOCALE_H)
+# include <locale.h>
+#endif
 #include <errno.h>                                                  /* errno */
 
 #ifdef WIN32
@@ -78,7 +82,6 @@ static uintptr_t banks = 0;
 #   define vlc_va_copy(dest,src) (dest)=(src)
 #endif
 
-#define QUEUE priv->msg_bank
 static inline msg_bank_t *libvlc_bank (libvlc_int_t *inst)
 {
     return (libvlc_priv (inst))->msg_bank;
@@ -87,8 +90,6 @@ static inline msg_bank_t *libvlc_bank (libvlc_int_t *inst)
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void QueueMsg ( vlc_object_t *, int, const char *,
-                       const char *, va_list );
 static void PrintMsg ( vlc_object_t *, msg_item_t * );
 
 static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
@@ -105,11 +106,6 @@ struct msg_bank_t
     int i_sub;
     msg_subscription_t **pp_sub;
 
-    /* Logfile for WinCE */
-#ifdef UNDER_CE
-    FILE *logfile;
-#endif
-
     locale_t locale; /**< C locale for error messages */
     vlc_dictionary_t enabled_objects; ///< Enabled objects
     bool all_objects_enabled; ///< Should we print all objects?
@@ -133,14 +129,6 @@ msg_bank_t *msg_Create (void)
     /* C locale to get error messages in English in the logs */
     bank->locale = newlocale (LC_MESSAGES_MASK, "C", (locale_t)0);
 
-#ifdef UNDER_CE
-    QUEUE.logfile =
-        CreateFile( L"vlc-log.txt", GENERIC_WRITE,
-                    FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
-                    CREATE_ALWAYS, 0, NULL );
-    SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
-#endif
-
     vlc_mutex_lock( &msg_stack_lock );
     if( banks++ == 0 )
         vlc_threadvar_create( &msg_context, cleanup_msg_context );
@@ -200,9 +188,6 @@ void msg_Destroy (msg_bank_t *bank)
         vlc_threadvar_delete( &msg_context );
     vlc_mutex_unlock( &msg_stack_lock );
 
-#ifdef UNDER_CE
-    CloseHandle( QUEUE.logfile );
-#endif
     if (bank->locale != (locale_t)0)
        freelocale (bank->locale);
 
@@ -263,26 +248,20 @@ void msg_Unsubscribe (msg_subscription_t *sub)
 }
 
 /*****************************************************************************
- * __msg_*: print a message
+ * msg_*: print a message
  *****************************************************************************
  * These functions queue a message for later printing.
  *****************************************************************************/
-void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
+void msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
                     const char *psz_format, ... )
 {
     va_list args;
 
     va_start( args, psz_format );
-    QueueMsg( p_this, i_type, psz_module, psz_format, args );
+    msg_GenericVa (p_this, i_type, psz_module, psz_format, args);
     va_end( args );
 }
 
-void __msg_GenericVa( vlc_object_t *p_this, int i_type, const char *psz_module,
-                      const char *psz_format, va_list args )
-{
-    QueueMsg( p_this, i_type, psz_module, psz_format, args );
-}
-
 /**
  * Destroys a message.
  */
@@ -296,6 +275,7 @@ static void msg_Free (gc_object_t *gc)
     free (msg);
 }
 
+#undef msg_GenericVa
 /**
  * Add a message to a queue
  *
@@ -304,8 +284,9 @@ static void msg_Free (gc_object_t *gc)
  * is full). If the message can't be converted to string in memory, it issues
  * a warning.
  */
-static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
-                      const char *psz_format, va_list _args )
+void msg_GenericVa (vlc_object_t *p_this, int i_type,
+                           const char *psz_module,
+                           const char *psz_format, va_list _args)
 {
     size_t      i_header_size;             /* Size of the additionnal header */
     vlc_object_t *p_obj;
@@ -481,9 +462,6 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #   define WHITE   COL(0)
 #   define GRAY    "\033[0m"
 
-#ifdef UNDER_CE
-    int i_dummy;
-#endif
     static const char ppsz_type[4][9] = { "", " error", " warning", " debug" };
     static const char ppsz_color[4][8] = { WHITE, RED, YELLOW, GRAY };
     const char *psz_object;
@@ -526,19 +504,6 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
             return;
     }
 
-#ifdef UNDER_CE
-#   define CE_WRITE(str) WriteFile( QUEUE.logfile, \
-                                    str, strlen(str), &i_dummy, NULL );
-    CE_WRITE( p_item->psz_module );
-    CE_WRITE( " " );
-    CE_WRITE( psz_object );
-    CE_WRITE( ppsz_type[i_type] );
-    CE_WRITE( ": " );
-    CE_WRITE( p_item->psz_msg );
-    CE_WRITE( "\r\n" );
-    FlushFileBuffers( QUEUE.logfile );
-
-#else
     int canc = vlc_savecancel ();
     /* Send the message to stderr */
     utf8_fprintf( stderr, "[%s%p%s] %s%s%s %s%s: %s%s%s\n",
@@ -553,11 +518,10 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
                   p_item->psz_msg,
                   priv->b_color ? GRAY : "" );
 
-#   if defined(WIN32)
+#ifdef WIN32
     fflush( stderr );
-#   endif
-    vlc_restorecancel (canc);
 #endif
+    vlc_restorecancel (canc);
 }
 
 static msg_context_t* GetContext(void)
@@ -574,14 +538,6 @@ static msg_context_t* GetContext(void)
     return p_ctx;
 }
 
-void msg_StackDestroy (void *data)
-{
-    msg_context_t *p_ctx = data;
-
-    free (p_ctx->psz_message);
-    free (p_ctx);
-}
-
 void msg_StackSet( int i_code, const char *psz_message, ... )
 {
     va_list ap;