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-rtnl: don't assign to unused variable
[elogind.git]
/
src
/
shared
/
cgroup-util.c
diff --git
a/src/shared/cgroup-util.c
b/src/shared/cgroup-util.c
index e8cb9c73ac6fa4e1c104c842ac9ae4cd57e05282..00eac642369df6de0c7ee3f47ee104dcab3983ba 100644
(file)
--- a/
src/shared/cgroup-util.c
+++ b/
src/shared/cgroup-util.c
@@
-1306,9
+1306,8
@@
int cg_pid_get_machine_name(pid_t pid, char **machine) {
}
int cg_path_get_session(const char *path, char **session) {
}
int cg_path_get_session(const char *path, char **session) {
- const char *e, *n, *x;
+ const char *e, *n, *x
, *y
;
char *s;
char *s;
- size_t l;
assert(path);
assert(path);
@@
-1325,17
+1324,14
@@
int cg_path_get_session(const char *path, char **session) {
x = startswith(s, "session-");
if (!x)
return -ENOENT;
x = startswith(s, "session-");
if (!x)
return -ENOENT;
- if (!endswith(x, ".scope"))
- return -ENOENT;
-
- l = strlen(x);
- if (l <= 6)
+ y = endswith(x, ".scope");
+ if (!y || x == y)
return -ENOENT;
if (session) {
char *r;
return -ENOENT;
if (session) {
char *r;
- r = strndup(x,
l - 6
);
+ r = strndup(x,
y - x
);
if (!r)
return -ENOMEM;
if (!r)
return -ENOMEM;