chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp-client: return NULL from _unref() like the other sd-* libraries
[elogind.git]
/
src
/
cgls
/
cgls.c
diff --git
a/src/cgls/cgls.c
b/src/cgls/cgls.c
index 1840594ff6255d8db38afe238b1e691ce36f47e5..052ac8ffca3395943fa18f79f80252478cf08149 100644
(file)
--- a/
src/cgls/cgls.c
+++ b/
src/cgls/cgls.c
@@
-130,7
+130,7
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r = 0, retval = EXIT_FAILURE;
int output_flags;
int main(int argc, char *argv[]) {
int r = 0, retval = EXIT_FAILURE;
int output_flags;
-
char _cleanup_free_
*root = NULL;
+
_cleanup_free_ char
*root = NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
log_parse_environment();
_cleanup_bus_unref_ sd_bus *bus = NULL;
log_parse_environment();
@@
-215,7
+215,7
@@
int main(int argc, char *argv[]) {
path = unit_dbus_path_from_name(scope);
if (!path) {
path = unit_dbus_path_from_name(scope);
if (!path) {
-
r =
log_oom();
+ log_oom();
goto finish;
}
goto finish;
}
@@
-242,7
+242,7
@@
int main(int argc, char *argv[]) {
root = strdup(cgroup);
if (!root) {
root = strdup(cgroup);
if (!root) {
-
r =
log_oom();
+ log_oom();
goto finish;
}
goto finish;
}