chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a504223
)
log: correct usage of logging API at a few places
author
Lennart Poettering
<lennart@poettering.net>
Fri, 13 Jul 2012 13:45:45 +0000
(15:45 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 13 Jul 2012 13:45:45 +0000
(15:45 +0200)
src/machine-id-setup/machine-id-setup-main.c
patch
|
blob
|
history
src/tty-ask-password-agent/tty-ask-password-agent.c
patch
|
blob
|
history
src/udev/udevadm.c
patch
|
blob
|
history
src/udev/udevd.c
patch
|
blob
|
history
diff --git
a/src/machine-id-setup/machine-id-setup-main.c
b/src/machine-id-setup/machine-id-setup-main.c
index 60f9ef837bdab4221fbe925f4c0b9209c2a0ad45..6373ebc2db250f0e355250d5f7dcb2571eaee8a4 100644
(file)
--- a/
src/machine-id-setup/machine-id-setup-main.c
+++ b/
src/machine-id-setup/machine-id-setup-main.c
@@
-91,7
+91,6
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r;
- log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
diff --git
a/src/tty-ask-password-agent/tty-ask-password-agent.c
b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 2e74a25972ddce27e7c4c6307e83533f414100e5..2ab3401e6f93c3c125ad568b05eb0d160cc6b2ad 100644
(file)
--- a/
src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/
src/tty-ask-password-agent/tty-ask-password-agent.c
@@
-738,6
+738,7
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r;
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 5217d7f9dd66fac3efe63b107e404b7f27c9e9b9..818edee38f1ecd53553c423e7e9b2659c4d2dce4 100644
(file)
--- a/
src/udev/udevadm.c
+++ b/
src/udev/udevadm.c
@@
-99,8
+99,8
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto out;
- log_open();
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
label_init("/dev");
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index 176e4e293052e4ced91eadbdd43aec988d78bacf..ee78b396b7c2d863d7037b621a6dbc6323673219 100644
(file)
--- a/
src/udev/udevd.c
+++ b/
src/udev/udevd.c
@@
-1083,8
+1083,9
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
- log_
open(
);
+ log_
set_target(LOG_TARGET_AUTO
);
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
log_debug("version %s\n", VERSION);
label_init("/dev");