From 52f17c043b6cc124b5745c4b8b32eea4b8c4efab Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 4 Nov 2005 14:22:04 +0100 Subject: [PATCH] Removed '\n' from several syslog() calls --- CONTRIBUTORS | 1 + HISTORY | 1 + ci.c | 4 ++-- config.h | 4 ++-- dvbspu.c | 4 ++-- eit.c | 6 +++--- i18n.c | 4 ++-- osd.c | 4 ++-- recording.c | 4 ++-- themes.c | 4 ++-- tools.c | 4 ++-- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 14eaa14d..26d54428 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -792,6 +792,7 @@ Sascha Volkenandt for pointing out that the SVDRP command DELR deleted recordings that are currently being written to by a timer for fixing a crash in cConfig::Load() when compiling on the PPC + for reporting '\n' in an esyslog() call in osd.c Malcolm Caldwell for modifying LOF handling to allow for C-band reception diff --git a/HISTORY b/HISTORY index f5431de0..448c6649 100644 --- a/HISTORY +++ b/HISTORY @@ -3919,3 +3919,4 @@ Video Disk Recorder Revision History all the way until the end of the recording (thanks to Joachim Wilke). - A menu is no longer automatically closed when a replay ends (reported by Marko Mäkelä). +- Removed '\n' from several syslog() calls (reported by Sascha Volkenandt). diff --git a/ci.c b/ci.c index 4e63fde4..3fe321e6 100644 --- a/ci.c +++ b/ci.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.c 1.38 2005/10/30 13:04:10 kls Exp $ + * $Id: ci.c 1.39 2005/11/04 14:18:52 kls Exp $ */ #include "ci.h" @@ -367,7 +367,7 @@ int cCiTransportConnection::RecvTPDU(void) } } else if (FATALERRNO) { - esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m\n", slot, tcid); + esyslog("ERROR: CAM: Read failed: slot %d, tcid %d - %m", slot, tcid); Init(-1, slot, tcid); } return lastResponse; diff --git a/config.h b/config.h index 9e1d78ac..d7022901 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.232 2005/11/04 13:17:42 kls Exp $ + * $Id: config.h 1.233 2005/11/04 14:18:59 kls Exp $ */ #ifndef __CONFIG_H @@ -118,7 +118,7 @@ public: if (l->Parse(buffer)) Add(l); else { - esyslog("ERROR: error in %s, line %d\n", fileName, line); + esyslog("ERROR: error in %s, line %d", fileName, line); delete l; result = false; break; diff --git a/dvbspu.c b/dvbspu.c index d9730c57..f9a1df41 100644 --- a/dvbspu.c +++ b/dvbspu.c @@ -8,7 +8,7 @@ * * parts of this file are derived from the OMS program. * - * $Id: dvbspu.c 1.15 2005/08/07 12:06:32 kls Exp $ + * $Id: dvbspu.c 1.16 2005/11/04 14:19:07 kls Exp $ */ #include @@ -501,7 +501,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts) break; default: - esyslog("invalid sequence in control header (%.2x)\n", + esyslog("invalid sequence in control header (%.2x)", spu[i]); assert(0); i++; diff --git a/eit.c b/eit.c index 0145baf5..4a643685 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 1.111 2005/09/04 11:36:30 kls Exp $ + * $Id: eit.c 1.112 2005/11/04 14:19:16 kls Exp $ */ #include "eit.h" @@ -271,8 +271,8 @@ cTDT::cTDT(const u_char *Data) if (diff > 2) { mutex.Lock(); if (abs(diff - lastDiff) < 3) { - isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim); - isyslog("Local Time = %s (%ld)\n", *TimeToString(sattim), sattim); + isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim); + isyslog("Local Time = %s (%ld)", *TimeToString(sattim), sattim); if (stime(&sattim) < 0) esyslog("ERROR while setting system time: %m"); } diff --git a/i18n.c b/i18n.c index f21a320e..73bc8bdd 100644 --- a/i18n.c +++ b/i18n.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: i18n.c 1.218 2005/10/30 13:37:57 kls Exp $ + * $Id: i18n.c 1.219 2005/11/04 14:19:25 kls Exp $ * * Translations provided by: * @@ -5547,7 +5547,7 @@ const char *I18nTranslate(const char *s, const char *Plugin) } p = Phrases; } - esyslog("%s%sno translation found for '%s' in language %d (%s)\n", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]); + esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]); } const char *p = strchr(s, '$'); return p ? p + 1 : s; diff --git a/osd.c b/osd.c index 11b461b3..45e4176a 100644 --- a/osd.c +++ b/osd.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 1.63 2005/10/02 08:47:13 kls Exp $ + * $Id: osd.c 1.64 2005/11/04 14:19:31 kls Exp $ */ #include "osd.h" @@ -649,7 +649,7 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas) } } if (Result != oeOk) - esyslog("ERROR: cOsd::SetAreas returned %d\n", Result); + esyslog("ERROR: cOsd::SetAreas returned %d", Result); return Result; } diff --git a/recording.c b/recording.c index 517aea0c..7a81d776 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.123 2005/11/04 13:17:20 kls Exp $ + * $Id: recording.c 1.124 2005/11/04 14:19:44 kls Exp $ */ #include "recording.h" @@ -1328,7 +1328,7 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset) return SetOffset(Number + 1); // file exists and has non zero size, let's try next suffix else { // zero size file, remove it - dsyslog ("cFileName::SetOffset: removing zero-sized file %s\n", fileName); + dsyslog ("cFileName::SetOffset: removing zero-sized file %s", fileName); unlink (fileName); } } diff --git a/themes.c b/themes.c index 69af61ff..45fc1725 100644 --- a/themes.c +++ b/themes.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: themes.c 1.5 2004/12/24 17:00:41 kls Exp $ + * $Id: themes.c 1.6 2005/11/04 14:19:54 kls Exp $ */ #include "themes.h" @@ -152,7 +152,7 @@ bool cTheme::Load(const char *FileName, bool OnlyDescriptions) } } if (!result) - esyslog("ERROR: error in %s, line %d%s%s\n", FileName, line, error ? ": " : "", error ? error : ""); + esyslog("ERROR: error in %s, line %d%s%s", FileName, line, error ? ": " : "", error ? error : ""); fclose(f); } else diff --git a/tools.c b/tools.c index aa20e6ed..24d8f275 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 1.100 2005/10/31 12:56:15 kls Exp $ + * $Id: tools.c 1.101 2005/11/04 14:20:04 kls Exp $ */ #include "tools.h" @@ -463,7 +463,7 @@ bool SpinUpDisk(const char *FileName) gettimeofday(&tp2, NULL); double seconds = (((long long)tp2.tv_sec * 1000000 + tp2.tv_usec) - ((long long)tp1.tv_sec * 1000000 + tp1.tv_usec)) / 1000000.0; if (seconds > 0.5) - dsyslog("SpinUpDisk took %.2f seconds\n", seconds); + dsyslog("SpinUpDisk took %.2f seconds", seconds); free(buf); return true; }