mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-31 11:08:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

change pa_log() and friends to not require a trailing \n on all logged strings

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-23 02:27:19 +00:00
parent cb59817b4a
commit 4a64b0d116
74 changed files with 558 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/caps.c
View file

@ -45,7 +45,7 @@ void pa_drop_root(void) {
if (uid == 0 || geteuid() != 0)
return;
pa_log_info(__FILE__": dropping root rights.\n");
pa_log_info(__FILE__": dropping root rights.");
#if defined(HAVE_SETRESUID)
setresuid(uid, uid, uid);
@ -83,7 +83,7 @@ int pa_limit_caps(void) {
if (cap_set_proc(caps) < 0)
goto fail;
pa_log_info(__FILE__": dropped capabilities successfully.\n");
pa_log_info(__FILE__": dropped capabilities successfully.");
r = 0;
@ -104,7 +104,7 @@ int pa_drop_caps(void) {
cap_clear(caps);
if (cap_set_proc(caps) < 0) {
pa_log(__FILE__": failed to drop capabilities: %s\n", strerror(errno));
pa_log(__FILE__": failed to drop capabilities: %s", strerror(errno));
goto fail;
}

16
src/daemon/cmdline.c
View file

@ -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;

2
src/daemon/cpulimit.c
View file

@ -169,7 +169,7 @@ int pa_cpu_limit_init(pa_mainloop_api *m) {
/* Prepare the main loop pipe */
if (pipe(the_pipe) < 0) {
pa_log(__FILE__": pipe() failed: %s\n", strerror(errno));
pa_log(__FILE__": pipe() failed: %s", strerror(errno));
return -1;
}

8
src/daemon/daemon-conf.c
View file

@ -160,7 +160,7 @@ static int parse_log_target(const char *filename, unsigned line, const char *lva
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_target(c, rvalue) < 0) {
pa_log(__FILE__": [%s:%u] Invalid log target '%s'.\n", filename, line, rvalue);
pa_log(__FILE__": [%s:%u] Invalid log target '%s'.", filename, line, rvalue);
return -1;
}
@ -172,7 +172,7 @@ static int parse_log_level(const char *filename, unsigned line, const char *lval
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_level(c, rvalue) < 0) {
pa_log(__FILE__": [%s:%u] Invalid log level '%s'.\n", filename, line, rvalue);
pa_log(__FILE__": [%s:%u] Invalid log level '%s'.", filename, line, rvalue);
return -1;
}
@ -184,7 +184,7 @@ static int parse_resample_method(const char *filename, unsigned line, const char
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_resample_method(c, rvalue) < 0) {
pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.\n", filename, line, rvalue);
pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.", filename, line, rvalue);
return -1;
}
@ -236,7 +236,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file);
if (!f && errno != ENOENT) {
pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s\n", filename, strerror(errno));
pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, strerror(errno));
goto finish;
}

45
src/daemon/main.c
View file

@ -94,7 +94,7 @@ static void message_cb(pa_mainloop_api*a, pa_defer_event *e, void *userdata) {
#endif
static void signal_callback(pa_mainloop_api*m, PA_GCC_UNUSED pa_signal_event *e, int sig, void *userdata) {
pa_log_info(__FILE__": Got signal %s.\n", pa_strsignal(sig));
pa_log_info(__FILE__": Got signal %s.", pa_strsignal(sig));
switch (sig) {
#ifdef SIGUSR1
@ -112,7 +112,7 @@ static void signal_callback(pa_mainloop_api*m, PA_GCC_UNUSED pa_signal_event *e,
#ifdef SIGHUP
case SIGHUP: {
char *c = pa_full_status_string(userdata);
pa_log_notice(c);
pa_log_notice("%s", c);
pa_xfree(c);
return;
}
@ -121,7 +121,7 @@ static void signal_callback(pa_mainloop_api*m, PA_GCC_UNUSED pa_signal_event *e,
case SIGINT:
case SIGTERM:
default:
pa_log_info(__FILE__": Exiting.\n");
pa_log_info(__FILE__": Exiting.");
m->quit(m, 1);
break;
}
@ -161,7 +161,7 @@ int main(int argc, char *argv[]) {
suid_root = getuid() != 0 && geteuid() == 0;
if (suid_root && (pa_uid_in_group("realtime", &gid) <= 0 || gid >= 1000)) {
pa_log_warn(__FILE__": WARNING: called SUID root, but not in group 'realtime'.\n");
pa_log_warn(__FILE__": WARNING: called SUID root, but not in group 'realtime'.");
pa_drop_root();
}
#else
@ -191,7 +191,7 @@ int main(int argc, char *argv[]) {
goto finish;
if (pa_cmdline_parse(conf, argc, argv, &d) < 0) {
pa_log(__FILE__": failed to parse command line.\n");
pa_log(__FILE__": failed to parse command line.");
goto finish;
}
@ -237,9 +237,9 @@ int main(int argc, char *argv[]) {
pid_t pid;
if (pa_pid_file_check_running(&pid) < 0) {
pa_log_info(__FILE__": daemon not running\n");
pa_log_info(__FILE__": daemon not running");
} else {
pa_log_info(__FILE__": daemon running as PID %u\n", pid);
pa_log_info(__FILE__": daemon running as PID %u", pid);
retval = 0;
}
@ -249,7 +249,7 @@ int main(int argc, char *argv[]) {
case PA_CMD_KILL:
if (pa_pid_file_kill(SIGINT, NULL) < 0)
pa_log(__FILE__": failed to kill daemon.\n");
pa_log(__FILE__": failed to kill daemon.");
else
retval = 0;
@ -264,18 +264,18 @@ int main(int argc, char *argv[]) {
int tty_fd;
if (pa_stdio_acquire() < 0) {
pa_log(__FILE__": failed to acquire stdio.\n");
pa_log(__FILE__": failed to acquire stdio.");
goto finish;
}
#ifdef HAVE_FORK
if (pipe(daemon_pipe) < 0) {
pa_log(__FILE__": failed to create pipe.\n");
pa_log(__FILE__": failed to create pipe.");
goto finish;
}
if ((child = fork()) < 0) {
pa_log(__FILE__": fork() failed: %s\n", strerror(errno));
pa_log(__FILE__": fork() failed: %s", strerror(errno));
goto finish;
}
@ -286,14 +286,14 @@ int main(int argc, char *argv[]) {
daemon_pipe[1] = -1;
if (pa_loop_read(daemon_pipe[0], &retval, sizeof(retval)) != sizeof(retval)) {
pa_log(__FILE__": read() failed: %s\n", strerror(errno));
pa_log(__FILE__": read() failed: %s", strerror(errno));
retval = 1;
}
if (retval)
pa_log(__FILE__": daemon startup failed.\n");
pa_log(__FILE__": daemon startup failed.");
else
pa_log_info(__FILE__": daemon startup successful.\n");
pa_log_info(__FILE__": daemon startup successful.");
goto finish;
}
@ -346,7 +346,7 @@ int main(int argc, char *argv[]) {
if (conf->use_pid_file) {
if (pa_pid_file_create() < 0) {
pa_log(__FILE__": pa_pid_file_create() failed.\n");
pa_log(__FILE__": pa_pid_file_create() failed.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
@ -396,23 +396,22 @@ int main(int argc, char *argv[]) {
assert(r == 0);
buf = pa_strbuf_new();
assert(buf);
if (conf->default_script_file)
r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail);
if (r >= 0)
r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
pa_log(s = pa_strbuf_tostring_free(buf));
pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
pa_xfree(s);
if (r < 0 && conf->fail) {
pa_log(__FILE__": failed to initialize daemon.\n");
pa_log(__FILE__": failed to initialize daemon.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
#endif
} else if (!c->modules || pa_idxset_size(c->modules) == 0) {
pa_log(__FILE__": daemon startup without any loaded modules, refusing to work.\n");
pa_log(__FILE__": daemon startup without any loaded modules, refusing to work.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
@ -433,13 +432,13 @@ int main(int argc, char *argv[]) {
if (c->default_sink_name &&
pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) {
pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.\n", __FILE__, c->default_sink_name);
pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name);
retval = 1;
} else {
pa_log_info(__FILE__": Daemon startup complete.\n");
pa_log_info(__FILE__": Daemon startup complete.");
if (pa_mainloop_run(mainloop, &retval) < 0)
retval = 1;
pa_log_info(__FILE__": Daemon shutdown initiated.\n");
pa_log_info(__FILE__": Daemon shutdown initiated.");
}
}
@ -453,7 +452,7 @@ int main(int argc, char *argv[]) {
pa_signal_done();
pa_mainloop_free(mainloop);
pa_log_info(__FILE__": Daemon terminated.\n");
pa_log_info(__FILE__": Daemon terminated.");
finish: