50 lines
1.5 KiB
Plaintext
50 lines
1.5 KiB
Plaintext
From 6d40c726148f69837b5a599dc54f9cdc7f13c1e3 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Tue, 18 Dec 2018 14:43:08 +0100
|
|
Subject: gcc2 fixes
|
|
|
|
|
|
diff --git a/src/slave.c b/src/slave.c
|
|
index bd9eecc..522f403 100644
|
|
--- a/src/slave.c
|
|
+++ b/src/slave.c
|
|
@@ -669,6 +669,7 @@ static int update_from_master(ice_config_t *config)
|
|
if (!strlen(buf))
|
|
continue;
|
|
ICECAST_LOG_DEBUG("read %d from master \"%s\"", count++, buf);
|
|
+ {
|
|
xmlURIPtr parsed_uri = xmlParseURI(buf);
|
|
if (parsed_uri == NULL) {
|
|
ICECAST_LOG_DEBUG("Error while parsing line from master. Ignoring line.");
|
|
@@ -700,6 +701,7 @@ static int update_from_master(ice_config_t *config)
|
|
new_relays = r;
|
|
}
|
|
xmlFreeURI(parsed_uri);
|
|
+ }
|
|
}
|
|
sock_close (mastersock);
|
|
|
|
diff --git a/src/source.c b/src/source.c
|
|
index e7bf39f..909440e 100644
|
|
--- a/src/source.c
|
|
+++ b/src/source.c
|
|
@@ -1474,6 +1474,7 @@ void source_recheck_mounts (int update_all)
|
|
if (mount->mounttype != MOUNT_TYPE_NORMAL)
|
|
continue;
|
|
|
|
+ {
|
|
source_t *source = source_find_mount (mount->mountname);
|
|
|
|
if (source)
|
|
@@ -1509,6 +1510,7 @@ void source_recheck_mounts (int update_all)
|
|
strdup (mount->fallback_mount), THREAD_DETACHED);
|
|
}
|
|
}
|
|
+ }
|
|
}
|
|
avl_tree_unlock (global.source_tree);
|
|
config_release_config();
|
|
--
|
|
2.19.1
|
|
|