chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: log_error() and friends add a newline after each line anyway, so avoid including...
[elogind.git]
/
src
/
udev
/
udevadm-test.c
diff --git
a/src/udev/udevadm-test.c
b/src/udev/udevadm-test.c
index cd75fad674dd72dbdf5ef400d381bc7d10dae037..6cd311b27db4ca559ceb14da3068abd359013107 100644
(file)
--- a/
src/udev/udevadm-test.c
+++ b/
src/udev/udevadm-test.c
@@
-30,6
+30,7
@@
#include <sys/signalfd.h>
#include "udev.h"
#include <sys/signalfd.h>
#include "udev.h"
+#include "udev-util.h"
static int adm_test(struct udev *udev, int argc, char *argv[])
{
static int adm_test(struct udev *udev, int argc, char *argv[])
{
@@
-37,10
+38,10
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
char filename[UTIL_PATH_SIZE];
const char *action = "add";
const char *syspath = NULL;
char filename[UTIL_PATH_SIZE];
const char *action = "add";
const char *syspath = NULL;
- struct udev_event *event = NULL;
- struct udev_device *dev = NULL;
- struct udev_rules *rules = NULL;
struct udev_list_entry *entry;
struct udev_list_entry *entry;
+ _cleanup_udev_rules_unref_ struct udev_rules *rules = NULL;
+ _cleanup_udev_device_unref_ struct udev_device *dev = NULL;
+ _cleanup_udev_event_unref_ struct udev_event *event = NULL;
sigset_t mask, sigmask_orig;
int err;
int rc = 0, c;
sigset_t mask, sigmask_orig;
int err;
int rc = 0, c;
@@
-52,7
+53,7
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
{}
};
{}
};
- log_debug("version %s
\n
", VERSION);
+ log_debug("version %s", VERSION);
while((c = getopt_long(argc, argv, "a:N:h", options, NULL)) >= 0)
switch (c) {
while((c = getopt_long(argc, argv, "a:N:h", options, NULL)) >= 0)
switch (c) {
@@
-68,7
+69,7
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
resolve_names = -1;
} else {
fprintf(stderr, "resolve-names must be early, late or never\n");
resolve_names = -1;
} else {
fprintf(stderr, "resolve-names must be early, late or never\n");
- log_error("resolve-names must be early, late or never
\n
");
+ log_error("resolve-names must be early, late or never");
exit(EXIT_FAILURE);
}
break;
exit(EXIT_FAILURE);
}
break;
@@
-154,9
+155,6
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
- udev_event_unref(event);
- udev_device_unref(dev);
- udev_rules_unref(rules);
udev_builtin_exit(udev);
return rc;
}
udev_builtin_exit(udev);
return rc;
}