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/shared/bus-get-properties.h
+1 -2
View File
@@ -75,11 +75,10 @@ int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface
void *userdata, \
sd_bus_error *error) { \
\
data_type *data = userdata; \
data_type *data = ASSERT_PTR(userdata); \
\
assert(bus); \
assert(reply); \
assert(data); \
\
return sd_bus_message_append(reply, bus_type, \
get2(get1(data))); \
src/shared/bus-polkit.c
+1 -2
View File
@@ -197,11 +197,10 @@ static int async_polkit_defer(sd_event_source *s, void *userdata) {
}
static int async_polkit_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
AsyncPolkitQuery *q = userdata;
AsyncPolkitQuery *q = ASSERT_PTR(userdata);
int r;
assert(reply);
assert(q);
assert(q->slot);
q->slot = sd_bus_slot_unref(q->slot);
src/shared/bus-util.c
+1 -2
View File
@@ -23,10 +23,9 @@
#include "stdio-util.h"
static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
sd_event *e = userdata;
sd_event *e = ASSERT_PTR(userdata);
assert(m);
assert(e);
sd_bus_close(sd_bus_message_get_bus(m));
sd_event_exit(e, 0);
src/shared/bus-wait-for-jobs.c
+1 -2
View File
@@ -34,13 +34,12 @@ static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *e
static int match_job_removed(sd_bus_message *m, void *userdata, sd_bus_error *error) {
const char *path, *unit, *result;
BusWaitForJobs *d = userdata;
BusWaitForJobs *d = ASSERT_PTR(userdata);
uint32_t id;
char *found;
int r;
assert(m);
assert(d);
r = sd_bus_message_read(m, "uoss", &id, &path, &unit, &result);
if (r < 0) {
src/shared/bus-wait-for-units.c
+4 -11
View File
@@ -105,10 +105,9 @@ static void bus_wait_for_units_clear(BusWaitForUnits *d) {
}
static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *error) {
BusWaitForUnits *d = userdata;
BusWaitForUnits *d = ASSERT_PTR(userdata);
assert(m);
assert(d);
log_error("Warning! D-Bus connection terminated.");
@@ -229,13 +228,11 @@ static int property_map_job(
sd_bus_error *error,
void *userdata) {
WaitForItem *item = userdata;
WaitForItem *item = ASSERT_PTR(userdata);
const char *path;
uint32_t id;
int r;
assert(item);
r = sd_bus_message_read(m, "(uo)", &id, &path);
if (r < 0)
return r;
@@ -267,12 +264,10 @@ static int wait_for_item_parse_properties(WaitForItem *item, sd_bus_message *m)
}
static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error *error) {
WaitForItem *item = userdata;
WaitForItem *item = ASSERT_PTR(userdata);
const char *interface;
int r;
assert(item);
r = sd_bus_message_read(m, "s", &interface);
if (r < 0) {
log_debug_errno(r, "Failed to parse PropertiesChanged signal: %m");
@@ -290,12 +285,10 @@ static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error
}
static int on_get_all_properties(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
WaitForItem *item = userdata;
WaitForItem *item = ASSERT_PTR(userdata);
const sd_bus_error *e;
int r;
assert(item);
e = sd_bus_message_get_error(m);
if (e) {
BusWaitForUnits *d = item->parent;
src/shared/conf-parser.c
+19 -37
View File
@@ -800,14 +800,13 @@ int config_parse_iec_size(
void *data,
void *userdata) {
size_t *sz = data;
size_t *sz = ASSERT_PTR(data);
uint64_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_size(rvalue, 1024, &v);
if (r >= 0 && (uint64_t) (size_t) v != v)
@@ -833,13 +832,12 @@ int config_parse_si_uint64(
void *data,
void *userdata) {
uint64_t *sz = data;
uint64_t *sz = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_size(rvalue, 1000, sz);
if (r < 0)
@@ -860,13 +858,12 @@ int config_parse_iec_uint64(
void *data,
void *userdata) {
uint64_t *bytes = data;
uint64_t *bytes = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_size(rvalue, 1024, bytes);
if (r < 0)
@@ -887,10 +884,9 @@ int config_parse_iec_uint64_infinity(
void *data,
void *userdata) {
uint64_t *bytes = data;
uint64_t *bytes = ASSERT_PTR(data);
assert(rvalue);
assert(data);
if (streq(rvalue, "infinity")) {
*bytes = UINT64_MAX;
@@ -913,13 +909,12 @@ int config_parse_bool(
void *userdata) {
int k;
bool *b = data;
bool *b = ASSERT_PTR(data);
bool fatal = ltype;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
k = parse_boolean(rvalue);
if (k < 0) {
@@ -979,12 +974,11 @@ int config_parse_tristate(
void *data,
void *userdata) {
int k, *t = data;
int k, *t = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
/* A tristate is pretty much a boolean, except that it can also take an empty string,
* indicating "uninitialized", much like NULL is for a pointer type. */
@@ -1135,13 +1129,12 @@ int config_parse_path(
_cleanup_free_ char *n = NULL;
bool fatal = ltype;
char **s = data;
char **s = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue))
goto finalize;
@@ -1170,13 +1163,12 @@ int config_parse_strv(
void *data,
void *userdata) {
char ***sv = data;
char ***sv = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*sv = strv_free(*sv);
@@ -1374,13 +1366,12 @@ int config_parse_ifname(
void *data,
void *userdata) {
char **s = data;
char **s = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*s = mfree(*s);
@@ -1412,13 +1403,12 @@ int config_parse_ifnames(
void *userdata) {
_cleanup_strv_free_ char **names = NULL;
char ***s = data;
char ***s = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*s = strv_free(*s);
@@ -1471,14 +1461,13 @@ int config_parse_ip_port(
void *data,
void *userdata) {
uint16_t *s = data;
uint16_t *s = ASSERT_PTR(data);
uint16_t port;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*s = 0;
@@ -1508,11 +1497,10 @@ int config_parse_mtu(
void *data,
void *userdata) {
uint32_t *mtu = data;
uint32_t *mtu = ASSERT_PTR(data);
int r;
assert(rvalue);
assert(mtu);
r = parse_mtu(ltype, rvalue, mtu);
if (r == -ERANGE) {
@@ -1582,13 +1570,12 @@ int config_parse_permille(
void *data,
void *userdata) {
unsigned *permille = data;
unsigned *permille = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(permille);
r = parse_permille(rvalue);
if (r < 0) {
@@ -1649,13 +1636,12 @@ int config_parse_hw_addr(
void *data,
void *userdata) {
struct hw_addr_data a, *hwaddr = data;
struct hw_addr_data a, *hwaddr = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*hwaddr = HW_ADDR_NULL;
@@ -1685,13 +1671,12 @@ int config_parse_hw_addrs(
void *data,
void *userdata) {
Set **hwaddrs = data;
Set **hwaddrs = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
/* Empty assignment resets the list */
@@ -1744,13 +1729,12 @@ int config_parse_ether_addr(
void *userdata) {
_cleanup_free_ struct ether_addr *n = NULL;
struct ether_addr **hwaddr = data;
struct ether_addr **hwaddr = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*hwaddr = mfree(*hwaddr);
@@ -1785,13 +1769,12 @@ int config_parse_ether_addrs(
void *data,
void *userdata) {
Set **hwaddrs = data;
Set **hwaddrs = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
/* Empty assignment resets the list */
@@ -1844,15 +1827,14 @@ int config_parse_in_addr_non_null(
void *userdata) {
/* data must be a pointer to struct in_addr or in6_addr, and the type is determined by ltype. */
struct in_addr *ipv4 = data;
struct in6_addr *ipv6 = data;
struct in_addr *ipv4 = ASSERT_PTR(data);
struct in6_addr *ipv6 = ASSERT_PTR(data);
union in_addr_union a;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
assert(IN_SET(ltype, AF_INET, AF_INET6));
if (isempty(rvalue)) {
src/shared/conf-parser.h
+2 -4
View File
@@ -246,13 +246,12 @@ typedef enum ConfigParseStringFlags {
#define DEFINE_CONFIG_PARSE_PTR(function, parser, type, msg) \
CONFIG_PARSER_PROTOTYPE(function) { \
type *i = data; \
type *i = ASSERT_PTR(data); \
int r; \
\
assert(filename); \
assert(lvalue); \
assert(rvalue); \
assert(data); \
\
r = parser(rvalue, i); \
if (r < 0) \
@@ -312,7 +311,7 @@ typedef enum ConfigParseStringFlags {
#define DEFINE_CONFIG_PARSE_ENUMV(function, name, type, invalid, msg) \
CONFIG_PARSER_PROTOTYPE(function) { \
type **enums = data; \
type **enums = ASSERT_PTR(data); \
_cleanup_free_ type *xs = NULL; \
size_t i = 0; \
int r; \
@@ -320,7 +319,6 @@ typedef enum ConfigParseStringFlags {
assert(filename); \
assert(lvalue); \
assert(rvalue); \
assert(data); \
\
xs = new0(type, 1); \
if (!xs) \
src/shared/cpu-set-util.c
+1 -3
View File
@@ -144,9 +144,7 @@ int parse_cpu_set_full(
const char *lvalue) {
_cleanup_(cpu_set_reset) CPUSet c = {};
const char *p = rvalue;
assert(p);
const char *p = ASSERT_PTR(rvalue);
for (;;) {
_cleanup_free_ char *word = NULL;
src/shared/elf-util.c
+3 -6
View File
@@ -177,7 +177,7 @@ static StackContext* stack_context_destroy(StackContext *c) {
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(Elf *, sym_elf_end, NULL);
static int frame_callback(Dwfl_Frame *frame, void *userdata) {
StackContext *c = userdata;
StackContext *c = ASSERT_PTR(userdata);
Dwarf_Addr pc, pc_adjusted;
const char *fname = NULL, *symbol = NULL;
Dwfl_Module *module;
@@ -185,7 +185,6 @@ static int frame_callback(Dwfl_Frame *frame, void *userdata) {
uint64_t module_offset = 0;
assert(frame);
assert(c);
if (c->n_frame >= FRAMES_MAX)
return DWARF_CB_ABORT;
@@ -241,11 +240,10 @@ static int frame_callback(Dwfl_Frame *frame, void *userdata) {
}
static int thread_callback(Dwfl_Thread *thread, void *userdata) {
StackContext *c = userdata;
StackContext *c = ASSERT_PTR(userdata);
pid_t tid;
assert(thread);
assert(c);
if (c->n_thread >= THREADS_MAX)
return DWARF_CB_ABORT;
@@ -424,14 +422,13 @@ static int parse_buildid(Dwfl_Module *mod, Elf *elf, const char *name, StackCont
static int module_callback(Dwfl_Module *mod, void **userdata, const char *name, Dwarf_Addr start, void *arg) {
_cleanup_(json_variant_unrefp) JsonVariant *id_json = NULL;
StackContext *c = arg;
StackContext *c = ASSERT_PTR(arg);
size_t n_program_headers;
GElf_Addr bias;
int r;
Elf *elf;
assert(mod);
assert(c);
if (!name)
name = "(unnamed)"; /* For logging purposes */
src/shared/ethtool-util.c
+2 -4
View File
@@ -1237,14 +1237,13 @@ int config_parse_advertise(
void *data,
void *userdata) {
uint32_t *advertise = data;
uint32_t *advertise = ASSERT_PTR(data);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
/* Empty string resets the value. */
@@ -1334,7 +1333,7 @@ int config_parse_ring_buffer_or_channel(
void *data,
void *userdata) {
u32_opt *dst = data;
u32_opt *dst = ASSERT_PTR(data);
uint32_t k;
int r;
@@ -1342,7 +1341,6 @@ int config_parse_ring_buffer_or_channel(
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
dst->value = 0;
src/shared/exec-util.c
+3 -9
View File
@@ -253,7 +253,7 @@ int execute_directories(
}
static int gather_environment_generate(int fd, void *arg) {
char ***env = arg;
char ***env = ASSERT_PTR(arg);
_cleanup_fclose_ FILE *f = NULL;
_cleanup_strv_free_ char **new = NULL;
int r;
@@ -264,8 +264,6 @@ static int gather_environment_generate(int fd, void *arg) {
* fd is always consumed, even on error.
*/
assert(env);
f = fdopen(fd, "r");
if (!f) {
safe_close(fd);
@@ -295,13 +293,11 @@ static int gather_environment_generate(int fd, void *arg) {
static int gather_environment_collect(int fd, void *arg) {
_cleanup_fclose_ FILE *f = NULL;
char ***env = arg;
char ***env = ASSERT_PTR(arg);
int r;
/* Write out a series of env=cescape(VAR=value) assignments to fd. */
assert(env);
f = fdopen(fd, "w");
if (!f) {
safe_close(fd);
@@ -321,13 +317,11 @@ static int gather_environment_collect(int fd, void *arg) {
static int gather_environment_consume(int fd, void *arg) {
_cleanup_fclose_ FILE *f = NULL;
char ***env = arg;
char ***env = ASSERT_PTR(arg);
int r = 0;
/* Read a series of env=cescape(VAR=value) assignments from fd into env. */
assert(env);
f = fdopen(fd, "r");
if (!f) {
safe_close(fd);
src/shared/in-addr-prefix-util.c
+1 -2
View File
@@ -218,10 +218,9 @@ int config_parse_in_addr_prefixes(
void *data,
void *userdata) {
Set **prefixes = data;
Set **prefixes = ASSERT_PTR(data);
int r;
assert(prefixes);
assert(IN_SET(ltype, AF_UNSPEC, AF_INET, AF_INET6));
if (isempty(rvalue)) {
src/shared/json.c
+9 -18
View File
@@ -4322,10 +4322,9 @@ int json_dispatch(JsonVariant *v, const JsonDispatch table[], JsonDispatchCallba
}
int json_dispatch_boolean(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
bool *b = userdata;
bool *b = ASSERT_PTR(userdata);
assert(variant);
assert(b);
if (!json_variant_is_boolean(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a boolean.", strna(name));
@@ -4335,10 +4334,9 @@ int json_dispatch_boolean(const char *name, JsonVariant *variant, JsonDispatchFl
}
int json_dispatch_tristate(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
int *b = userdata;
int *b = ASSERT_PTR(userdata);
assert(variant);
assert(b);
if (json_variant_is_null(variant)) {
*b = -1;
@@ -4353,10 +4351,9 @@ int json_dispatch_tristate(const char *name, JsonVariant *variant, JsonDispatchF
}
int json_dispatch_int64(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
int64_t *i = userdata;
int64_t *i = ASSERT_PTR(userdata);
assert(variant);
assert(i);
if (!json_variant_is_integer(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name));
@@ -4366,10 +4363,9 @@ int json_dispatch_int64(const char *name, JsonVariant *variant, JsonDispatchFlag
}
int json_dispatch_uint64(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
uint64_t *u = userdata;
uint64_t *u = ASSERT_PTR(userdata);
assert(variant);
assert(u);
if (!json_variant_is_unsigned(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an unsigned integer.", strna(name));
@@ -4379,10 +4375,9 @@ int json_dispatch_uint64(const char *name, JsonVariant *variant, JsonDispatchFla
}
int json_dispatch_uint32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
uint32_t *u = userdata;
uint32_t *u = ASSERT_PTR(userdata);
assert(variant);
assert(u);
if (!json_variant_is_unsigned(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an unsigned integer.", strna(name));
@@ -4395,10 +4390,9 @@ int json_dispatch_uint32(const char *name, JsonVariant *variant, JsonDispatchFla
}
int json_dispatch_int32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
int32_t *i = userdata;
int32_t *i = ASSERT_PTR(userdata);
assert(variant);
assert(i);
if (!json_variant_is_integer(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name));
@@ -4411,11 +4405,10 @@ int json_dispatch_int32(const char *name, JsonVariant *variant, JsonDispatchFlag
}
int json_dispatch_string(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
char **s = userdata;
char **s = ASSERT_PTR(userdata);
int r;
assert(variant);
assert(s);
if (json_variant_is_null(variant)) {
*s = mfree(*s);
@@ -4436,10 +4429,9 @@ int json_dispatch_string(const char *name, JsonVariant *variant, JsonDispatchFla
}
int json_dispatch_const_string(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
const char **s = userdata;
const char **s = ASSERT_PTR(userdata);
assert(variant);
assert(s);
if (json_variant_is_null(variant)) {
*s = NULL;
@@ -4458,12 +4450,11 @@ int json_dispatch_const_string(const char *name, JsonVariant *variant, JsonDispa
int json_dispatch_strv(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
_cleanup_strv_free_ char **l = NULL;
char ***s = userdata;
char ***s = ASSERT_PTR(userdata);
JsonVariant *e;
int r;
assert(variant);
assert(s);
if (json_variant_is_null(variant)) {
*s = strv_free(*s);
src/shared/loopback-setup.c
+1 -2
View File
@@ -21,10 +21,9 @@ struct state {
};
static int generic_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
struct state *s = userdata;
struct state *s = ASSERT_PTR(userdata);
int r;
assert(s);
assert(s->n_messages > 0);
s->n_messages--;
src/shared/net-condition.c
+6 -12
View File
@@ -233,15 +233,13 @@ int config_parse_match_strv(
void *data,
void *userdata) {
const char *p = rvalue;
char ***sv = data;
const char *p = ASSERT_PTR(rvalue);
char ***sv = ASSERT_PTR(data);
bool invert;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*sv = strv_free(*sv);
@@ -290,15 +288,13 @@ int config_parse_match_ifnames(
void *data,
void *userdata) {
const char *p = rvalue;
char ***sv = data;
const char *p = ASSERT_PTR(rvalue);
char ***sv = ASSERT_PTR(data);
bool invert;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*sv = strv_free(*sv);
@@ -353,15 +349,13 @@ int config_parse_match_property(
void *data,
void *userdata) {
const char *p = rvalue;
char ***sv = data;
const char *p = ASSERT_PTR(rvalue);
char ***sv = ASSERT_PTR(data);
bool invert;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*sv = strv_free(*sv);
src/shared/netif-sriov.c
+6 -12
View File
@@ -359,14 +359,13 @@ int config_parse_sr_iov_uint32(
void *userdata) {
_cleanup_(sr_iov_free_or_set_invalidp) SRIOV *sr_iov = NULL;
OrderedHashmap **sr_iov_by_section = data;
OrderedHashmap **sr_iov_by_section = ASSERT_PTR(data);
uint32_t k;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = sr_iov_new_static(sr_iov_by_section, filename, section_line, &sr_iov);
if (r < 0)
@@ -427,13 +426,12 @@ int config_parse_sr_iov_vlan_proto(
void *userdata) {
_cleanup_(sr_iov_free_or_set_invalidp) SRIOV *sr_iov = NULL;
OrderedHashmap **sr_iov_by_section = data;
OrderedHashmap **sr_iov_by_section = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = sr_iov_new_static(sr_iov_by_section, filename, section_line, &sr_iov);
if (r < 0)
@@ -466,13 +464,12 @@ int config_parse_sr_iov_link_state(
void *userdata) {
_cleanup_(sr_iov_free_or_set_invalidp) SRIOV *sr_iov = NULL;
OrderedHashmap **sr_iov_by_section = data;
OrderedHashmap **sr_iov_by_section = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = sr_iov_new_static(sr_iov_by_section, filename, section_line, &sr_iov);
if (r < 0)
@@ -518,13 +515,12 @@ int config_parse_sr_iov_boolean(
void *userdata) {
_cleanup_(sr_iov_free_or_set_invalidp) SRIOV *sr_iov = NULL;
OrderedHashmap **sr_iov_by_section = data;
OrderedHashmap **sr_iov_by_section = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = sr_iov_new_static(sr_iov_by_section, filename, section_line, &sr_iov);
if (r < 0)
@@ -576,13 +572,12 @@ int config_parse_sr_iov_mac(
void *userdata) {
_cleanup_(sr_iov_free_or_set_invalidp) SRIOV *sr_iov = NULL;
OrderedHashmap **sr_iov_by_section = data;
OrderedHashmap **sr_iov_by_section = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = sr_iov_new_static(sr_iov_by_section, filename, section_line, &sr_iov);
if (r < 0)
@@ -617,13 +612,12 @@ int config_parse_sr_iov_num_vfs(
void *data,
void *userdata) {
uint32_t n, *num_vfs = data;
uint32_t n, *num_vfs = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*num_vfs = UINT32_MAX;
src/shared/parse-helpers.c
+1 -2
View File
@@ -144,9 +144,8 @@ int parse_socket_bind_item(
parse_token_f const *parser_ptr = parsers;
int af = AF_UNSPEC, proto = 0, r;
uint16_t nr = 0, mn = 0;
const char *p = str;
const char *p = ASSERT_PTR(str);
assert(str);
assert(address_family);
assert(ip_protocol);
assert(nr_ports);
src/shared/pkcs11-util.c
+2 -4
View File
@@ -978,7 +978,7 @@ static int pkcs11_acquire_certificate_callback(
void *userdata) {
_cleanup_(erase_and_freep) char *pin_used = NULL;
struct pkcs11_acquire_certificate_callback_data *data = userdata;
struct pkcs11_acquire_certificate_callback_data *data = ASSERT_PTR(userdata);
CK_OBJECT_HANDLE object;
int r;
@@ -986,7 +986,6 @@ static int pkcs11_acquire_certificate_callback(
assert(slot_info);
assert(token_info);
assert(uri);
assert(data);
/* Called for every token matching our URI */
@@ -1200,7 +1199,7 @@ int pkcs11_crypt_device_callback(
P11KitUri *uri,
void *userdata) {
pkcs11_crypt_device_callback_data *data = userdata;
pkcs11_crypt_device_callback_data *data = ASSERT_PTR(userdata);
CK_OBJECT_HANDLE object;
int r;
@@ -1208,7 +1207,6 @@ int pkcs11_crypt_device_callback(
assert(slot_info);
assert(token_info);
assert(uri);
assert(data);
/* Called for every token matching our URI */
src/shared/ptyfwd.c
+4 -8
View File
@@ -338,9 +338,8 @@ static int shovel(PTYForward *f) {
}
static int on_master_event(sd_event_source *e, int fd, uint32_t revents, void *userdata) {
PTYForward *f = userdata;
PTYForward *f = ASSERT_PTR(userdata);
assert(f);
assert(e);
assert(e == f->master_event_source);
assert(fd >= 0);
@@ -356,9 +355,8 @@ static int on_master_event(sd_event_source *e, int fd, uint32_t revents, void *u
}
static int on_stdin_event(sd_event_source *e, int fd, uint32_t revents, void *userdata) {
PTYForward *f = userdata;
PTYForward *f = ASSERT_PTR(userdata);
assert(f);
assert(e);
assert(e == f->stdin_event_source);
assert(fd >= 0);
@@ -371,9 +369,8 @@ static int on_stdin_event(sd_event_source *e, int fd, uint32_t revents, void *us
}
static int on_stdout_event(sd_event_source *e, int fd, uint32_t revents, void *userdata) {
PTYForward *f = userdata;
PTYForward *f = ASSERT_PTR(userdata);
assert(f);
assert(e);
assert(e == f->stdout_event_source);
assert(fd >= 0);
@@ -386,10 +383,9 @@ static int on_stdout_event(sd_event_source *e, int fd, uint32_t revents, void *u
}
static int on_sigwinch_event(sd_event_source *e, const struct signalfd_siginfo *si, void *userdata) {
PTYForward *f = userdata;
PTYForward *f = ASSERT_PTR(userdata);
struct winsize ws;
assert(f);
assert(e);
assert(e == f->sigwinch_event_source);
src/shared/tpm2-util.c
+1 -3
View File
@@ -1736,12 +1736,10 @@ int tpm2_find_device_auto(
}
int tpm2_parse_pcrs(const char *s, uint32_t *ret) {
const char *p = s;
const char *p = ASSERT_PTR(s);
uint32_t mask = 0;
int r;
assert(s);
if (isempty(s)) {
*ret = 0;
return 0;
src/shared/udev-util.c
+1 -2
View File
@@ -136,11 +136,10 @@ static void device_monitor_data_free(struct DeviceMonitorData *d) {
}
static int device_monitor_handler(sd_device_monitor *monitor, sd_device *device, void *userdata) {
struct DeviceMonitorData *data = userdata;
struct DeviceMonitorData *data = ASSERT_PTR(userdata);
const char *sysname;
assert(device);
assert(data);
assert(data->sysname || data->devlink);
assert(!data->device);
src/shared/user-record.c
+1 -3
View File
@@ -355,12 +355,10 @@ static int json_dispatch_rlimits(const char *name, JsonVariant *variant, JsonDis
}
static int json_dispatch_filename_or_path(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) {
char **s = userdata;
char **s = ASSERT_PTR(userdata);
const char *n;
int r;
assert(s);
if (json_variant_is_null(variant)) {
*s = mfree(*s);
return 0;
src/shared/userdb.c
+1 -3
View File
@@ -153,11 +153,9 @@ static int userdb_on_query_reply(
VarlinkReplyFlags flags,
void *userdata) {
UserDBIterator *iterator = userdata;
UserDBIterator *iterator = ASSERT_PTR(userdata);
int r;
assert(iterator);
if (error_id) {
log_debug("Got lookup error: %s", error_id);
src/shared/varlink.c
+6 -12
View File
@@ -1861,10 +1861,9 @@ int varlink_set_description(Varlink *v, const char *description) {
}
static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
Varlink *v = userdata;
Varlink *v = ASSERT_PTR(userdata);
assert(s);
assert(v);
handle_revents(v, revents);
(void) varlink_process(v);
@@ -1873,33 +1872,30 @@ 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) {
Varlink *v = userdata;
Varlink *v = ASSERT_PTR(userdata);
assert(s);
assert(v);
(void) varlink_process(v);
return 1;
}
static int defer_callback(sd_event_source *s, void *userdata) {
Varlink *v = userdata;
Varlink *v = ASSERT_PTR(userdata);
assert(s);
assert(v);
(void) varlink_process(v);
return 1;
}
static int prepare_callback(sd_event_source *s, void *userdata) {
Varlink *v = userdata;
Varlink *v = ASSERT_PTR(userdata);
int r, e;
usec_t until;
bool have_timeout;
assert(s);
assert(v);
e = varlink_get_events(v);
if (e < 0)
@@ -1928,10 +1924,9 @@ static int prepare_callback(sd_event_source *s, void *userdata) {
}
static int quit_callback(sd_event_source *event, void *userdata) {
Varlink *v = userdata;
Varlink *v = ASSERT_PTR(userdata);
assert(event);
assert(v);
varlink_flush(v);
varlink_close(v);
@@ -2203,13 +2198,12 @@ int varlink_server_add_connection(VarlinkServer *server, int fd, Varlink **ret)
}
static int connect_callback(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
VarlinkServerSocket *ss = userdata;
VarlinkServerSocket *ss = ASSERT_PTR(userdata);
_cleanup_close_ int cfd = -1;
Varlink *v = NULL;
int r;
assert(source);
assert(ss);
varlink_server_log(ss->server, "New incoming connection.");
src/shared/vlan-util.c
+2 -4
View File
@@ -49,11 +49,10 @@ int config_parse_default_port_vlanid(
const char *rvalue,
void *data,
void *userdata) {
uint16_t *id = data;
uint16_t *id = ASSERT_PTR(data);
assert(lvalue);
assert(rvalue);
assert(data);
if (streq(rvalue, "none")) {
*id = 0;
@@ -76,13 +75,12 @@ int config_parse_vlanid(
void *data,
void *userdata) {
uint16_t *id = data;
uint16_t *id = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_vlanid(rvalue, id);
if (r == -ERANGE) {