chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients: unify how we invoke getopt_long()
[elogind.git]
/
src
/
login
/
sysfs-show.c
diff --git
a/src/login/sysfs-show.c
b/src/login/sysfs-show.c
index da34c3ade84acac215aae9f9cb5c6024b70be6b3..7c1adfaaca7c599344d0ecb38e3151491163131f 100644
(file)
--- a/
src/login/sysfs-show.c
+++ b/
src/login/sysfs-show.c
@@
-26,6
+26,7
@@
#include "util.h"
#include "sysfs-show.h"
#include "path-util.h"
#include "util.h"
#include "sysfs-show.h"
#include "path-util.h"
+#include "udev-util.h"
static int show_sysfs_one(
struct udev *udev,
static int show_sysfs_one(
struct udev *udev,
@@
-45,7
+46,7
@@
static int show_sysfs_one(
struct udev_device *d;
const char *sn, *name, *sysfs, *subsystem, *sysname;
char *l, *k;
struct udev_device *d;
const char *sn, *name, *sysfs, *subsystem, *sysname;
char *l, *k;
- bool is_master
, uaccess
;
+ bool is_master;
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
@@
-68,8
+69,7
@@
static int show_sysfs_one(
continue;
}
continue;
}
- is_master = udev_device_has_tag(d, "seat-master");
- uaccess = udev_device_has_tag(d, "uaccess");
+ is_master = udev_device_has_tag(d, "master-of-seat");
name = udev_device_get_sysattr_value(d, "name");
if (!name)
name = udev_device_get_sysattr_value(d, "name");
if (!name)
@@
-114,8
+114,8
@@
static int show_sysfs_one(
free(k);
if (asprintf(&l,
free(k);
if (asprintf(&l,
- "%s%s
%s
:%s%s%s%s",
- is_master ? "[MASTER] " : "",
uaccess ? "[ACL] " : "",
+ "%s%s:%s%s%s%s",
+ is_master ? "[MASTER] " : "",
subsystem, sysname,
name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
udev_device_unref(d);
subsystem, sysname,
name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
udev_device_unref(d);
@@
-144,9
+144,9
@@
static int show_sysfs_one(
}
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
}
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
- struct udev *udev;
+ _cleanup_udev_unref_ struct udev *udev;
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
struct udev_list_entry *first = NULL;
struct udev_list_entry *first = NULL;
- struct udev_enumerate *e;
int r;
if (n_columns <= 0)
int r;
if (n_columns <= 0)
@@
-163,10
+163,8
@@
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
return -ENOMEM;
e = udev_enumerate_new(udev);
return -ENOMEM;
e = udev_enumerate_new(udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return ENOMEM;
if (!streq(seat, "seat0"))
r = udev_enumerate_add_match_tag(e, seat);
if (!streq(seat, "seat0"))
r = udev_enumerate_add_match_tag(e, seat);
@@
-174,22
+172,15
@@
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
r = udev_enumerate_add_match_tag(e, "seat");
if (r < 0)
r = udev_enumerate_add_match_tag(e, "seat");
if (r < 0)
-
goto finish
;
+
return r
;
r = udev_enumerate_scan_devices(e);
if (r < 0)
r = udev_enumerate_scan_devices(e);
if (r < 0)
-
goto finish
;
+
return r
;
first = udev_enumerate_get_list_entry(e);
if (first)
show_sysfs_one(udev, seat, &first, "/", prefix, n_columns);
first = udev_enumerate_get_list_entry(e);
if (first)
show_sysfs_one(udev, seat, &first, "/", prefix, n_columns);
-finish:
- if (e)
- udev_enumerate_unref(e);
-
- if (udev)
- udev_unref(udev);
-
return r;
}
return r;
}