From 9d2367d967a46d93b6c6121861dde7af404ec73b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 8 Feb 2013 10:48:43 +0100 Subject: [PATCH] Fixed formatting and removed some superfluous break statements in vdr.c's command line option switch --- HISTORY | 2 ++ vdr.c | 46 ++++++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/HISTORY b/HISTORY index a74342d8..43eca18c 100644 --- a/HISTORY +++ b/HISTORY @@ -7582,3 +7582,5 @@ Video Disk Recorder Revision History 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 as few pixmaps as possible. +- Fixed formatting and removed some superfluous break statements in vdr.c's command + line option switch. diff --git a/vdr.c b/vdr.c index af5a7cfe..8bb208b2 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * 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 @@ -267,7 +267,8 @@ int main(int argc, char *argv[]) break; case 'c': ConfigDirectory = optarg; break; - case 'd': DaemonMode = true; break; + case 'd': DaemonMode = true; + break; case 'D': if (isnumber(optarg)) { int n = atoi(optarg); 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); return 2; - break; case 'd' | 0x100: { char *s = optarg; 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); return 2; case 'l': { - char *p = strchr(optarg, '.'); - if (p) - *p = 0; - if (isnumber(optarg)) { - int l = atoi(optarg); - if (0 <= l && l <= 3) { - SysLogLevel = l; - if (!p) - break; - if (isnumber(p + 1)) { - int l = atoi(p + 1); - if (0 <= l && l <= 7) { - int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; - SysLogTarget = targets[l]; - break; - } - } - } - } + char *p = strchr(optarg, '.'); + if (p) + *p = 0; + if (isnumber(optarg)) { + int l = atoi(optarg); + if (0 <= l && l <= 3) { + SysLogLevel = l; + if (!p) + break; + if (isnumber(p + 1)) { + int l = atoi(p + 1); + if (0 <= l && l <= 7) { + int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; + SysLogTarget = targets[l]; + break; + } + } + } + } if (p) *p = '.'; fprintf(stderr, "vdr: invalid log level: %s\n", optarg); return 2; } - break; case 'L': if (access(optarg, R_OK | X_OK) == 0) PluginManager.SetDirectory(optarg); else { @@ -440,7 +439,6 @@ int main(int argc, char *argv[]) } fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg); return 2; - break; default: return 2; } }