projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0d8fbf
)
sleep-config: return correct error code
author
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Jun 2020 14:40:52 +0000
(16:40 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 11 Jun 2020 08:33:56 +0000
(10:33 +0200)
src/shared/sleep-config.c
patch
|
blob
|
history
diff --git
a/src/shared/sleep-config.c
b/src/shared/sleep-config.c
index 0e6fd41dcef3b1c43a0be2c5c8110397345d62e2..616bd66c1b4a8f2fb1a74df3fb1f08e124879ab7 100644
(file)
--- a/
src/shared/sleep-config.c
+++ b/
src/shared/sleep-config.c
@@
-133,9
+133,9
@@
int can_sleep_state(char **types) {
}
int can_sleep_disk(char **types) {
+ _cleanup_free_ char *p = NULL;
char **type;
int r;
- _cleanup_free_ char *p = NULL;
if (strv_isempty(types))
return true;
@@
-203,16
+203,17
@@
static int swap_device_to_device_id(const SwapEntry *swap, dev_t *ret_dev) {
r = stat(swap->device, &sb);
if (r < 0)
- return
r
;
+ return
-errno
;
if (streq(swap->type, "partition")) {
if (!S_ISBLK(sb.st_mode))
return -ENOTBLK;
+
*ret_dev = sb.st_rdev;
return 0;
+ }
- } else
- return get_block_device(swap->device, ret_dev);
+ return get_block_device(swap->device, ret_dev);
}
/*