chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: generalize code that checks whether PIDs are alive or unwaited for
[elogind.git]
/
src
/
shared
/
cgroup-show.c
diff --git
a/src/shared/cgroup-show.c
b/src/shared/cgroup-show.c
index 979fa8fddf6e776fa1db2b70e261e36f866f6582..ee14cee4ed2db8759d7f14b1036dc616753af48a 100644
(file)
--- a/
src/shared/cgroup-show.c
+++ b/
src/shared/cgroup-show.c
@@
-44,8
+44,6
@@
static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
unsigned i, m, pid_width;
pid_t biggest = 0;
unsigned i, m, pid_width;
pid_t biggest = 0;
- assert(n_pids > 0);
-
/* Filter duplicates */
m = 0;
for (i = 0; i < n_pids; i++) {
/* Filter duplicates */
m = 0;
for (i = 0; i < n_pids; i++) {
@@
-65,7
+63,7
@@
static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
pid_width = DECIMAL_STR_WIDTH(biggest);
/* And sort */
pid_width = DECIMAL_STR_WIDTH(biggest);
/* And sort */
- qsort(pids, n_pids, sizeof(pid_t), compare);
+ qsort
_safe
(pids, n_pids, sizeof(pid_t), compare);
if (flags & OUTPUT_FULL_WIDTH)
n_columns = 0;
if (flags & OUTPUT_FULL_WIDTH)
n_columns = 0;
@@
-180,7
+178,7
@@
int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH),
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH),
-
path_get_file_
name(last));
+
base
name(last));
if (!p1) {
p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERT));
if (!p1) {
p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERT));
@@
-204,7
+202,7
@@
int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT),
if (last) {
printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT),
-
path_get_file_
name(last));
+
base
name(last));
if (!p2) {
p2 = strappend(prefix, " ");
if (!p2) {
p2 = strappend(prefix, " ");