]> git.sesse.net Git - vlc/commitdiff
Spare a few relocs
authorRémi Denis-Courmont <rem@videolan.org>
Tue, 27 May 2008 18:30:50 +0000 (21:30 +0300)
committerRémi Denis-Courmont <rem@videolan.org>
Tue, 27 May 2008 18:30:50 +0000 (21:30 +0300)
src/control/event.c
src/input/es_out.c
src/misc/events.c
src/misc/messages.c
src/network/getaddrinfo.c

index 5e844630079b10a02e927e516018ffb5b8f893d8..5e35552033f09815c74d80374ff5b2cf3e8a315f 100644 (file)
@@ -229,7 +229,7 @@ void libvlc_event_send( libvlc_event_manager_t * p_em,
  *
  * Get the char * name of an event type.
  **************************************************************************/
-static const char * event_type_to_name[] =
+static const char event_type_to_name[][35] =
 {
 #define EVENT(a) [a]=#a
     EVENT(libvlc_MediaMetaChanged),
@@ -265,7 +265,7 @@ static const char * event_type_to_name[] =
 #undef EVENT
 };
 
-static const char * unkwown_event_name = "Unknown Event";
+static const char unkwown_event_name[] = "Unknown Event";
 
 const char * libvlc_event_type_name( libvlc_event_type_t event_type )
 {
index bbafad2aa65c191f5a2ea609f64a2c3813610c68..42c12eb7d63501a337e7024408dc3a3a52077c9c 100644 (file)
@@ -1441,7 +1441,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
                 VLC_FOURCC('c', 'c', '3', ' '),
                 VLC_FOURCC('c', 'c', '4', ' '),
             };
-            static const char *ppsz_description[4] = {
+            static const char ppsz_description[4][18] = {
                 N_("Closed captions 1"),
                 N_("Closed captions 2"),
                 N_("Closed captions 3"),
index a8b54ec4da276e693f9828746b7c7ad4392236f8..2bc50ff7255031bd42a38fc57e78fb274f627df8 100644 (file)
@@ -70,7 +70,7 @@ typedef struct vlc_event_listeners_group_t
 } vlc_event_listeners_group_t;
 
 #ifdef DEBUG_EVENT
-static const char * ppsz_event_type_to_name[] =
+static const char ppsz_event_type_to_name[][33] =
 {
     [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
     [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
index bfdd1d931d40d0a4dbd5a5757e9f25d3a1e88452..2e7fa5be78add8280b48ec1fb9264615a5ad3491 100644 (file)
@@ -523,8 +523,8 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #ifdef UNDER_CE
     int i_dummy;
 #endif
-    static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
-    static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
+    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;
     libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
     int i_type = p_item->i_type;
index 840e300ccff296675c70698fc5d0541f7528f802..f54f0cb97c28f8995d46f8f9e522c93c6e86c7c3 100644 (file)
@@ -82,7 +82,7 @@ static struct
     { 0,              NULL }
 };
 
-static const char *__gai_unknownerr = "Unrecognized error number";
+static const char __gai_unknownerr[] = "Unrecognized error number";
 
 /****************************************************************************
  * Converts an EAI_* error code into human readable english text.