[vlc-commits] Fixed warnings on duplicate const modifiers.

[Maxim Bublis]

vlc | branch: master | Maxim Bublis <b at codemonkey.ru> | Mon Nov 18 11:44:49 2013 +0400| [f0b348332357eb2e0d66653ea9ddd0238d5aadf8] | committer: Rémi Denis-Courmont

Fixed warnings on duplicate const modifiers.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 modules/codec/schroedinger.c     |    2 +-
 modules/codec/x264.c             |    2 +-
 modules/control/dbus/dbus_root.c |    4 ++--
 modules/demux/ogg.c              |    4 ++--
 modules/demux/ogg.h              |    2 +-
 modules/lua/extension.c          |    2 +-
 src/input/subtitles.c            |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c
index 14bfabb..46ef801 100644
--- a/modules/codec/schroedinger.c
+++ b/modules/codec/schroedinger.c
@@ -342,7 +342,7 @@ static const char *const enc_profile_list_text[] =
     N_("Main Profile"),
   };
 
-static const char *const const ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     ENC_RATE_CONTROL, ENC_GOP_STRUCTURE, ENC_QUALITY, ENC_NOISE_THRESHOLD, ENC_BITRATE,
     ENC_MIN_BITRATE, ENC_MAX_BITRATE, ENC_AU_DISTANCE, ENC_CHROMAFMT,
     ENC_PREFILTER, ENC_PREFILTER_STRENGTH, ENC_CODINGMODE, ENC_MCBLK_SIZE,
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index a5b7a32..80381fa 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -441,7 +441,7 @@ static const char *const direct_pred_list[] =
 static const char *const direct_pred_list_text[] =
   { N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") };
 
-static const int const framepacking_list[] =
+static const int framepacking_list[] =
   { -1, 0, 1, 2, 3, 4, 5 };
 static const char *const framepacking_list_text[] =
   { "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") };
diff --git a/modules/control/dbus/dbus_root.c b/modules/control/dbus/dbus_root.c
index 0bf06a8..32bed17 100644
--- a/modules/control/dbus/dbus_root.c
+++ b/modules/control/dbus/dbus_root.c
@@ -43,13 +43,13 @@
 #include "dbus_root.h"
 #include "dbus_common.h"
 
-static const char const ppsz_supported_uri_schemes[][9] = {
+static const char ppsz_supported_uri_schemes[][9] = {
     "file", "http", "https", "rtsp", "realrtsp", "pnm", "ftp", "mtp", "smb",
     "mms", "mmsu", "mmst", "mmsh", "unsv", "itpc", "icyx", "rtmp", "rtp",
     "dccp", "dvd", "vcd", "vcdx"
 };
 
-static const char const ppsz_supported_mime_types[][26] = {
+static const char ppsz_supported_mime_types[][26] = {
     "audio/mpeg", "audio/x-mpeg",
     "video/mpeg", "video/x-mpeg",
     "video/mpeg-system", "video/x-mpeg-system",
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 67e226a..a901c69 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2597,7 +2597,7 @@ static void Ogg_ReadSkeletonBones( demux_t *p_demux, ogg_packet *p_oggpacket )
 
 /* Unpacks the 7bit variable encoding used in skeleton indexes */
 unsigned const char * Read7BitsVariableLE( unsigned const char *p_begin,
-                                           unsigned const char const *p_end,
+                                           unsigned const char *p_end,
                                            uint64_t *pi_value )
 {
     int i_shift = 0;
@@ -2642,7 +2642,7 @@ static void Ogg_ReadSkeletonIndex( demux_t *p_demux, ogg_packet *p_oggpacket )
     p_stream->p_skel->i_indexfirstnum = GetQWLE( &p_oggpacket->packet[24] );
     p_stream->p_skel->i_indexlastnum = GetQWLE( &p_oggpacket->packet[32] );
     unsigned const char *p_fwdbyte = &p_oggpacket->packet[42];
-    unsigned const char const *p_boundary = p_oggpacket->packet + p_oggpacket->bytes;
+    unsigned const char *p_boundary = p_oggpacket->packet + p_oggpacket->bytes;
     uint64_t i_offset = 0;
     uint64_t i_time = 0;
     uint64_t i_keypoints_found = 0;
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index a65168d..c2c24a2 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -175,7 +175,7 @@ struct demux_sys_t
 
 
 unsigned const char * Read7BitsVariableLE( unsigned const char *,
-                                           unsigned const char const *,
+                                           unsigned const char *,
                                            uint64_t * );
 bool Ogg_GetBoundsUsingSkeletonIndex( logical_stream_t *p_stream, int64_t i_time,
                                       int64_t *pi_lower, int64_t *pi_upper );
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index d6015ba..291c4bb 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -49,7 +49,7 @@ static const luaL_Reg p_reg[] =
  * Extensions capabilities
  * Note: #define and ppsz_capabilities must be in sync
  */
-static const char const caps[][20] = {
+static const char caps[][20] = {
 #define EXT_HAS_MENU          (1 << 0)   ///< Hook: menu
     "menu",
 #define EXT_TRIGGER_ONLY      (1 << 1)   ///< Hook: trigger. Not activable
diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index cbd4e67..5a1a981 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -51,7 +51,7 @@
 /**
  * The possible extensions for subtitle files we support
  */
-static const char const sub_exts[][6] = {
+static const char sub_exts[][6] = {
     "idx", "sub",  "srt",
     "ssa", "ass",  "smi",
     "utf", "utf8", "utf-8",