summaryrefslogtreecommitdiffstats
path: root/src/daemon/cmdline.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-02-23 02:27:19 +0000
committerLennart Poettering <lennart@poettering.net>2006-02-23 02:27:19 +0000
commit4a64b0d1167e980d81b798d813f35209895f0674 (patch)
tree52688c3035eadaea2970cb3d07c64b0676c154b8 /src/daemon/cmdline.c
parentcb59817b4a2e1f640bd9279d0c7863e7a09c1fa6 (diff)
change pa_log() and friends to not require a trailing \n on all logged strings
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/cmdline.c')
-rw-r--r--src/daemon/cmdline.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index b6ab1283..a6b95a81 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -191,14 +191,14 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
case ARG_DAEMONIZE:
case 'D':
if ((conf->daemonize = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --daemonize expects boolean argument\n");
+ pa_log(__FILE__": --daemonize expects boolean argument");
goto fail;
}
break;
case ARG_FAIL:
if ((conf->fail = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --fail expects boolean argument\n");
+ pa_log(__FILE__": --fail expects boolean argument");
goto fail;
}
break;
@@ -208,7 +208,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
if (optarg) {
if (pa_daemon_conf_set_log_level(conf, optarg) < 0) {
- pa_log(__FILE__": --log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error).\n");
+ pa_log(__FILE__": --log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error).");
goto fail;
}
} else {
@@ -220,21 +220,21 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
case ARG_HIGH_PRIORITY:
if ((conf->high_priority = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --high-priority expects boolean argument\n");
+ pa_log(__FILE__": --high-priority expects boolean argument");
goto fail;
}
break;
case ARG_DISALLOW_MODULE_LOADING:
if ((conf->disallow_module_loading = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --disallow-module-loading expects boolean argument\n");
+ pa_log(__FILE__": --disallow-module-loading expects boolean argument");
goto fail;
}
break;
case ARG_USE_PID_FILE:
if ((conf->use_pid_file = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --use-pid-file expects boolean argument\n");
+ pa_log(__FILE__": --use-pid-file expects boolean argument");
goto fail;
}
break;
@@ -252,7 +252,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
case ARG_LOG_TARGET:
if (pa_daemon_conf_set_log_target(conf, optarg) < 0) {
- pa_log(__FILE__": Invalid log target: use either 'syslog', 'stderr' or 'auto'.\n");
+ pa_log(__FILE__": Invalid log target: use either 'syslog', 'stderr' or 'auto'.");
goto fail;
}
break;
@@ -271,7 +271,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
case ARG_RESAMPLE_METHOD:
if (pa_daemon_conf_set_resample_method(conf, optarg) < 0) {
- pa_log(__FILE__": Invalid resample method '%s'.\n", optarg);
+ pa_log(__FILE__": Invalid resample method '%s'.", optarg);
goto fail;
}
break;