chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: clean up usage of gcc attributes
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index e18421e5207dd656168641570d800e2e5a18adce..182277030440d34840ce9d1ad032736d25f5b6be 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-643,7
+643,7
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
/* Kernel threads have no argv[] */
if (r == NULL || r[0] == 0) {
/* Kernel threads have no argv[] */
if (r == NULL || r[0] == 0) {
-
char *t
;
+
_cleanup_free_ char *t = NULL
;
int h;
free(r);
int h;
free(r);
@@
-656,8
+656,6
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
return h;
r = strjoin("[", t, "]", NULL);
return h;
r = strjoin("[", t, "]", NULL);
- free(t);
-
if (!r)
return -ENOMEM;
}
if (!r)
return -ENOMEM;
}
@@
-4463,7
+4461,7
@@
int glob_extend(char ***strv, const char *path) {
char **p;
errno = 0;
char **p;
errno = 0;
- k = glob(
optarg
, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
+ k = glob(
path
, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
if (k == GLOB_NOMATCH)
return -ENOENT;
if (k == GLOB_NOMATCH)
return -ENOENT;