tree-wide: use ASSERT_PTR more

This commit is contained in:
David Tardon
2022-09-13 08:13:27 +02:00
parent 6d64cb0625
commit 995340074e
220 changed files with 1071 additions and 2323 deletions
+1 -2
View File
@@ -13,11 +13,10 @@
static int bus_method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_free_ char *dump = NULL;
_cleanup_close_ int fd = -1;
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
int r;
assert(message);
assert(m);
r = manager_get_dump_string(m, &dump);
if (r < 0)
+4 -10
View File
@@ -134,12 +134,10 @@ static int process_managed_oom_request(
JsonVariant *parameters,
VarlinkMethodFlags flags,
void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
uid_t uid;
int r;
assert(m);
r = varlink_get_peer_uid(link, &uid);
if (r < 0)
return log_error_errno(r, "Failed to get varlink peer uid: %m");
@@ -153,12 +151,10 @@ static int process_managed_oom_reply(
const char *error_id,
VarlinkReplyFlags flags,
void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
uid_t uid;
int r;
assert(m);
if (error_id) {
r = -EIO;
log_debug("Error getting ManagedOOM cgroups: %s", error_id);
@@ -346,12 +342,11 @@ static int acquire_managed_oom_connect(Manager *m) {
}
static int monitor_swap_contexts_handler(sd_event_source *s, uint64_t usec, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
usec_t usec_now;
int r;
assert(s);
assert(userdata);
/* Reset timer */
r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);
@@ -446,12 +441,11 @@ static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t
_unused_ _cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
_cleanup_set_free_ Set *targets = NULL;
bool in_post_action_delay = false;
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
usec_t usec_now;
int r;
assert(s);
assert(userdata);
/* Reset timer */
r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);