[vlc-devel] commit: Spare a few relocs ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Tue May 27 21:30:50 2008 +0300| [1f75e5730e7fef018f5d7708ef9fba6e66fdaaa5]

Spare a few relocs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1f75e5730e7fef018f5d7708ef9fba6e66fdaaa5
---

 src/control/event.c       |    4 ++--
 src/input/es_out.c        |    2 +-
 src/misc/events.c         |    2 +-
 src/misc/messages.c       |    4 ++--
 src/network/getaddrinfo.c |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/control/event.c b/src/control/event.c
index 5e84463..5e35552 100644
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -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 )
 {
diff --git a/src/input/es_out.c b/src/input/es_out.c
index bbafad2..42c12eb 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -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"),
diff --git a/src/misc/events.c b/src/misc/events.c
index a8b54ec..2bc50ff 100644
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -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",
diff --git a/src/misc/messages.c b/src/misc/messages.c
index bfdd1d9..2e7fa5b 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -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;
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 840e300..f54f0cb 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -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.