move htsstr.h to tvh_string.h

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 8add06be6158d3536687f0491e71a3963c4bdd32..047614f736f233f388ae537cec7cf11906980b01 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -25,8 +25,6 @@
 #include <sys/stat.h>
 #include <libgen.h> /* basename */
 
-#include "htsstr.h"
-
 #include "tvheadend.h"
 #include "streaming.h"
 #include "tcp.h"

diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c
index ce6fb4f44de4e66b1810b66255f9a479e6dd7da8..f8169cf032c1dc1155a63747ec9d1f5e134cec38 100644 (file)
--- a/src/epggrab/module/xmltv.c
+++ b/src/epggrab/module/xmltv.c
@@ -34,7 +34,6 @@
 #include "channels.h"
 #include "spawn.h"
 #include "file.h"
-#include "htsstr.h"
 #include "string_list.h"
 
 #include "lang_str.h"

diff --git a/src/htsstr.c b/src/htsstr.c
index 41a5bb47e0ddacc2fcaefe9afcd35db240406cfd..4cf62063130b980e42338def999f4e0f4e061cad 100644 (file)
--- a/src/htsstr.c
+++ b/src/htsstr.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "htsstr.h"
+#include "tvh_string.h"
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 

diff --git a/src/htsstr.h b/src/htsstr.h
deleted file mode 100644 (file)
index 48f9160..0000000
--- a/src/htsstr.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  String helper functions
- *  Copyright (C) 2008 Andreas Öman
- *  Copyright (C) 2008 Mattias Wadman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef HTSSTR_H__
-#define HTSSTR_H__
-
-char *hts_strndup(const char *str, size_t len);
-
-char *htsstr_unescape(char *str);
-
-char *htsstr_unescape_to(const char *src, char *dst, size_t dstlen);
-
-const char *htsstr_escape_find(const char *src, size_t upto_index);
-
-char **htsstr_argsplit(const char *str);
-
-void htsstr_argsplit_free(char **argv);
-
-typedef struct {
-  const char *id;
-  const char *(*getval)(const char *id, const char *fmt, const void *aux, char *tmp, size_t tmplen);
-} htsstr_substitute_t;
-
-const char *
-htsstr_substitute_find(const char *src, int first);
-
-char *
-htsstr_substitute(const char *src, char *dst, size_t dstlen,
-                  int first, htsstr_substitute_t *sub, const void *aux,
-                  char *tmp, size_t tmplen);
-
-#endif /* HTSSTR_H__ */

diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index afdf0882059d57da34a1f9823ed91159b6fff3be..a967ede2f4348ed40b5506432651429e6f35f1ef 100644 (file)
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -21,7 +21,6 @@
 #include "tvhpoll.h"
 #include "tcp.h"
 #include "settings.h"
-#include "htsstr.h"
 #include "channels.h"
 #include "packet.h"
 #include "config.h"

diff --git a/src/lang_str.h b/src/lang_str.h
index 015216e7a77d2b689e0458fcf869d37a0be63662..3bf1a3285643a950a9ef542e881bbb134917161c 100644 (file)
--- a/src/lang_str.h
+++ b/src/lang_str.h
@@ -20,6 +20,7 @@
 #define __TVH_LANG_STR_H__
 
 #include "redblack.h"
+#include "tvh_string.h"
 #include "htsmsg.h"
 
 typedef struct lang_str_ele
@@ -80,8 +81,6 @@ lang_str_t     *lang_str_deserialize
 int             lang_str_compare ( const lang_str_t *ls1, const lang_str_t *ls2 );
 
 /* Is string empty? */
-static inline int strempty(const char *c)
-  { return c == NULL || *c == '\0'; }
 static inline int lang_str_empty(lang_str_t* str)
   { return strempty(lang_str_get(str, NULL)); }
 

diff --git a/src/tvh_string.h b/src/tvh_string.h
index 13ef2f308e06059d717e91a7533ca20d2f56af90..ecf09fdbf46aaa2403d36c705fc1532e4cee608b 100644 (file)
--- a/src/tvh_string.h
+++ b/src/tvh_string.h
@@ -16,11 +16,39 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TVHEADEND_STRINGS_H
-#define TVHEADEND_STRINGS_H
+#ifndef TVHEADEND_STRING_H
+#define TVHEADEND_STRING_H
 
 #include "build.h"
 
+static inline int strempty(const char *c)
+  { return c == NULL || *c == '\0'; }
+
+char *hts_strndup(const char *str, size_t len);
+
+char *htsstr_unescape(char *str);
+
+char *htsstr_unescape_to(const char *src, char *dst, size_t dstlen);
+
+const char *htsstr_escape_find(const char *src, size_t upto_index);
+
+char **htsstr_argsplit(const char *str);
+
+void htsstr_argsplit_free(char **argv);
+
+typedef struct {
+  const char *id;
+  const char *(*getval)(const char *id, const char *fmt, const void *aux, char *tmp, size_t tmplen);
+} htsstr_substitute_t;
+
+const char *
+htsstr_substitute_find(const char *src, int first);
+
+char *
+htsstr_substitute(const char *src, char *dst, size_t dstlen,
+                  int first, htsstr_substitute_t *sub, const void *aux,
+                  char *tmp, size_t tmplen);
+
 static inline size_t tvh_strlen(const char *s)
 {
   return (s) ? strlen(s) : 0;
@@ -99,4 +127,4 @@ int put_utf8(char *out, int c);
 
 char *utf8_lowercase_inplace(char *s);
 
-#endif /* TVHEADEND_STRINGS_H */
+#endif /* TVHEADEND_STRING_H */