From dfd6b740688713977432954a869832111eff1466 Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Thu, 20 Nov 2014 18:36:57 +0000
Subject: [PATCH] (sync with my branch) remove threadpool_size in global
 config, added warnings for <threadpool> and <no-yp> as well as updated
 warning for <source-password>

svn path=/icecast/trunk/icecast/; revision=19338
---
 src/cfgfile.c | 8 +++-----
 src/cfgfile.h | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/cfgfile.c b/src/cfgfile.c
index 9b8eb40c..be8b2f7f 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -413,7 +413,6 @@ static void _set_defaults(ice_config_t *configuration)
     configuration->client_limit = CONFIG_DEFAULT_CLIENT_LIMIT;
     configuration->source_limit = CONFIG_DEFAULT_SOURCE_LIMIT;
     configuration->queue_size_limit = CONFIG_DEFAULT_QUEUE_SIZE_LIMIT;
-    configuration->threadpool_size = CONFIG_DEFAULT_THREADPOOL_SIZE;
     configuration->client_timeout = CONFIG_DEFAULT_CLIENT_TIMEOUT;
     configuration->header_timeout = CONFIG_DEFAULT_HEADER_TIMEOUT;
     configuration->source_timeout = CONFIG_DEFAULT_SOURCE_TIMEOUT;
@@ -478,7 +477,7 @@ static void _parse_root(xmlDocPtr doc, xmlNodePtr node,
             _parse_authentication(doc, node->xmlChildrenNode, configuration);
         } else if (xmlStrcmp (node->name, XMLSTR("source-password")) == 0) {
             /* TODO: This is the backwards-compatibility location */
-            ICECAST_LOG_WARN("<source-password> defined outside <authentication>. This is deprecated.");
+            ICECAST_LOG_WARN("<source-password> defined outside <authentication>. This is deprecated and will be removed in version 2.5.");
             if (configuration->source_password) xmlFree(configuration->source_password);
             configuration->source_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
         } else if (xmlStrcmp (node->name, XMLSTR("icelogin")) == 0) {
@@ -608,9 +607,7 @@ static void _parse_limits(xmlDocPtr doc, xmlNodePtr node,
             configuration->queue_size_limit = atoi(tmp);
             if (tmp) xmlFree(tmp);
         } else if (xmlStrcmp (node->name, XMLSTR("threadpool")) == 0) {
-            tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-            configuration->threadpool_size = atoi(tmp);
-            if (tmp) xmlFree(tmp);
+            ICECAST_LOG_WARN("<threadpool> deprecated and will be removed in version 2.5.");
         } else if (xmlStrcmp (node->name, XMLSTR("client-timeout")) == 0) {
             tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
             configuration->client_timeout = atoi(tmp);
@@ -727,6 +724,7 @@ static void _parse_mount(xmlDocPtr doc, xmlNodePtr node,
             if(tmp) xmlFree(tmp);
         }
         else if (xmlStrcmp (node->name, XMLSTR("no-yp")) == 0) {
+            ICECAST_LOG_WARN("<no-yp> defined. Please use <public>. This is deprecated and will be removed in version 2.5.");
             tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
             mount->yp_public = atoi(tmp) == 0 ? -1 : 0;
             if(tmp) xmlFree(tmp);
diff --git a/src/cfgfile.h b/src/cfgfile.h
index 91ff906f..26366c72 100644
--- a/src/cfgfile.h
+++ b/src/cfgfile.h
@@ -148,7 +148,6 @@ typedef struct ice_config_tag {
     int client_limit;
     int source_limit;
     unsigned int queue_size_limit;
-    int threadpool_size;
     unsigned int burst_size;
     int client_timeout;
     int header_timeout;