chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show a colored red dot in "status" output indicating the state of a unit
[elogind.git]
/
src
/
test
/
test-libudev.c
diff --git
a/src/test/test-libudev.c
b/src/test/test-libudev.c
index 9c06bc1cfd015c6cbb6b31ebca9628e6e4acde27..c233b1ea1d9ed80844b7fd5e7f6a3f7fecefb370 100644
(file)
--- a/
src/test/test-libudev.c
+++ b/
src/test/test-libudev.c
@@
-34,16
+34,15
@@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#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,
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);
}
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;
const char *str;
dev_t devnum;
int count;
@@
-116,8
+115,7
@@
static void print_device(struct udev_device *device)
printf("\n");
}
printf("\n");
}
-static int test_device(struct udev *udev, const char *syspath)
-{
+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);
_cleanup_udev_device_unref_ struct udev_device *device;
printf("looking at device: %s\n", syspath);
@@
-131,8
+129,7
@@
static int test_device(struct udev *udev, const char *syspath)
return 0;
}
return 0;
}
-static int test_device_parents(struct udev *udev, const char *syspath)
-{
+static int test_device_parents(struct udev *udev, const char *syspath) {
_cleanup_udev_device_unref_ struct udev_device *device;
struct udev_device *device_parent;
_cleanup_udev_device_unref_ struct udev_device *device;
struct udev_device *device_parent;
@@
-158,8
+155,7
@@
static int test_device_parents(struct udev *udev, const char *syspath)
return 0;
}
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;
dev_t devnum = makedev(1, 3);
struct udev_device *device;
@@
-172,8
+168,7
@@
static int test_device_devnum(struct udev *udev)
return 0;
}
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");
struct udev_device *device;
printf("looking up device: 'block':'sda'\n");
@@
-206,8
+201,7
@@
static int test_device_subsys_name(struct udev *udev)
return 0;
}
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;
struct udev_list_entry *list_entry;
int count = 0;
@@
-228,8
+222,7
@@
static int test_enumerate_print_list(struct udev_enumerate *enumerate)
return count;
}
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;
struct udev_monitor *udev_monitor = NULL;
int fd_ep;
int fd_udev = -1;
@@
-260,7
+253,7
@@
static int test_monitor(struct udev *udev)
goto out;
}
goto out;
}
- mem
set(&ep_udev, 0
, sizeof(struct epoll_event));
+ mem
zero(&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) {
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
@@
-268,7
+261,7
@@
static int test_monitor(struct udev *udev)
goto out;
}
goto out;
}
- mem
set(&ep_stdin, 0
, sizeof(struct epoll_event));
+ mem
zero(&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) {
ep_stdin.events = EPOLLIN;
ep_stdin.data.fd = STDIN_FILENO;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, STDIN_FILENO, &ep_stdin) < 0) {
@@
-308,8
+301,7
@@
out:
return 0;
}
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;
struct udev_queue *udev_queue;
unsigned long long int seqnum;
struct udev_list_entry *list_entry;
@@
-347,8
+339,7
@@
static int test_queue(struct udev *udev)
return 0;
}
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);
struct udev_enumerate *udev_enumerate;
printf("enumerate '%s'\n", subsystem == NULL ? "<all>" : subsystem);
@@
-443,8
+434,7
@@
static void test_hwdb(struct udev *udev, const char *modalias) {
assert(hwdb == NULL);
}
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' },
struct udev *udev = NULL;
static const struct option options[] = {
{ "syspath", required_argument, NULL, 'p' },