summaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-11-06 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-11-06 18:00:00 +0100
commit812ab9018c7be7feb901eface4c6431b483ca9ec (patch)
tree2032a68f87246ee2453c54cf9fc969f1f1be2da0 /config.h
parent99e3c093f404b55683a90e38bbe74e1f51c35316 (diff)
downloadvdr-patch-lnbsharing-812ab9018c7be7feb901eface4c6431b483ca9ec.tar.gz
vdr-patch-lnbsharing-812ab9018c7be7feb901eface4c6431b483ca9ec.tar.bz2
Version 1.3.36vdr-1.3.36
- Fixed a NULL pointer access with the cUnbufferedFile when a replay session runs 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). - Fixed missing '&' in the SetAreas() example in PLUGINS.html (reported by Sascha Volkenandt). - Fixed a memory leak in cString::operator=() (reported by Sascha Volkenandt). - Updated the Dutch OSD texts (thanks to Maarten Wisse). - cReadLine now dynamically allocates its buffer, so that it can handle lines of any length. - Changed cConfig::Load() to use cReadLine instead of a fixed buffer (thanks to Andreas Mair for reporting a problem with extremely long summary fields in timers). - cSVDRP now dynamically allocates its command buffer in order to handle commands of any length. The MAXPARSEBUFFER macro is now obsolete and has been removed. If a plugin has used that macro, it should either define a buffer size of its own, or use cReadLine when reading files. - Fixed a race condition in the SPU decoder (thanks to Marco Schlüßler). - The EPG scan no longer disturbs players that have also set live PIDs (reported by Stefan Huelswitt). - Fixed setting the help key display in the Recordings menu in case of several layers of subdirectories. - Removed EPG bugfix #0, because it removed actually important data.
Diffstat (limited to 'config.h')
-rw-r--r--config.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/config.h b/config.h
index 9b17ad4..ef84cf9 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.231 2005/10/08 08:48:38 kls Exp $
+ * $Id: config.h 1.234 2005/11/04 15:55:05 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,8 +19,8 @@
#include "i18n.h"
#include "tools.h"
-#define VDRVERSION "1.3.35"
-#define VDRVERSNUM 10335 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.3.36"
+#define VDRVERSNUM 10336 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
#define MAXLIFETIME 99
@@ -102,23 +102,24 @@ public:
isyslog("loading %s", fileName);
FILE *f = fopen(fileName, "r");
if (f) {
+ char *s;
int line = 0;
- char buffer[MAXPARSEBUFFER];
+ cReadLine ReadLine;
result = true;
- while (fgets(buffer, sizeof(buffer), f) > 0) {
+ while ((s = ReadLine.Read(f)) != NULL) {
line++;
if (allowComments) {
- char *p = strchr(buffer, '#');
+ char *p = strchr(s, '#');
if (p)
*p = 0;
}
- stripspace(buffer);
- if (!isempty(buffer)) {
+ stripspace(s);
+ if (!isempty(s)) {
T *l = new T;
- if (l->Parse(buffer))
+ if (l->Parse(s))
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;