mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed handling DiSEqC codes
This commit is contained in:
parent
69aa850d1e
commit
5cfd39dfca
@ -1700,6 +1700,7 @@ Udo Richter <udo_richter@gmx.de>
|
|||||||
"TITLE" or "EPISODE"
|
"TITLE" or "EPISODE"
|
||||||
for a patch to "Made updating the editing marks during replay react faster in case
|
for a patch to "Made updating the editing marks during replay react faster in case
|
||||||
the marks file has just been written"
|
the marks file has just been written"
|
||||||
|
for suggesting a fix for a bug in handling DiSEqC codes
|
||||||
|
|
||||||
Sven Kreiensen <svenk@kammer.uni-hannover.de>
|
Sven Kreiensen <svenk@kammer.uni-hannover.de>
|
||||||
for his help in keeping 'channels.conf.terr' up to date
|
for his help in keeping 'channels.conf.terr' up to date
|
||||||
@ -2740,3 +2741,6 @@ Jonas Diemer <jonasdiemer@googlemail.com>
|
|||||||
|
|
||||||
Jerome Lacarriere <lacarriere.j@gmail.com>
|
Jerome Lacarriere <lacarriere.j@gmail.com>
|
||||||
for increasing MAXCAIDS to 12
|
for increasing MAXCAIDS to 12
|
||||||
|
|
||||||
|
Mark Hawes <MARK.HAWES@au.fujitsu.com>
|
||||||
|
for reporting a bug in handling DiSEqC codes
|
||||||
|
2
HISTORY
2
HISTORY
@ -6662,3 +6662,5 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed the return value of the svdrpsend.pl script in case of an error (thanks to
|
- Fixed the return value of the svdrpsend.pl script in case of an error (thanks to
|
||||||
Jonas Diemer).
|
Jonas Diemer).
|
||||||
- Increased MAXCAIDS to 12 (thanks to Jerome Lacarriere).
|
- Increased MAXCAIDS to 12 (thanks to Jerome Lacarriere).
|
||||||
|
- Fixed handling DiSEqC codes (thanks to Mark Hawes for reporting the bug, and
|
||||||
|
Udo Richter for suggesting the fix).
|
||||||
|
6
diseqc.c
6
diseqc.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: diseqc.c 2.4 2011/05/22 10:36:12 kls Exp $
|
* $Id: diseqc.c 2.5 2011/08/06 10:32:18 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "diseqc.h"
|
#include "diseqc.h"
|
||||||
@ -95,13 +95,13 @@ const char *cDiseqc::Codes(const char *s) const
|
|||||||
if (e) {
|
if (e) {
|
||||||
int NumCodes = 0;
|
int NumCodes = 0;
|
||||||
const char *t = s;
|
const char *t = s;
|
||||||
char *p;
|
|
||||||
while (t < e) {
|
while (t < e) {
|
||||||
if (NumCodes < MaxDiseqcCodes) {
|
if (NumCodes < MaxDiseqcCodes) {
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
char *p;
|
||||||
int n = strtol(t, &p, 16);
|
int n = strtol(t, &p, 16);
|
||||||
if (!errno && p != t && 0 <= n && n <= 255) {
|
if (!errno && p != t && 0 <= n && n <= 255) {
|
||||||
if (parsing) {
|
if (!parsing) {
|
||||||
codes[NumCodes++] = uchar(n);
|
codes[NumCodes++] = uchar(n);
|
||||||
numCodes = NumCodes;
|
numCodes = NumCodes;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user