From 99f5fef0ea5671d41fb7b737fbc3e4236542a757 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 Jun 2014 23:56:05 +0200
Subject: Add more const

While I'm not very fond of "const", it's important for declarations
(it decides whether a symbol is emitted in a read-only or read/write
section). Fix all these cases, so we have writeable global data only
when we really need.
---
 demux/demux_lavf.c     | 6 +++---
 demux/demux_mkv.c      | 6 +++---
 demux/demux_playlist.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'demux')

diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 23a89386b7..4fb1ee3cb3 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -111,7 +111,7 @@ static const struct format_hack format_hacks[] = {
     {0}
 };
 
-static const char *format_blacklist[] = {
+static const char *const format_blacklist[] = {
     "tty",      // Useless non-sense, sometimes breaks MLP2 subreader.c fallback
     0
 };
@@ -184,7 +184,7 @@ static void list_formats(struct demuxer *demuxer)
         MP_INFO(demuxer, "%15s : %s\n", fmt->name, fmt->long_name);
 }
 
-static char *remove_prefix(char *s, const char **prefixes)
+static char *remove_prefix(char *s, const char *const *prefixes)
 {
     for (int n = 0; prefixes[n]; n++) {
         int len = strlen(prefixes[n]);
@@ -194,7 +194,7 @@ static char *remove_prefix(char *s, const char **prefixes)
     return s;
 }
 
-static const char *prefixes[] =
+static const char *const prefixes[] =
     {"ffmpeg://", "lavf://", "avdevice://", "av://", NULL};
 
 static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 4b08ce2a13..462a93aaa8 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1289,7 +1289,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track)
     return 0;
 }
 
-static struct mkv_audio_tag {
+static const struct mkv_audio_tag {
     char *id;   bool prefix;   uint32_t formattag;
     bool parse;
 } mkv_audio_tags[] = {
@@ -1376,7 +1376,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
     } else {
         sh_a->wf = talloc_zero(sh_a, MP_WAVEFORMATEX);
         for (int i = 0; ; i++) {
-            struct mkv_audio_tag *t = mkv_audio_tags + i;
+            const struct mkv_audio_tag *t = mkv_audio_tags + i;
             if (t->id == NULL)
                 goto error;
             if (t->prefix) {
@@ -1606,7 +1606,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
     return 1;
 }
 
-static const char *mkv_sub_tag[][2] = {
+static const char *const mkv_sub_tag[][2] = {
     { MKV_S_VOBSUB,     "dvd_subtitle" },
     { MKV_S_TEXTSSA,    "ass"},
     { MKV_S_TEXTASS,    "ass"},
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index af24d4906f..b2344b5583 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -154,11 +154,11 @@ static int parse_txt(struct pl_parser *p)
 struct pl_format {
     const char *name;
     int (*parse)(struct pl_parser *p);
-    const char **mime_types;
+    const char *const *mime_types;
 };
 
 #define MIME_TYPES(...) \
-    .mime_types = (const char*[]){__VA_ARGS__, NULL}
+    .mime_types = (const char*const[]){__VA_ARGS__, NULL}
 
 static const struct pl_format formats[] = {
     {"m3u", parse_m3u,
@@ -170,7 +170,7 @@ static const struct pl_format formats[] = {
     {"txt", parse_txt},
 };
 
-static bool check_mimetype(struct stream *s, const char **list)
+static bool check_mimetype(struct stream *s, const char *const *list)
 {
     if (s->mime_type) {
         for (int n = 0; list && list[n]; n++) {
-- 
cgit v1.2.3