chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modernization
[elogind.git]
/
src
/
shared
/
cgroup-show.c
diff --git
a/src/shared/cgroup-show.c
b/src/shared/cgroup-show.c
index cc44ab4ea9ca1700135360cede64eb756f925ce9..979fa8fddf6e776fa1db2b70e261e36f866f6582 100644
(file)
--- a/
src/shared/cgroup-show.c
+++ b/
src/shared/cgroup-show.c
@@
-67,7
+67,7
@@
static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
/* And sort */
qsort(pids, n_pids, sizeof(pid_t), compare);
/* And sort */
qsort(pids, n_pids, sizeof(pid_t), compare);
- if(flags & OUTPUT_FULL_WIDTH)
+ if
(flags & OUTPUT_FULL_WIDTH)
n_columns = 0;
else {
if (n_columns > pid_width+2)
n_columns = 0;
else {
if (n_columns > pid_width+2)
@@
-76,7
+76,7
@@
static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
n_columns = 20;
}
for (i = 0; i < n_pids; i++) {
n_columns = 20;
}
for (i = 0; i < n_pids; i++) {
- char *t = NULL;
+
_cleanup_free_
char *t = NULL;
get_process_cmdline(pids[i], n_columns, true, &t);
get_process_cmdline(pids[i], n_columns, true, &t);
@@
-87,8
+87,6
@@
static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
pid_width,
(unsigned long) pids[i],
strna(t));
pid_width,
(unsigned long) pids[i],
strna(t));
-
- free(t);
}
}
}
}
@@
-98,7
+96,7
@@
static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
_cleanup_fclose_ FILE *f = NULL;
size_t n = 0, n_allocated = 0;
_cleanup_free_ pid_t *pids = NULL;
_cleanup_fclose_ FILE *f = NULL;
size_t n = 0, n_allocated = 0;
_cleanup_free_ pid_t *pids = NULL;
- char *p = NULL;
+
_cleanup_free_
char *p = NULL;
pid_t pid;
int r;
pid_t pid;
int r;
@@
-106,13
+104,8
@@
static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
if (r < 0)
return r;
if (r < 0)
return r;
- fn = strappend(p, "/cgroup.procs");
- free(p);
- if (!fn)
- return -ENOMEM;
-
+ fn = strappenda(p, "/cgroup.procs");
f = fopen(fn, "re");
f = fopen(fn, "re");
- free(fn);
if (!f)
return -errno;
if (!f)
return -errno;