string list: some tiny cleanups

diff --git a/src/epg.h b/src/epg.h
index da2de66a4a0e20930f23c033fe368e75843933b5..e78e03206937b41a9efa2d2e8d0b4039fcece459 100644 (file)
--- a/src/epg.h
+++ b/src/epg.h
@@ -22,6 +22,7 @@
 #include "tvhregex.h"
 #include "settings.h"
 #include "lang_str.h"
+#include "string_list.h"
 #include "access.h"
 
 /*
@@ -31,7 +32,6 @@ struct channel;
 struct channel_tag;
 struct dvr_entry;
 struct epggrab_module;
-struct string_list;
 
 /*
  * Map/List types
@@ -523,10 +523,10 @@ struct epg_broadcast
   lang_str_t                *description;      ///< Description
   htsmsg_t                  *credits;          ///< Cast/Credits map of name -> role type (actor, presenter, director, etc).
   lang_str_t                *credits_cached;   ///< Comma separated cast (for regex searching in GUI/autorec). Kept in sync with cast_map
-  struct string_list        *category;         ///< Extra categories (typically from xmltv) such as "Western" or "Sumo Wrestling".
+  string_list_t             *category;         ///< Extra categories (typically from xmltv) such as "Western" or "Sumo Wrestling".
                                                ///< These extra categories are often a superset of our EN 300 468 DVB genre.
                                                ///< Used with drop-down lists in the GUI.
-  struct string_list        *keyword;          ///< Extra keywords (typically from xmltv) such as "Wild West" or "Unicorn".
+  string_list_t             *keyword;          ///< Extra keywords (typically from xmltv) such as "Wild West" or "Unicorn".
   lang_str_t                *keyword_cached;   ///< Cached CSV version for regex searches.
   RB_ENTRY(epg_broadcast)    sched_link;       ///< Schedule link
   LIST_ENTRY(epg_broadcast)  ep_link;          ///< Episode link
@@ -598,13 +598,13 @@ int epg_broadcast_set_description
   ( epg_broadcast_t *b, const lang_str_t *str, uint32_t *changed )
   __attribute__((warn_unused_result));
 int epg_broadcast_set_credits
-( epg_broadcast_t *b, const htsmsg_t* msg, uint32_t *changed )
+( epg_broadcast_t *b, const htsmsg_t *msg, uint32_t *changed )
   __attribute__((warn_unused_result));
 int epg_broadcast_set_category
-( epg_broadcast_t *b, const struct string_list* msg, uint32_t *changed )
+( epg_broadcast_t *b, const string_list_t *msg, uint32_t *changed )
   __attribute__((warn_unused_result));
 int epg_broadcast_set_keyword
-( epg_broadcast_t *b, const struct string_list* msg, uint32_t *changed )
+( epg_broadcast_t *b, const string_list_t *msg, uint32_t *changed )
   __attribute__((warn_unused_result));
 int epg_broadcast_set_serieslink
   ( epg_broadcast_t *b, epg_serieslink_t *sl, uint32_t *changed )

diff --git a/src/string_list.c b/src/string_list.c
index acada232b22337cf5cad341ec7f946365a2de40c..f003ab750076556e19547a0732168804b47040f8 100644 (file)
--- a/src/string_list.c
+++ b/src/string_list.c
@@ -36,7 +36,6 @@ string_list_create(void)
   return ret;
 }
 
-
 void
 string_list_destroy(string_list_t *l)
 {

diff --git a/src/string_list.h b/src/string_list.h
index b2205b380581628200cc3ca3d267fb88ec67a2fe..1d6c474039fbfb1b65c859b8305a3fb4f3a329f9 100644 (file)
--- a/src/string_list.h
+++ b/src/string_list.h
@@ -38,11 +38,12 @@ struct htsmsg;
 /// string_list_insert(l, "str2");
 /// string_list_destroy(l);
 
-typedef struct string_list_item
-{
-  char* id;
+struct string_list_item {
+  char *id;
   RB_ENTRY(string_list_item) h_link;
-} string_list_item_t;
+};
+
+typedef struct string_list_item string_list_item_t;
 typedef RB_HEAD(string_list, string_list_item) string_list_t;
 
 /// Initialize the memory used by the list.
@@ -60,7 +61,7 @@ void string_list_insert(string_list_t *l, const char *id);
 /// @return NULL if empty.
 struct htsmsg *string_list_to_htsmsg(const string_list_t *l)
     __attribute__((warn_unused_result));
-string_list_t * htsmsg_to_string_list(const struct htsmsg *m)
+string_list_t *htsmsg_to_string_list(const struct htsmsg *m)
     __attribute__((warn_unused_result));
 void string_list_serialize(const string_list_t *l, struct htsmsg *m, const char *f);
 string_list_t *string_list_deserialize(const struct htsmsg *m, const char *f)