summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY2
-rw-r--r--channels.c4
-rw-r--r--ci.c6
-rw-r--r--device.c4
-rw-r--r--diseqc.c6
-rw-r--r--dvbosd.c4
-rw-r--r--epg.c4
-rw-r--r--osd.c4
-rw-r--r--ringbuffer.c6
-rw-r--r--svdrp.c12
10 files changed, 27 insertions, 25 deletions
diff --git a/HISTORY b/HISTORY
index db866824..1ee135d3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4038,3 +4038,5 @@ Video Disk Recorder Revision History
+ Grabbing to files is limited to the directory given in the the command
line option '-g'. By default grabbing to files is not allowed any more.
- Updated the Greek OSD texts (thanks to Dimitrios Dimitrakos).
+- Changed all "illegal" to "invalid" in error messages (there's nothing "illegal"
+ in VDR ;-).
diff --git a/channels.c b/channels.c
index 3bb42f5d..a4f84491 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 1.46 2005/09/11 11:17:19 kls Exp $
+ * $Id: channels.c 1.47 2005/12/30 15:41:24 kls Exp $
*/
#include "channels.h"
@@ -586,7 +586,7 @@ static const char *ParseParameter(const char *s, int &Value, const tChannelParam
return p;
}
}
- esyslog("ERROR: illegal value for parameter '%c'", *(s - 1));
+ esyslog("ERROR: invalid value for parameter '%c'", *(s - 1));
return NULL;
}
diff --git a/ci.c b/ci.c
index 163ad970..f2c4240f 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.40 2005/11/26 13:36:51 kls Exp $
+ * $Id: ci.c 1.41 2005/12/30 15:41:38 kls Exp $
*/
#include "ci.h"
@@ -185,7 +185,7 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
size = 6;
}
else
- esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+ esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
break;
case T_DATA_LAST:
case T_DATA_MORE:
@@ -198,7 +198,7 @@ cTPDU::cTPDU(uint8_t Slot, uint8_t Tcid, uint8_t Tag, int Length, const uint8_t
size = Length + (p - data);
}
else
- esyslog("ERROR: illegal data length for TPDU tag 0x%02X: %d", Tag, Length);
+ esyslog("ERROR: invalid data length for TPDU tag 0x%02X: %d", Tag, Length);
break;
default:
esyslog("ERROR: unknown TPDU tag: 0x%02X", Tag);
diff --git a/device.c b/device.c
index cd8a1402..8e910f1d 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 1.114 2005/12/30 13:48:29 kls Exp $
+ * $Id: device.c 1.115 2005/12/30 15:41:42 kls Exp $
*/
#include "device.h"
@@ -222,7 +222,7 @@ int cDevice::NextCardIndex(int n)
esyslog("ERROR: nextCardIndex too big (%d)", nextCardIndex);
}
else if (n < 0)
- esyslog("ERROR: illegal value in IncCardIndex(%d)", n);
+ esyslog("ERROR: invalid value in IncCardIndex(%d)", n);
return nextCardIndex;
}
diff --git a/diseqc.c b/diseqc.c
index bae59960..7dc308b6 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: diseqc.c 1.4 2005/01/09 13:05:11 kls Exp $
+ * $Id: diseqc.c 1.5 2005/12/30 15:41:48 kls Exp $
*/
#include "diseqc.h"
@@ -65,7 +65,7 @@ char *cDiseqc::Wait(char *s)
cCondWait::SleepMs(n);
return p;
}
- esyslog("ERROR: illegal value for wait time in '%s'", s - 1);
+ esyslog("ERROR: invalid value for wait time in '%s'", s - 1);
return NULL;
}
@@ -85,7 +85,7 @@ char *cDiseqc::Codes(char *s)
t = skipspace(p);
}
else {
- esyslog("ERROR: illegal code at '%s'", t);
+ esyslog("ERROR: invalid code at '%s'", t);
return NULL;
}
}
diff --git a/dvbosd.c b/dvbosd.c
index da58d99c..76afecbf 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbosd.c 1.28 2005/12/18 12:56:55 kls Exp $
+ * $Id: dvbosd.c 1.29 2005/12/30 15:41:54 kls Exp $
*/
#include "dvbosd.h"
@@ -39,7 +39,7 @@ cDvbOsd::cDvbOsd(int Left, int Top, int OsdDev)
osdDev = OsdDev;
shown = false;
if (osdDev < 0)
- esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
+ esyslog("ERROR: invalid OSD device handle (%d)!", osdDev);
else {
osdMem = MAXOSDMEMORY;
#ifdef OSD_CAP_MEMSIZE
diff --git a/epg.c b/epg.c
index 5cab8415..7b2cb0ea 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
*
- * $Id: epg.c 1.46 2005/12/27 10:26:38 kls Exp $
+ * $Id: epg.c 1.47 2005/12/30 15:41:59 kls Exp $
*/
#include "epg.h"
@@ -834,7 +834,7 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
}
}
else {
- esyslog("ERROR: illegal channel ID: %s", s);
+ esyslog("ERROR: invalid channel ID: %s", s);
return false;
}
}
diff --git a/osd.c b/osd.c
index 45e4176a..2ff9f2b2 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.64 2005/11/04 14:19:31 kls Exp $
+ * $Id: osd.c 1.65 2005/12/30 15:42:04 kls Exp $
*/
#include "osd.h"
@@ -145,7 +145,7 @@ void cBitmap::SetSize(int Width, int Height)
esyslog("ERROR: can't allocate bitmap!");
}
else
- esyslog("ERROR: illegal bitmap parameters (%d, %d)!", width, height);
+ esyslog("ERROR: invalid bitmap parameters (%d, %d)!", width, height);
}
bool cBitmap::Contains(int x, int y) const
diff --git a/ringbuffer.c b/ringbuffer.c
index 167511a8..e00a524f 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -7,7 +7,7 @@
* Parts of this file were inspired by the 'ringbuffy.c' from the
* LinuxDVB driver (see linuxtv.org).
*
- * $Id: ringbuffer.c 1.22 2005/12/10 10:55:26 kls Exp $
+ * $Id: ringbuffer.c 1.23 2005/12/30 15:42:08 kls Exp $
*/
#include "ringbuffer.h"
@@ -165,10 +165,10 @@ cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, cons
Clear();
}
else
- esyslog("ERROR: illegal margin for ring buffer (%d > %d)", Margin, Size / 2);
+ esyslog("ERROR: invalid margin for ring buffer (%d > %d)", Margin, Size / 2);
}
else
- esyslog("ERROR: illegal size for ring buffer (%d)", Size);
+ esyslog("ERROR: invalid size for ring buffer (%d)", Size);
#ifdef DEBUGRINGBUFFERS
lastHead = head;
lastTail = tail;
diff --git a/svdrp.c b/svdrp.c
index 7d84ed4d..086b01cb 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
- * $Id: svdrp.c 1.88 2005/12/30 15:11:16 kls Exp $
+ * $Id: svdrp.c 1.89 2005/12/30 15:42:29 kls Exp $
*/
#include "svdrp.h"
@@ -695,7 +695,7 @@ void cSVDRP::CmdGRAB(const char *Option)
if (isnumber(p))
Quality = atoi(p);
else {
- Reply(501, "Illegal quality \"%s\"", p);
+ Reply(501, "Invalid quality \"%s\"", p);
return;
}
}
@@ -705,14 +705,14 @@ void cSVDRP::CmdGRAB(const char *Option)
if (isnumber(p))
SizeX = atoi(p);
else {
- Reply(501, "Illegal sizex \"%s\"", p);
+ Reply(501, "Invalid sizex \"%s\"", p);
return;
}
if ((p = strtok_r(NULL, delim, &strtok_next)) != NULL) {
if (isnumber(p))
SizeY = atoi(p);
else {
- Reply(501, "Illegal sizey \"%s\"", p);
+ Reply(501, "Invalid sizey \"%s\"", p);
return;
}
}
@@ -738,7 +738,7 @@ void cSVDRP::CmdGRAB(const char *Option)
*slash = '/';
if (!r) {
LOG_ERROR_STR(FileName);
- Reply(501, "Illegal file name \"%s\"", FileName);
+ Reply(501, "Invalid file name \"%s\"", FileName);
free(s);
return;
}
@@ -746,7 +746,7 @@ void cSVDRP::CmdGRAB(const char *Option)
FileName = RealFileName;
free(s);
if (strncmp(FileName, grabImageDir, strlen(grabImageDir)) != 0) {
- Reply(501, "Illegal file name \"%s\"", FileName);
+ Reply(501, "Invalid file name \"%s\"", FileName);
return;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 09:12:45 +0000