From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 5 Mar 2014 16:22:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/pr/329'
X-Git-Tag: v4.1~2248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae2ba4b6cd7398d71c2f5ef424a428e4b24082f7;p=thirdparty%2Ftvheadend.git

Merge remote-tracking branch 'origin/pr/329'

Conflicts:
	src/tvheadend.h
---

ae2ba4b6cd7398d71c2f5ef424a428e4b24082f7
diff --cc src/channels.c
index b3aea46f6,bddce831e..5105a5225
--- a/src/channels.c
+++ b/src/channels.c
@@@ -575,11 -576,9 +579,12 @@@ channel_delete ( channel_t *ch, int del
    epggrab_channel_rem(ch);
    epg_channel_unlink(ch);
  
 +  /* HTSP */
 +  htsp_channel_delete(ch);
 +
    /* Settings */
-   hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
+   if (delconf)
+     hts_settings_remove("channel/%s", idnode_uuid_as_str(&ch->ch_id));
  
    /* Free memory */
    RB_REMOVE(&channels, ch, ch_link);
diff --cc src/tvheadend.h
index a52185100,b8c68f866..d4af5fc90
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@@ -604,8 -607,14 +608,13 @@@ int rmtree ( const char *path )
  
  char *regexp_escape ( const char *str );
  
+ #define SKEL_DECLARE(name, type) type *name;
+ #define SKEL_ALLOC(name) do { if (!name) name = calloc(1, sizeof(*name)); } while (0)
+ #define SKEL_USED(name) do { name = NULL; } while (0)
+ #define SKEL_FREE(name) do { free(name); name = NULL; } while (0)
+ 
 -#ifdef PLATFORM_LINUX
  /* glibc wrapper */
 -#if !__GLIBC_PREREQ(2,8)
 +#if ! ENABLE_QSORT_R
  void
  qsort_r(void *base, size_t nmemb, size_t size,
         int (*cmp)(const void *, const void *, void *), void *aux);