chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: optimize bisection logic a bit by caching the last position
[elogind.git]
/
src
/
test
/
test-libudev.c
diff --git
a/src/test/test-libudev.c
b/src/test/test-libudev.c
index caa3b4d14c14eba27f64ba68a8433f5989394767..9c06bc1cfd015c6cbb6b31ebca9628e6e4acde27 100644
(file)
--- a/
src/test/test-libudev.c
+++ b/
src/test/test-libudev.c
@@
-29,6
+29,7
@@
#include <sys/epoll.h>
#include "libudev.h"
#include <sys/epoll.h>
#include "libudev.h"
+#include "udev-util.h"
#include "util.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#include "util.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@
-117,7
+118,7
@@
static void print_device(struct udev_device *device)
static int test_device(struct udev *udev, const char *syspath)
{
static int test_device(struct udev *udev, const char *syspath)
{
- struct udev_device *device;
+
_cleanup_udev_device_unref_
struct udev_device *device;
printf("looking at device: %s\n", syspath);
device = udev_device_new_from_syspath(udev, syspath);
printf("looking at device: %s\n", syspath);
device = udev_device_new_from_syspath(udev, syspath);
@@
-126,13
+127,13
@@
static int test_device(struct udev *udev, const char *syspath)
return -1;
}
print_device(device);
return -1;
}
print_device(device);
- udev_device_unref(device);
+
return 0;
}
static int test_device_parents(struct udev *udev, const char *syspath)
{
return 0;
}
static int test_device_parents(struct udev *udev, const char *syspath)
{
- struct udev_device *device;
+
_cleanup_udev_device_unref_
struct udev_device *device;
struct udev_device *device_parent;
printf("looking at device: %s\n", syspath);
struct udev_device *device_parent;
printf("looking at device: %s\n", syspath);
@@
-153,7
+154,6
@@
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);
print_device(device_parent);
device_parent = udev_device_get_parent(device_parent);
} while (device_parent != NULL);
- udev_device_unref(device);
return 0;
}
return 0;
}
@@
-429,8
+429,8
@@
static int test_enumerate(struct udev *udev, const char *subsystem)
return 0;
}
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);
struct udev_list_entry *entry;
hwdb = udev_hwdb_new(udev);
@@
-440,7
+440,7
@@
static int test_hwdb(struct udev *udev, const char *modalias) {
printf("\n");
hwdb = udev_hwdb_unref(hwdb);
printf("\n");
hwdb = udev_hwdb_unref(hwdb);
-
return 0
;
+
assert(hwdb == NULL)
;
}
int main(int argc, char *argv[])
}
int main(int argc, char *argv[])