Based on 9d19a679f23c7a72c326cbbbf44e0c9f423dec5d Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 9 Sep 2014 22:48:07 +0200 Subject: [PATCH] udev - drop print_kmsg The only remaining user was 'starting version XXX', which is now logged using log_info(). --- src/libudev/libudev-private.h | 1 - src/libudev/libudev-util.c | 25 ------------------------- src/udev/udevd.c | 2 +- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git src/libudev/libudev-private.h src/libudev/libudev-private.h index ae97557..cd1c1fb 100644 --- src/libudev/libudev-private.h +++ src/libudev/libudev-private.h @@ -170,6 +170,5 @@ int util_delete_path(struct udev *udev, const char *path); uid_t util_lookup_user(struct udev *udev, const char *user); gid_t util_lookup_group(struct udev *udev, const char *group); int util_resolve_subsys_kernel(struct udev *udev, const char *string, char *result, size_t maxsize, int read_value); -ssize_t print_kmsg(const char *fmt, ...) _printf_(1, 2); #endif --- src/libudev/libudev-util.c +++ src/libudev/libudev-util.c 2014-09-16 08:56:01.862736270 +0000 @@ -422,33 +422,3 @@ static int parse_proc_cmdline_word(const return 0; } - -ssize_t print_kmsg(const char *fmt, ...) -{ - _cleanup_close_ int fd = -1; - va_list ap; - char text[1024]; - ssize_t len; - ssize_t ret; - - if (parse_proc_cmdline(parse_proc_cmdline_word) == -115) { - fd = open("/dev/null", O_WRONLY|O_NOCTTY|O_CLOEXEC); - } else { - fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC); - } - - if (fd < 0) - return -errno; - - len = snprintf(text, sizeof(text), "<30>systemd-udevd[%u]: ", getpid()); - - va_start(ap, fmt); - len += vsnprintf(text + len, sizeof(text) - len, fmt, ap); - va_end(ap); - - ret = write(fd, text, len); - if (ret < 0) - return -errno; - - return ret; -} diff --git src/udev/udevd.c src/udev/udevd.c index be0acc3..b023b6e 100644 --- src/udev/udevd.c +++ src/udev/udevd.c @@ -1200,7 +1200,7 @@ int main(int argc, char *argv[]) { sd_notify(1, "READY=1"); } - print_kmsg("starting version " VERSION "\n"); + log_info("starting version " VERSION "\n"); if (!debug) { int fd; -- 1.7.9.2