From: Mike Brady <mikebrady@eircom.net>
Date: Fri, 23 Nov 2018 16:10:18 +0000 (+0000)
Subject: Remove some unnecessary test code from the debug messaging.
X-Git-Tag: 3.3RC0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd8fbc1eca09eb0210ebaa643025eca600034b2;p=thirdparty%2Fshairport-sync.git

Remove some unnecessary test code from the debug messaging.
---

diff --git a/common.c b/common.c
index 9b1a5538..bf062edd 100644
--- a/common.c
+++ b/common.c
@@ -100,8 +100,7 @@ void resetFreeUDPPort() {
 	UDPPortIndex = 0;
 }
 
-uint16_t nextFreeUDPPort() {
-	
+uint16_t nextFreeUDPPort() {	
 	if (UDPPortIndex == 0)
 		UDPPortIndex = config.udp_port_base;
 	else if (UDPPortIndex == (config.udp_port_base + config.udp_port_range - 1))
@@ -190,10 +189,6 @@ void debug(int level, const char *format, ...) {
   va_start(args, format);
   vsnprintf(s, sizeof(s), format, args);
   va_end(args);
-  int currentState;
-  pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &currentState);
-  if (currentState == PTHREAD_CANCEL_ENABLE)
-    daemon_log(LOG_DEBUG, "Warning -- cancellation is enabled before logging");
   if ((config.debugger_show_elapsed_time) && (config.debugger_show_relative_time))
     daemon_log(LOG_DEBUG, "|% 20.9f|% 20.9f|%s", tss, tsl, s);
   else if (config.debugger_show_relative_time)
@@ -202,9 +197,6 @@ void debug(int level, const char *format, ...) {
     daemon_log(LOG_DEBUG, "% 20.9f|%s", tss, s);
   else
     daemon_log(LOG_DEBUG, "%s", s);
-  pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &currentState);
-  if (currentState == PTHREAD_CANCEL_ENABLE)
-    daemon_log(LOG_DEBUG, "Warning -- cancellation is enabled after logging");
   pthread_setcancelstate(oldState, NULL);
 }