Issue #1454 - init strtok_r() state ptrs, older gcc whinges.

diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c
index c6f1006ef1b11a5c4a8cfc866b5ba533adea39c5..d8616f9a02788cc1f09b30d064bffe1ca8ddb143 100644 (file)
--- a/src/epggrab/module/xmltv.c
+++ b/src/epggrab/module/xmltv.c
@@ -634,7 +634,7 @@ static void _xmltv_load_grabbers ( void )
   size_t i, p, n;
   char *outbuf;
   char name[1000];
-  char *tmp, *tmp2, *path;
+  char *tmp, *tmp2 = NULL, *path;
 
   /* Load data */
   outlen = spawn_and_store_stdout(XMLTV_FIND, NULL, &outbuf);

diff --git a/src/filebundle.c b/src/filebundle.c
index 15a4d4c5f32da2b03e6485c8c1d364c26a868b3a..a7db77b046dce4343a2a2eadafad99b72a8b38e5 100644 (file)
--- a/src/filebundle.c
+++ b/src/filebundle.c
@@ -214,7 +214,7 @@ fb_dir *fb_opendir ( const char *path )
 
     /* Bundle */
 #if ENABLE_BUNDLE
-    char *tmp1, *tmp2, *tmp3;
+    char *tmp1, *tmp2, *tmp3 = NULL;
     *tmp1 = strdup(path);
     *tmp2 = strtok_r(tmp1, "/", &tmp3);
     filebundle_entry_t *fb = filebundle_root;

diff --git a/src/spawn.c b/src/spawn.c
index 0cee4bdd5b15e78b0f221ae829e84c34fa29f51b..534e5af7e4a6e1cb49555520ee0361120977eb69 100644 (file)
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -53,7 +53,7 @@ find_exec ( const char *name, char *out, size_t len )
 {
   int ret = 0;
   char bin[512];
-  char *path, *tmp, *tmp2;
+  char *path, *tmp, *tmp2 = NULL;
   DIR *dir;
   struct dirent *de;
   struct stat st;

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index e27935afc9019f8672c27d438aa5e61229fed2ac..efb79c80f7ab02b8e3e1e9559e5bd613a76fa101 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -352,7 +352,7 @@ extjs_channels_update(htsmsg_t *in)
 
     if((s = htsmsg_get_str(c, "epggrabsrc")) != NULL) {
       char *tmp = strdup(s);
-      char *sptr, *sptr2;
+      char *sptr = NULL, *sptr2 = NULL;
       char *modecid  = strtok_r(tmp, ",", &sptr);
       char *modid, *ecid;
       epggrab_module_t *mod;