chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: merge all udev tools into a single binary
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 418d43de14369a999c2423af5d13cad5727accb2..a36e503fd41112b339127022e04930f9943d181a 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-32,22
+32,6
@@
#include "udev.h"
#include "udev_rules.h"
#include "udev.h"
#include "udev_rules.h"
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
- va_list args;
-
- if (priority > udev_log_priority)
- return;
-
- va_start(args, format);
- vprintf(format, args);
- va_end(args);
- printf("\n");
-}
-#endif
-
static int import_uevent_var(const char *devpath)
{
char path[PATH_SIZE];
static int import_uevent_var(const char *devpath)
{
char path[PATH_SIZE];
@@
-87,12
+71,12
@@
out:
return rc;
}
return rc;
}
-int
main
(int argc, char *argv[], char *envp[])
+int
udevtest
(int argc, char *argv[], char *envp[])
{
int force = 0;
{
int force = 0;
- char *action = "add";
- char *subsystem = NULL;
- char *devpath = NULL;
+ c
onst c
har *action = "add";
+ c
onst c
har *subsystem = NULL;
+ c
onst c
har *devpath = NULL;
struct udevice *udev;
struct sysfs_device *dev;
struct udev_rules rules = {};
struct udevice *udev;
struct sysfs_device *dev;
struct udev_rules rules = {};
@@
-136,7
+120,7
@@
int main(int argc, char *argv[], char *envp[])
force = 1;
break;
case 'h':
force = 1;
break;
case 'h':
- printf("Usage: udevtest OPTIONS <devpath>\n"
+ printf("Usage: udev
adm
test OPTIONS <devpath>\n"
" --action=<string> set action string\n"
" --subsystem=<string> set subsystem string\n"
" --force don't skip node/link creation\n"
" --action=<string> set action string\n"
" --subsystem=<string> set subsystem string\n"
" --force don't skip node/link creation\n"