chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link: port to new ethtool ETHTOOL_xLINKSETTINGS
[elogind.git]
/
src
/
basic
/
process-util.c
diff --git
a/src/basic/process-util.c
b/src/basic/process-util.c
index cd9c0f7e5d5155abf9ea63fed1d6b7b292112ec4..359c3a4e4e00dfd015c2802ffd1e1e37ff227704 100644
(file)
--- a/
src/basic/process-util.c
+++ b/
src/basic/process-util.c
@@
-235,14
+235,14
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
return h;
if (max_length == 0)
return h;
if (max_length == 0)
- r = strjoin("[", t, "]"
, NULL
);
+ r = strjoin("[", t, "]");
else {
size_t l;
l = strlen(t);
if (l + 3 <= max_length)
else {
size_t l;
l = strlen(t);
if (l + 3 <= max_length)
- r = strjoin("[", t, "]"
, NULL
);
+ r = strjoin("[", t, "]");
else if (max_length <= 6) {
r = new(char, max_length);
else if (max_length <= 6) {
r = new(char, max_length);
@@
-262,7
+262,7
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
e--;
*e = 0;
e--;
*e = 0;
- r = strjoin("[", t, "...]"
, NULL
);
+ r = strjoin("[", t, "...]");
}
}
if (!r)
}
}
if (!r)