From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 18 Apr 2016 06:24:04 +0000 (+0200)
Subject: settings: fix build without zlib support, fixes #3730
X-Git-Tag: v4.2.1~628
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dd9e19e591788233a8e7efec8e0fa42dad1c941;p=thirdparty%2Ftvheadend.git

settings: fix build without zlib support, fixes #3730
---

diff --git a/src/settings.c b/src/settings.c
index 22a52152c..89a3ee561 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -135,8 +135,6 @@ hts_settings_save(htsmsg_t *record, const char *pathfmt, ...)
   htsbuf_queue_t hq;
   htsbuf_data_t *hd;
   int ok, r, pack;
-  void *msgdata;
-  size_t msglen;
 
   if(settingspath == NULL)
     return;
@@ -182,7 +180,8 @@ hts_settings_save(htsmsg_t *record, const char *pathfmt, ...)
     htsbuf_queue_flush(&hq);
   } else {
 #if ENABLE_ZLIB
-    msgdata = NULL;
+    void *msgdata = NULL;
+    size_t msglen;
     r = htsmsg_binary_serialize(record, &msgdata, &msglen, 2*1024*1024);
     if (!r && msglen >= 4) {
       r = tvh_gzip_deflate_fd_header(fd, msgdata + 4, msglen - 4, 3);
@@ -220,10 +219,8 @@ hts_settings_load_one(const char *filename)
 {
   ssize_t n, size;
   char *mem;
-  uint8_t *unpacked;
   fb_file *fp;
   htsmsg_t *r = NULL;
-  uint32_t orig;
 
   /* Open */
   if (!(fp = fb_open(filename, 1, 0))) return NULL;
@@ -238,9 +235,9 @@ hts_settings_load_one(const char *filename)
   if(n == size) {
     if (size > 12 && memcmp(mem, "\xff\xffGZIP00", 8) == 0) {
 #if ENABLE_ZLIB
-      orig = (mem[8] << 24) | (mem[9] << 16) | (mem[10] << 8) | mem[11];
+      uint32_t orig = (mem[8] << 24) | (mem[9] << 16) | (mem[10] << 8) | mem[11];
       if (orig > 0) {
-        unpacked = tvh_gzip_inflate((uint8_t *)mem + 12, size - 12, orig);
+        uint8_t *unpacked = tvh_gzip_inflate((uint8_t *)mem + 12, size - 12, orig);
         if (unpacked) {
           r = htsmsg_binary_deserialize(unpacked, orig, NULL);
           free(unpacked);