chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rework cunescape(), improve error handling
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index a9e14af8dbf29148b1f510a765740f9d70f17a1b..5eb1a2ea65f61c003298c3c1e000a0d20f5a4e23 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-26,7
+26,6
@@
#include "util.h"
#include "mkdir.h"
#include "util.h"
#include "mkdir.h"
-#include "path-util.h"
#include "logind-inhibit.h"
#include "fileio.h"
#include "logind-inhibit.h"
#include "fileio.h"
@@
-138,7
+137,7
@@
int inhibitor_save(Inhibitor *i) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error
("Failed to save inhibit data %s: %s", i->state_file, strerror(-r)
);
+ log_error
_errno(r, "Failed to save inhibit data %s: %m", i->state_file
);
return r;
}
return r;
}
@@
-232,18
+231,18
@@
int inhibitor_load(Inhibitor *i) {
}
if (who) {
}
if (who) {
-
cc = cunescape(who
);
- if (
!cc
)
- return
-ENOMEM
;
+
r = cunescape(who, 0, &cc
);
+ if (
r < 0
)
+ return
r
;
free(i->who);
i->who = cc;
}
if (why) {
free(i->who);
i->who = cc;
}
if (why) {
-
cc = cunescape(why
);
- if (
!cc
)
- return
-ENOMEM
;
+
r = cunescape(why, 0, &cc
);
+ if (
r < 0
)
+ return
r
;
free(i->why);
i->why = cc;
free(i->why);
i->why = cc;