summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-01-09 17:53:17 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-01-09 17:53:17 -0500
commit0df9dcf039d5c10689976b6d25fb246bc2008785 (patch)
tree59b15fbd45db6df956622b980101de88e87c9ce9 /test
parent106c2979b6bc1bda8f143878c15747888d9b0c0c (diff)
test/test-libudev.c: bring into line with upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'test')
-rw-r--r--test/test-libudev.c37
1 files changed, 13 insertions, 24 deletions
diff --git a/test/test-libudev.c b/test/test-libudev.c
index b2c45360bf..bb271e0c6e 100644
--- a/test/test-libudev.c
+++ b/test/test-libudev.c
@@ -36,14 +36,12 @@
_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;
@@ -116,8 +114,7 @@ static void print_device(struct udev_device *device)
printf("\n");
}
-static int test_device(struct udev *udev, const char *syspath)
-{
+static int test_device(struct udev *udev, const char *syspath) {
struct udev_device *device;
printf("looking at device: %s\n", syspath);
@@ -131,8 +128,7 @@ static int test_device(struct udev *udev, const char *syspath)
return 0;
}
-static int test_device_parents(struct udev *udev, const char *syspath)
-{
+static int test_device_parents(struct udev *udev, const char *syspath) {
struct udev_device *device;
struct udev_device *device_parent;
@@ -159,8 +155,7 @@ static int test_device_parents(struct udev *udev, const char *syspath)
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;
@@ -173,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");
@@ -207,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;
@@ -229,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;
@@ -309,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;
@@ -348,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 ? "<all>" : subsystem);
@@ -430,7 +420,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem)
return 0;
}
-static int test_hwdb(struct udev *udev, const char *modalias) {
+static void test_hwdb(struct udev *udev, const char *modalias) {
struct udev_hwdb *hwdb;
struct udev_list_entry *entry;
@@ -441,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' },