[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-595-gcd8130f

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  cd8130fcbb66cf0ff3265d514f806a284338320b (commit)
      from  82dd4747d7b54ffc0938d968f36008fe3e1f935e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cd8130fcbb66cf0ff3265d514f806a284338320b
Author: GetAway <get...@t-...>
Date:   Wed Jun 3 16:29:59 2015 +0200

    sectionsd: change versioning; small fix for better legibility of code
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index 893fc20..916088b 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -1,6 +1,4 @@
 //
-//  $Id: sectionsd.cpp,v 1.346 2013/03/20 22:40:00 GetAway Exp $
-//
 //    sectionsd.cpp (network daemon for SI-sections)
 //    (dbox-II-project)
 //
@@ -85,8 +83,7 @@
 #include "SIsections.hpp"
 #include "SIlanguage.hpp"
 
-//#include "timerdclient.h"
-//#include "../timermanager.h"
+#define SECTIONSD_VERSION "1.347"
 
 // 60 Minuten Zyklus...
 #define TIME_EIT_SCHEDULED_PAUSE 60 * 60
@@ -239,6 +236,8 @@ static DMX dmxPPT(0x00, 256);
 unsigned int privatePid=0;
 #endif
 
+static int sectionsd_stop = 0;
+
 inline void readLockServices(void)
 {
 	pthread_rwlock_rdlock(&servicesLock);
@@ -2621,7 +2620,7 @@ static void commandDumpStatusInformation(int connfd, char* /*data*/, const unsig
 	char tbuf[26];
 
 	snprintf(stati, MAX_SIZE_STATI,
-		"$Id: sectionsd.cpp,v 1.346 2013/03/20 22:40:00 GetAway Exp $\n"
+		"$Id: sectionsd.cpp, v%s\n"
 		"%sCurrent time: %s"
 		"Hours to cache: %ld\n"
 		"Hours to cache extended text: %ld\n"
@@ -2637,6 +2636,7 @@ static void commandDumpStatusInformation(int connfd, char* /*data*/, const unsig
 		"handed out by malloc: %d (%dkb)\n"
 		"Total bytes memory allocated with `sbrk' by malloc,\n"
 		"in bytes: %d (%dkb)\n",
+		SECTIONSD_VERSION,
 #ifdef ENABLE_FREESATEPG
 		"FreeSat enabled\n"
 #else
@@ -8228,7 +8228,7 @@ static void *houseKeepingThread(void *)
 		char servicename[MAX_SIZE_SERVICENAME];
 		dprintf("housekeeping-thread started.\n");
 
-		for (;;)
+		while (!sectionsd_stop)
 		{
 			if (count == META_HOUSEKEEPING) {
 				dprintf("meta housekeeping - deleting all transponders, services, bouquets.\n");
@@ -8617,7 +8617,7 @@ int main(int argc, char **argv)
 	
 	struct sched_param parm;
 
-	printf("$Id: sectionsd.cpp,v 1.346 2013/03/20 22:40:00 GetAway Exp $\n");
+	printf("$Id: sectionsd.cpp, v%s\n", SECTIONSD_VERSION);
 #ifdef ENABLE_FREESATEPG
 	printf("[sectionsd] FreeSat enabled\n");
 #endif

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


-- 
Tuxbox-GIT: apps