frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed formatting and removed some superfluous break statements in vdr.c's command line option switch

This commit is contained in:
Klaus Schmidinger 2013-02-08 10:48:43 +01:00
parent c9e5b13789
commit 9d2367d967
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -7582,3 +7582,5 @@ Video Disk Recorder Revision History
create. However, a particular device may still be unable to create an arbitrary create. However, a particular device may still be unable to create an arbitrary
number of pixmaps, due to limited resources. So it's always a good idea to use number of pixmaps, due to limited resources. So it's always a good idea to use
as few pixmaps as possible. as few pixmaps as possible.
- Fixed formatting and removed some superfluous break statements in vdr.c's command
line option switch.

46
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 2.47 2013/02/07 13:53:01 kls Exp $ * $Id: vdr.c 2.48 2013/02/08 10:47:02 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -267,7 +267,8 @@ int main(int argc, char *argv[])
break; break;
case 'c': ConfigDirectory = optarg; case 'c': ConfigDirectory = optarg;
break; break;
case 'd': DaemonMode = true; break; case 'd': DaemonMode = true;
break;
case 'D': if (isnumber(optarg)) { case 'D': if (isnumber(optarg)) {
int n = atoi(optarg); int n = atoi(optarg);
if (0 <= n && n < MAXDEVICES) { if (0 <= n && n < MAXDEVICES) {
@ -277,7 +278,6 @@ int main(int argc, char *argv[])
} }
fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg); fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg);
return 2; return 2;
break;
case 'd' | 0x100: { case 'd' | 0x100: {
char *s = optarg; char *s = optarg;
int n = strtol(s, &s, 10); int n = strtol(s, &s, 10);
@ -341,31 +341,30 @@ int main(int argc, char *argv[])
fprintf(stderr, "vdr: invalid instance id: %s\n", optarg); fprintf(stderr, "vdr: invalid instance id: %s\n", optarg);
return 2; return 2;
case 'l': { case 'l': {
char *p = strchr(optarg, '.'); char *p = strchr(optarg, '.');
if (p) if (p)
*p = 0; *p = 0;
if (isnumber(optarg)) { if (isnumber(optarg)) {
int l = atoi(optarg); int l = atoi(optarg);
if (0 <= l && l <= 3) { if (0 <= l && l <= 3) {
SysLogLevel = l; SysLogLevel = l;
if (!p) if (!p)
break; break;
if (isnumber(p + 1)) { if (isnumber(p + 1)) {
int l = atoi(p + 1); int l = atoi(p + 1);
if (0 <= l && l <= 7) { if (0 <= l && l <= 7) {
int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
SysLogTarget = targets[l]; SysLogTarget = targets[l];
break; break;
} }
} }
} }
} }
if (p) if (p)
*p = '.'; *p = '.';
fprintf(stderr, "vdr: invalid log level: %s\n", optarg); fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
return 2; return 2;
} }
break;
case 'L': if (access(optarg, R_OK | X_OK) == 0) case 'L': if (access(optarg, R_OK | X_OK) == 0)
PluginManager.SetDirectory(optarg); PluginManager.SetDirectory(optarg);
else { else {
@ -440,7 +439,6 @@ int main(int argc, char *argv[])
} }
fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg); fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
return 2; return 2;
break;
default: return 2; default: return 2;
} }
} }