SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use ASSERT_PTR more

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-introspect.c
+1 -2
View File
@@ -192,13 +192,12 @@ int introspect_write_interface(
const char *interface_name,
const sd_bus_vtable *v) {
const sd_bus_vtable *vtable = v;
const sd_bus_vtable *vtable = ASSERT_PTR(v);
const char *names = "";
int r;
assert(i);
assert(interface_name);
assert(v);
r = set_interface_name(i, interface_name);
if (r < 0)
src/libsystemd/sd-bus/bus-track.c
+1 -2
View File
@@ -164,12 +164,11 @@ static sd_bus_track *track_free(sd_bus_track *track) {
DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_bus_track, sd_bus_track, track_free);
static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) {
sd_bus_track *track = userdata;
sd_bus_track *track = ASSERT_PTR(userdata);
const char *name;
int r;
assert(message);
assert(track);
r = sd_bus_message_read(message, "sss", &name, NULL, NULL);
if (r < 0)
src/libsystemd/sd-bus/sd-bus.c
+4 -10
View File
@@ -3415,12 +3415,11 @@ static int add_match_callback(
void *userdata,
sd_bus_error *ret_error) {
sd_bus_slot *match_slot = userdata;
sd_bus_slot *match_slot = ASSERT_PTR(userdata);
bool failed = false;
int r;
assert(m);
assert(match_slot);
sd_bus_slot_ref(match_slot);
@@ -3592,11 +3591,9 @@ bool bus_pid_changed(sd_bus *bus) {
}
static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
sd_bus *bus = userdata;
sd_bus *bus = ASSERT_PTR(userdata);
int r;
assert(bus);
/* Note that this is called both on input_fd, output_fd as well as inotify_fd events */
r = sd_bus_process(bus, NULL);
@@ -3609,11 +3606,9 @@ static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userd
}
static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
sd_bus *bus = userdata;
sd_bus *bus = ASSERT_PTR(userdata);
int r;
assert(bus);
r = sd_bus_process(bus, NULL);
if (r < 0) {
log_debug_errno(r, "Processing of bus failed, closing down: %m");
@@ -3624,12 +3619,11 @@ static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
}
static int prepare_callback(sd_event_source *s, void *userdata) {
sd_bus *bus = userdata;
sd_bus *bus = ASSERT_PTR(userdata);
int r, e;
usec_t until;
assert(s);
assert(bus);
e = sd_bus_get_events(bus);
if (e < 0) {
src/libsystemd/sd-device/device-monitor.c
+1 -3
View File
@@ -244,9 +244,7 @@ _public_ int sd_device_monitor_stop(sd_device_monitor *m) {
static int device_monitor_event_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_(sd_device_unrefp) sd_device *device = NULL;
sd_device_monitor *m = userdata;
assert(m);
sd_device_monitor *m = ASSERT_PTR(userdata);
if (device_monitor_receive_device(m, &device) <= 0)
return 0;
src/libsystemd/sd-journal/sd-journal.c
+2 -4
View File
@@ -147,7 +147,7 @@ static void set_location(sd_journal *j, JournalFile *f, Object *o) {
}
static int match_is_valid(const void *data, size_t size) {
assert(data);
const char *b = ASSERT_PTR(data);
if (size < 2)
return false;
@@ -155,7 +155,6 @@ static int match_is_valid(const void *data, size_t size) {
if (((char*) data)[0] == '_' && ((char*) data)[1] == '_')
return false;
const char *b = data;
for (const char *p = b; p < b + size; p++) {
if (*p == '=')
@@ -3208,13 +3207,12 @@ _public_ int sd_journal_reliable_fd(sd_journal *j) {
}
static char *lookup_field(const char *field, void *userdata) {
sd_journal *j = userdata;
sd_journal *j = ASSERT_PTR(userdata);
const void *data;
size_t size, d;
int r;
assert(field);
assert(j);
r = sd_journal_get_data(j, field, &data, &size);
if (r < 0 ||
src/libsystemd/sd-netlink/sd-netlink.c
+3 -8
View File
@@ -678,11 +678,9 @@ _public_ int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
}
static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
sd_netlink *nl = userdata;
sd_netlink *nl = ASSERT_PTR(userdata);
int r;
assert(nl);
r = sd_netlink_process(nl, NULL);
if (r < 0)
return r;
@@ -691,11 +689,9 @@ static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userd
}
static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
sd_netlink *nl = userdata;
sd_netlink *nl = ASSERT_PTR(userdata);
int r;
assert(nl);
r = sd_netlink_process(nl, NULL);
if (r < 0)
return r;
@@ -704,12 +700,11 @@ static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
}
static int prepare_callback(sd_event_source *s, void *userdata) {
sd_netlink *nl = userdata;
sd_netlink *nl = ASSERT_PTR(userdata);
int r, enabled;
usec_t until;
assert(s);
assert(nl);
r = sd_netlink_get_events(nl);
if (r < 0)
src/libsystemd/sd-resolve/sd-resolve.c
+1 -3
View File
@@ -1236,11 +1236,9 @@ _public_ int sd_resolve_query_set_floating(sd_resolve_query *q, int b) {
}
static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
sd_resolve *resolve = userdata;
sd_resolve *resolve = ASSERT_PTR(userdata);
int r;
assert(resolve);
r = sd_resolve_process(resolve);
if (r < 0)
return r;