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-event: fix typo
[elogind.git]
/
src
/
cgtop
/
cgtop.c
diff --git
a/src/cgtop/cgtop.c
b/src/cgtop/cgtop.c
index 509fe4cdc8341a89155494ffdb37ce39cb923221..f951c37cbcb4299330bc6790b17651923a9b82cf 100644
(file)
--- a/
src/cgtop/cgtop.c
+++ b/
src/cgtop/cgtop.c
@@
-126,7
+126,9
@@
static int process(const char *controller, const char *path, Hashmap *a, Hashmap
return r;
}
} else {
return r;
}
} else {
- assert_se(hashmap_move_one(a, b, path) == 0);
+ r = hashmap_move_one(a, b, path);
+ if (r < 0)
+ return r;
g->cpu_valid = g->memory_valid = g->io_valid = g->n_tasks_valid = false;
}
}
g->cpu_valid = g->memory_valid = g->io_valid = g->n_tasks_valid = false;
}
}
@@
-445,7
+447,7
@@
static int display(Hashmap *a) {
Group *g;
Group **array;
signed path_columns;
Group *g;
Group **array;
signed path_columns;
- unsigned rows, n = 0, j, maxtcpu = 0, maxtpath =
0;
+ unsigned rows, n = 0, j, maxtcpu = 0, maxtpath =
3; /* 3 for ellipsize() to work properly */
char buffer[MAX3(21, FORMAT_BYTES_MAX, FORMAT_TIMESPAN_MAX)];
assert(a);
char buffer[MAX3(21, FORMAT_BYTES_MAX, FORMAT_TIMESPAN_MAX)];
assert(a);
@@
-695,8
+697,8
@@
int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
if (r <= 0)
goto finish;
- a = hashmap_new(
string_hash_func, string_compare_func
);
- b = hashmap_new(
string_hash_func, string_compare_func
);
+ a = hashmap_new(
&string_hash_ops
);
+ b = hashmap_new(
&string_hash_ops
);
if (!a || !b) {
r = log_oom();
goto finish;
if (!a || !b) {
r = log_oom();
goto finish;
@@
-746,7
+748,7
@@
int main(int argc, char *argv[]) {
if (r == -ETIMEDOUT)
continue;
if (r < 0) {
if (r == -ETIMEDOUT)
continue;
if (r < 0) {
- log_error
("Couldn't read key: %s", strerror(-r)
);
+ log_error
_errno(r, "Couldn't read key: %m"
);
goto finish;
}
}
goto finish;
}
}
@@
-840,7
+842,7
@@
finish:
group_hashmap_free(b);
if (r < 0) {
group_hashmap_free(b);
if (r < 0) {
- log_error
("Exiting with failure: %s", strerror(-r)
);
+ log_error
_errno(r, "Exiting with failure: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}