From fc3aa5949ff8366f15a92d93b8f7df0adf1c5f94 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 5 Mar 2013 19:49:21 +0100 Subject: [PATCH] sectionsd: be more tolerant about adjtime() failure --- src/eitd/sectionsd.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 1bd8c512a..370147477 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1342,11 +1342,13 @@ void CTimeThread::setSystemTime(time_t tim) tv.tv_sec = timediff / 1000000LL; tv.tv_usec = timediff % 1000000LL; if (adjtime(&tv, &oldd)) - perror("adjtime"); - xprintf("difference is < 120s, using adjtime(%d, %d). oldd(%d, %d)\n", - (int)tv.tv_sec, (int)tv.tv_usec, (int)oldd.tv_sec, (int)oldd.tv_usec); - timediff = 0; - return; + xprintf("adjtime(%d, %d) failed: %m\n", (int)tv.tv_sec, (int)tv.tv_usec); + else { + xprintf("difference is < 120s, using adjtime(%d, %d). oldd(%d, %d)\n", + (int)tv.tv_sec, (int)tv.tv_usec, (int)oldd.tv_sec, (int)oldd.tv_usec); + timediff = 0; + return; + } } tv.tv_sec = tim;