SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: switch to systemd logging functions

Browse Source
This commit is contained in:
Kay Sievers
2014-11-13 13:12:57 +01:00
parent a974cacd9a
commit 25e773eeb4
18 changed files with 68 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/accelerometer/accelerometer.c
-11
View File
@@ -69,14 +69,6 @@
#define LONG(x) ((x)/BITS_PER_LONG)
#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
_printf_(6,0)
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
log_metav(priority, file, line, fn, format, args);
}
typedef enum {
ORIENTATION_UNDEFINED,
ORIENTATION_NORMAL,
@@ -233,8 +225,6 @@ int main (int argc, char** argv)
if (udev == NULL)
return 1;
udev_set_log_fn(udev, log_fn);
/* CLI argument parsing */
while (1) {
int option;
@@ -247,7 +237,6 @@ int main (int argc, char** argv)
case 'd':
log_set_target(LOG_TARGET_CONSOLE);
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
log_open();
break;
case 'h':
src/udev/ata_id/ata_id.c
-10
View File
@@ -405,14 +405,6 @@ out:
return ret;
}
_printf_(6,0)
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
log_metav(priority, file, line, fn, format, args);
}
int main(int argc, char *argv[])
{
struct udev *udev;
@@ -442,8 +434,6 @@ int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
udev_set_log_fn(udev, log_fn);
while (1) {
int option;
src/udev/cdrom_id/cdrom_id.c
-11
View File
@@ -37,14 +37,6 @@
#include "libudev.h"
#include "libudev-private.h"
_printf_(6,0)
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
log_metav(priority, file, line, fn, format, args);
}
/* device info */
static unsigned int cd_cd_rom;
static unsigned int cd_cd_r;
@@ -875,8 +867,6 @@ int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
udev_set_log_fn(udev, log_fn);
while (1) {
int option;
@@ -897,7 +887,6 @@ int main(int argc, char *argv[])
case 'd':
log_set_target(LOG_TARGET_CONSOLE);
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
log_open();
break;
case 'h':
src/udev/scsi_id/scsi_id.c
-11
View File
@@ -63,14 +63,6 @@ static char model_enc_str[256];
static char revision_str[16];
static char type_str[16];
_printf_(6,0)
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
log_metav(priority, file, line, fn, format, args);
}
static void set_type(const char *from, char *to, size_t len)
{
int type_num;
@@ -390,7 +382,6 @@ static int set_options(struct udev *udev,
case 'v':
log_set_target(LOG_TARGET_CONSOLE);
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
log_open();
break;
@@ -591,8 +582,6 @@ int main(int argc, char **argv)
if (udev == NULL)
goto exit;
udev_set_log_fn(udev, log_fn);
/*
* Get config file options.
*/
src/udev/udev-event.c
+2 -3
View File
@@ -676,7 +676,6 @@ int udev_event_spawn(struct udev_event *event,
usec_t timeout_warn_usec,
const char *cmd, char **envp, const sigset_t *sigmask,
char *result, size_t ressize) {
struct udev *udev = event->udev;
int outpipe[2] = {-1, -1};
int errpipe[2] = {-1, -1};
pid_t pid;
@@ -689,14 +688,14 @@ int udev_event_spawn(struct udev_event *event,
udev_build_argv(event->udev, arg, NULL, argv);
/* pipes from child to parent */
if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
if (result != NULL || log_get_max_level() >= LOG_INFO) {
if (pipe2(outpipe, O_NONBLOCK) != 0) {
err = -errno;
log_error("pipe failed: %m");
goto out;
}
}
if (udev_get_log_priority(udev) >= LOG_INFO) {
if (log_get_max_level() >= LOG_INFO) {
if (pipe2(errpipe, O_NONBLOCK) != 0) {
err = -errno;
log_error("pipe failed: %m");
src/udev/udevadm.c
-2
View File
@@ -98,7 +98,6 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
udev_set_log_fn(udev, udev_main_log);
mac_selinux_init("/dev");
while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
@@ -106,7 +105,6 @@ int main(int argc, char *argv[]) {
case 'd':
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
break;
case 'h':
src/udev/udevd.c
+1 -8
View File
@@ -644,7 +644,6 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) {
if (i >= 0) {
log_debug("udevd message (SET_LOG_LEVEL) received, log_priority=%i", i);
log_set_max_level(i);
udev_set_log_priority(udev, i);
worker_kill(udev);
}
@@ -984,7 +983,6 @@ static void kernel_cmdline_options(struct udev *udev) {
prio = util_log_priority(value);
log_set_max_level(prio);
udev_set_log_priority(udev, prio);
} else if ((value = startswith(opt, "udev.children-max="))) {
r = safe_atoi(value, &arg_children_max);
if (r < 0)
@@ -1120,19 +1118,14 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
udev_set_log_fn(udev, udev_main_log);
log_set_max_level(udev_get_log_priority(udev));
r = parse_argv(argc, argv);
if (r <= 0)
goto exit;
kernel_cmdline_options(udev);
if (arg_debug) {
if (arg_debug)
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
}
if (getuid() != 0) {
log_error("root privileges required");