diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-03 13:07:10 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-03-05 07:10:13 +0900 |
| commit | f5fbe71d956957ca7ceb6777aed05a416fc83a43 (patch) | |
| tree | 67358d417604030867a979f216bbb79939a37844 /src/libsystemd/sd-device | |
| parent | ef1e0b9a461c4baa12bdda47579c2c017209c3be (diff) | |
| download | systemd-f5fbe71d956957ca7ceb6777aed05a416fc83a43.tar.gz | |
tree-wide: use UINT64_MAX or friends
Diffstat (limited to 'src/libsystemd/sd-device')
| -rw-r--r-- | src/libsystemd/sd-device/device-private.c | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index b14f43aae5..7a7204b145 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -98,7 +98,7 @@ int device_get_devnode_mode(sd_device *device, mode_t *mode) { if (r < 0) return r; - if (device->devmode == (mode_t) -1) + if (device->devmode == MODE_INVALID) return -ENOENT; if (mode) @@ -116,7 +116,7 @@ int device_get_devnode_uid(sd_device *device, uid_t *uid) { if (r < 0) return r; - if (device->devuid == (uid_t) -1) + if (device->devuid == UID_INVALID) return -ENOENT; if (uid) @@ -154,7 +154,7 @@ int device_get_devnode_gid(sd_device *device, gid_t *gid) { if (r < 0) return r; - if (device->devgid == (gid_t) -1) + if (device->devgid == GID_INVALID) return -ENOENT; if (gid) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 1ef7f4d69c..964ef1318e 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "strxcpyx.h" +#include "user-util.h" #include "util.h" int device_new_aux(sd_device **ret) { @@ -40,9 +41,9 @@ int device_new_aux(sd_device **ret) { *device = (sd_device) { .n_ref = 1, .watch_handle = -1, - .devmode = (mode_t) -1, - .devuid = (uid_t) -1, - .devgid = (gid_t) -1, + .devmode = MODE_INVALID, + .devuid = UID_INVALID, + .devgid = GID_INVALID, .action = _SD_DEVICE_ACTION_INVALID, }; |