X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-libudev.c;h=c233b1ea1d9ed80844b7fd5e7f6a3f7fecefb370;hb=96197df081a16bec192a6cfb8f19674ca58f4835;hp=b89d900121d9beeb99e8456aefa976477fa0ff64;hpb=2001208c2ab631a69896d1f670c26846b70d1fb7;p=elogind.git diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index b89d90012..c233b1ea1 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -1,13 +1,21 @@ -/* - * test-libudev - * - * Copyright (C) 2008 Kay Sievers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - */ +/*** + This file is part of systemd. + + Copyright 2008-2012 Kay Sievers + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ #include #include @@ -21,20 +29,20 @@ #include #include "libudev.h" +#include "udev-util.h" #include "util.h" #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) -{ + 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) -{ +static void print_device(struct udev_device *device) { const char *str; dev_t devnum; int count; @@ -107,9 +115,8 @@ static void print_device(struct udev_device *device) printf("\n"); } -static int test_device(struct udev *udev, const char *syspath) -{ - struct udev_device *device; +static int test_device(struct udev *udev, const char *syspath) { + _cleanup_udev_device_unref_ struct udev_device *device; printf("looking at device: %s\n", syspath); device = udev_device_new_from_syspath(udev, syspath); @@ -118,13 +125,12 @@ static int test_device(struct udev *udev, const char *syspath) return -1; } print_device(device); - udev_device_unref(device); + return 0; } -static int test_device_parents(struct udev *udev, const char *syspath) -{ - struct udev_device *device; +static int test_device_parents(struct udev *udev, const char *syspath) { + _cleanup_udev_device_unref_ struct udev_device *device; struct udev_device *device_parent; printf("looking at device: %s\n", syspath); @@ -145,13 +151,11 @@ static int test_device_parents(struct udev *udev, const char *syspath) print_device(device_parent); device_parent = udev_device_get_parent(device_parent); } while (device_parent != NULL); - udev_device_unref(device); return 0; } -static int test_device_devnum(struct udev *udev) -{ +static int test_device_devnum(struct udev *udev) { dev_t devnum = makedev(1, 3); struct udev_device *device; @@ -164,8 +168,7 @@ static int test_device_devnum(struct udev *udev) return 0; } -static int test_device_subsys_name(struct udev *udev) -{ +static int test_device_subsys_name(struct udev *udev) { struct udev_device *device; printf("looking up device: 'block':'sda'\n"); @@ -198,8 +201,7 @@ static int test_device_subsys_name(struct udev *udev) return 0; } -static int test_enumerate_print_list(struct udev_enumerate *enumerate) -{ +static int test_enumerate_print_list(struct udev_enumerate *enumerate) { struct udev_list_entry *list_entry; int count = 0; @@ -220,8 +222,7 @@ static int test_enumerate_print_list(struct udev_enumerate *enumerate) return count; } -static int test_monitor(struct udev *udev) -{ +static int test_monitor(struct udev *udev) { struct udev_monitor *udev_monitor = NULL; int fd_ep; int fd_udev = -1; @@ -252,7 +253,7 @@ static int test_monitor(struct udev *udev) goto out; } - memset(&ep_udev, 0, sizeof(struct epoll_event)); + memzero(&ep_udev, sizeof(struct epoll_event)); ep_udev.events = EPOLLIN; ep_udev.data.fd = fd_udev; if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) { @@ -260,7 +261,7 @@ static int test_monitor(struct udev *udev) goto out; } - memset(&ep_stdin, 0, sizeof(struct epoll_event)); + memzero(&ep_stdin, sizeof(struct epoll_event)); ep_stdin.events = EPOLLIN; ep_stdin.data.fd = STDIN_FILENO; if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, STDIN_FILENO, &ep_stdin) < 0) { @@ -300,8 +301,7 @@ out: return 0; } -static int test_queue(struct udev *udev) -{ +static int test_queue(struct udev *udev) { struct udev_queue *udev_queue; unsigned long long int seqnum; struct udev_list_entry *list_entry; @@ -339,8 +339,7 @@ static int test_queue(struct udev *udev) return 0; } -static int test_enumerate(struct udev *udev, const char *subsystem) -{ +static int test_enumerate(struct udev *udev, const char *subsystem) { struct udev_enumerate *udev_enumerate; printf("enumerate '%s'\n", subsystem == NULL ? "" : subsystem); @@ -421,8 +420,8 @@ static int test_enumerate(struct udev *udev, const char *subsystem) return 0; } -static int test_hwdb(struct udev *udev, const char *modalias) { - struct udev_hwdb * hwdb; +static void test_hwdb(struct udev *udev, const char *modalias) { + struct udev_hwdb *hwdb; struct udev_list_entry *entry; hwdb = udev_hwdb_new(udev); @@ -432,11 +431,10 @@ static int test_hwdb(struct udev *udev, const char *modalias) { printf("\n"); hwdb = udev_hwdb_unref(hwdb); - return 0; + assert(hwdb == NULL); } -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { struct udev *udev = NULL; static const struct option options[] = { { "syspath", required_argument, NULL, 'p' },