X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcgroup-show.c;h=cbd94e86d9166068e2dc657e7ed94c2f1f0b429c;hb=374c22b351e43ce4ef70ef0ad1bd1e4e520f9a28;hp=d1132779aaf1a16fcd3d172f36c3e7156eac6332;hpb=3637713a2006320a8844adc6de5cd134444bb329;p=elogind.git diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index d1132779a..cbd94e86d 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -43,7 +43,7 @@ static int compare(const void *a, const void *b) { static void show_pid_array(pid_t pids[], unsigned n_pids, const char *prefix, unsigned n_columns, bool extra, bool more, bool kernel_threads, OutputFlags flags) { unsigned i, j, pid_width; - if (n_pids <= 0) + if (n_pids == 0) return; qsort(pids, n_pids, sizeof(pid_t), compare); @@ -93,7 +93,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne if (r < 0) return r; - fn = strappenda(p, "/cgroup.procs"); + fn = strjoina(p, "/cgroup.procs"); f = fopen(fn, "re"); if (!f) return -errno; @@ -113,8 +113,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne if (r < 0) return r; - if (n > 0) - show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags); + show_pid_array(pids, n, prefix, n_columns, false, more, kernel_threads, flags); return 0; }