X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-libudev.c;h=293c151d425e066030c3fe02c65cfd4274b1ce90;hp=912b61396a34557b94d97069ccd34f74693d759f;hb=2822da4fb7f891e5320f02f1d00f64b72221ced4;hpb=601185b43da638b1c74153deae01dbd518680889

diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 912b61396..293c151d4 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/epoll.h>
 
@@ -35,14 +34,6 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-_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) {
-        printf("test-libudev: %s %s:%d ", fn, file, line);
-        vprintf(format, args);
-}
-
 static void print_device(struct udev_device *device) {
         const char *str;
         dev_t devnum;
@@ -408,7 +399,7 @@ static void test_hwdb(struct udev *udev, const char *modalias) {
         printf("\n");
 
         hwdb = udev_hwdb_unref(hwdb);
-        assert(hwdb == NULL);
+        assert_se(hwdb == NULL);
 }
 
 int main(int argc, char *argv[]) {
@@ -432,9 +423,6 @@ int main(int argc, char *argv[]) {
                 printf("no context\n");
                 return 1;
         }
-        udev_set_log_fn(udev, log_fn);
-        printf("set log: %p\n", log_fn);
-
 
         while ((c = getopt_long(argc, argv, "p:s:dhV", options, NULL)) >= 0)
                 switch (c) {
@@ -448,8 +436,8 @@ int main(int argc, char *argv[]) {
                         break;
 
                 case 'd':
-                        if (udev_get_log_priority(udev) < LOG_INFO)
-                                udev_set_log_priority(udev, LOG_INFO);
+                        if (log_get_max_level() < LOG_INFO)
+                                log_set_max_level(LOG_INFO);
                         break;
 
                 case 'h':