multimedia/minidlna/patches/002-mark_all_instances_of_magic_container_s_as_const.patch

   1 From d297624e533d6d4274c750e3769749c3d7f121c8 Mon Sep 17 00:00:00 2001
   2 From: Daniel Kamil Kozar <dkk089@gmail.com>
   3 Date: Sat, 15 Dec 2018 16:34:30 +0100
   4 Subject: [PATCH] Mark all instances of magic_container_s as const
   5
   6 ---
   7  containers.c | 38 +++++++++++++++++++-------------------
   8  containers.h |  6 +++---
   9  scanner.c    |  2 +-
  10  upnpsoap.c   |  6 +++---
  11  4 files changed, 26 insertions(+), 26 deletions(-)
  12
  13 --- a/containers.c
  14 +++ b/containers.c
  15 @@ -25,23 +25,23 @@
  16
  17  #define NINETY_DAYS "7776000"
  18
  19 -const char *music_id = MUSIC_ID;
  20 -const char *music_all_id = MUSIC_ALL_ID;
  21 -const char *music_genre_id = MUSIC_GENRE_ID;
  22 -const char *music_artist_id = MUSIC_ARTIST_ID;
  23 -const char *music_album_id = MUSIC_ALBUM_ID;
  24 -const char *music_plist_id = MUSIC_PLIST_ID;
  25 -const char *music_dir_id = MUSIC_DIR_ID;
  26 -const char *video_id = VIDEO_ID;
  27 -const char *video_all_id = VIDEO_ALL_ID;
  28 -const char *video_dir_id = VIDEO_DIR_ID;
  29 -const char *image_id = IMAGE_ID;
  30 -const char *image_all_id = IMAGE_ALL_ID;
  31 -const char *image_date_id = IMAGE_DATE_ID;
  32 -const char *image_camera_id = IMAGE_CAMERA_ID;
  33 -const char *image_dir_id = IMAGE_DIR_ID;
  34 +static const char *music_id = MUSIC_ID;
  35 +static const char *music_all_id = MUSIC_ALL_ID;
  36 +static const char *music_genre_id = MUSIC_GENRE_ID;
  37 +static const char *music_artist_id = MUSIC_ARTIST_ID;
  38 +static const char *music_album_id = MUSIC_ALBUM_ID;
  39 +static const char *music_plist_id = MUSIC_PLIST_ID;
  40 +static const char *music_dir_id = MUSIC_DIR_ID;
  41 +static const char *video_id = VIDEO_ID;
  42 +static const char *video_all_id = VIDEO_ALL_ID;
  43 +static const char *video_dir_id = VIDEO_DIR_ID;
  44 +static const char *image_id = IMAGE_ID;
  45 +static const char *image_all_id = IMAGE_ALL_ID;
  46 +static const char *image_date_id = IMAGE_DATE_ID;
  47 +static const char *image_camera_id = IMAGE_CAMERA_ID;
  48 +static const char *image_dir_id = IMAGE_DIR_ID;
  49
  50 -struct magic_container_s magic_containers[] =
  51 +const struct magic_container_s magic_containers[] =
  52  {
  53         /* Alternate root container */
  54         { NULL,
  55 @@ -124,7 +124,7 @@ struct magic_container_s magic_container
  56         { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0 }
  57  };
  58
  59 -struct magic_container_s *
  60 +const struct magic_container_s *
  61  in_magic_container(const char *id, int flags, const char **real_id)
  62  {
  63         size_t len;
  64 @@ -154,7 +154,7 @@ in_magic_container(const char *id, int f
  65         return NULL;
  66  }
  67
  68 -struct magic_container_s *
  69 +const struct magic_container_s *
  70  check_magic_container(const char *id, int flags)
  71  {
  72         int i;
  73 --- a/containers.h
  74 +++ b/containers.h
  75 @@ -30,7 +30,7 @@ struct magic_container_s {
  76         int required_flags;
  77  };
  78
  79 -extern struct magic_container_s magic_containers[];
  80 +extern const struct magic_container_s magic_containers[];
  81
  82 -struct magic_container_s *in_magic_container(const char *id, int flags, const char **real_id);
  83 -struct magic_container_s *check_magic_container(const char *id, int flags);
  84 +const struct magic_container_s *in_magic_container(const char *id, int flags, const char **real_id);
  85 +const struct magic_container_s *check_magic_container(const char *id, int flags);
  86 --- a/scanner.c
  87 +++ b/scanner.c
  88 @@ -587,7 +587,7 @@ CreateDatabase(void)
  89         }
  90         for( i=0; magic_containers[i].objectid_match; i++ )
  91         {
  92 -               struct magic_container_s *magic = &magic_containers[i];
  93 +               const struct magic_container_s *magic = &magic_containers[i];
  94                 if (!magic->name)
  95                         continue;
  96                 if( sql_get_int_field(db, "SELECT 1 from OBJECTS where OBJECT_ID = '%s'", magic->objectid_match) == 0 )
  97 --- a/upnpsoap.c
  98 +++ b/upnpsoap.c
  99 @@ -800,7 +800,7 @@ add_res(char *size, char *duration, char
 100  }
 101
 102  static int
 103 -get_child_count(const char *object, struct magic_container_s *magic)
 104 +get_child_count(const char *object, const struct magic_container_s *magic)
 105  {
 106         int ret;
 107
 108 @@ -1292,7 +1292,7 @@ BrowseContentDirectory(struct upnphttp *
 109                         "<Result>"
 110                         "&lt;DIDL-Lite"
 111                         CONTENT_DIRECTORY_SCHEMAS;
 112 -       struct magic_container_s *magic;
 113 +       const struct magic_container_s *magic;
 114         char *zErrMsg = NULL;
 115         char *sql, *ptr;
 116         struct Response args;
 117 @@ -1807,7 +1807,7 @@ SearchContentDirectory(struct upnphttp *
 118                         "<Result>"
 119                         "&lt;DIDL-Lite"
 120                         CONTENT_DIRECTORY_SCHEMAS;
 121 -       struct magic_container_s *magic;
 122 +       const struct magic_container_s *magic;
 123         char *zErrMsg = NULL;
 124         char *sql, *ptr;
 125         struct Response args;