chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove src/sysv-generator
[elogind.git]
/
src
/
test
/
test-libudev.c
diff --git
a/src/test/test-libudev.c
b/src/test/test-libudev.c
index f5c8bc768d9745396a1cda2a7b8a6e6d38a91ec9..2b004fdfb10d7192041de3584c0c65334b7fac2f 100644
(file)
--- a/
src/test/test-libudev.c
+++ b/
src/test/test-libudev.c
@@
-1,3
+1,4
@@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-18,14
+19,8
@@
***/
#include <stdio.h>
***/
#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
#include <unistd.h>
#include <unistd.h>
-#include <errno.h>
-#include <string.h>
#include <getopt.h>
#include <getopt.h>
-#include <syslog.h>
-#include <fcntl.h>
#include <sys/epoll.h>
#include "libudev.h"
#include <sys/epoll.h>
#include "libudev.h"
@@
-34,14
+29,6
@@
#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,
- 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;
static void print_device(struct udev_device *device) {
const char *str;
dev_t devnum;
@@
-407,7
+394,7
@@
static void test_hwdb(struct udev *udev, const char *modalias) {
printf("\n");
hwdb = udev_hwdb_unref(hwdb);
printf("\n");
hwdb = udev_hwdb_unref(hwdb);
- assert(hwdb == NULL);
+ assert
_se
(hwdb == NULL);
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
@@
-423,6
+410,7
@@
int main(int argc, char *argv[]) {
const char *syspath = "/devices/virtual/mem/null";
const char *subsystem = NULL;
char path[1024];
const char *syspath = "/devices/virtual/mem/null";
const char *subsystem = NULL;
char path[1024];
+ int c;
udev = udev_new();
printf("context: %p\n", udev);
udev = udev_new();
printf("context: %p\n", udev);
@@
-430,37
+418,38
@@
int main(int argc, char *argv[]) {
printf("no context\n");
return 1;
}
printf("no context\n");
return 1;
}
- udev_set_log_fn(udev, log_fn);
- printf("set log: %p\n", log_fn);
-
- for (;;) {
- int option;
- option = getopt_long(argc, argv, "+p:s:dhV", options, NULL);
- if (option == -1)
- break;
+ while ((c = getopt_long(argc, argv, "p:s:dhV", options, NULL)) >= 0)
+ switch (c) {
- switch (option) {
case 'p':
syspath = optarg;
break;
case 'p':
syspath = optarg;
break;
+
case 's':
subsystem = optarg;
break;
case 's':
subsystem = optarg;
break;
+
case 'd':
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;
break;
+
case 'h':
printf("--debug --syspath= --subsystem= --help\n");
goto out;
case 'h':
printf("--debug --syspath= --subsystem= --help\n");
goto out;
+
case 'V':
printf("%s\n", VERSION);
goto out;
case 'V':
printf("%s\n", VERSION);
goto out;
- default:
+
+ case '?':
goto out;
goto out;
+
+ default:
+ assert_not_reached("Unhandled option code.");
}
}
- }
+
/* add sys path if needed */
if (!startswith(syspath, "/sys")) {
/* add sys path if needed */
if (!startswith(syspath, "/sys")) {