picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libsystemd-bus: use assert_return

Browse source
This commit is contained in:
Lukasz Skalski 2013-12-09 14:09:25 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent d838db0d3b
commit f7e2bd5a80
4 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libsystemd-bus/bus-error.c
View file

@ -39,8 +39,7 @@ static int bus_error_name_to_errno(const char *name) {
const char *p;
int r;
if (!name)
return EINVAL;
assert_return(name, EINVAL);
p = startswith(name, "System.Error.");
if (p) {

12
src/libsystemd-bus/bus-kernel.c
View file

@ -321,9 +321,7 @@ int bus_kernel_take_fd(sd_bus *b) {
int r;
assert(b);
if (b->is_server)
return -EINVAL;
assert_return(!b->is_server, -EINVAL);
b->use_memfd = 1;
@ -375,9 +373,7 @@ int bus_kernel_connect(sd_bus *b) {
assert(b->input_fd < 0);
assert(b->output_fd < 0);
assert(b->kernel);
if (b->is_server)
return -EINVAL;
assert_return(!b->is_server, -EINVAL);
b->input_fd = open(b->kernel, O_RDWR|O_NOCTTY|O_CLOEXEC);
if (b->input_fd < 0)
@ -918,9 +914,7 @@ int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *size) {
assert(address);
assert(size);
if (!bus || !bus->is_kernel)
return -ENOTSUP;
assert_return(bus && bus->is_kernel, -ENOTSUP);
assert_se(pthread_mutex_lock(&bus->memfd_cache_mutex) >= 0);

12
src/libsystemd-bus/bus-message.c
View file

@ -161,9 +161,7 @@ static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz, b
size_t old_size, new_size, start;
assert(m);
if (m->poisoned)
return NULL;
assert_return(!m->poisoned, NULL);
old_size = sizeof(struct bus_header) + m->header->fields_size;
start = ALIGN_TO(old_size, align);
@ -989,9 +987,7 @@ struct bus_body_part *message_append_part(sd_bus_message *m) {
struct bus_body_part *part;
assert(m);
if (m->poisoned)
return NULL;
assert_return(!m->poisoned, NULL);
if (m->n_body_parts <= 0) {
part = &m->body;
@ -1138,9 +1134,7 @@ static void *message_extend_body(sd_bus_message *m, size_t align, size_t sz, boo
assert(m);
assert(align > 0);
assert(!m->sealed);
if (m->poisoned)
return NULL;
assert_return(!m->poisoned, NULL);
start_body = ALIGN_TO((size_t) m->header->body_size, align);
end_body = start_body + sz;

13
src/libsystemd-bus/bus-signature.c
View file

@ -33,9 +33,7 @@ static int signature_element_length_internal(
int r;
if (!s)
return -EINVAL;
assert_return(s, -EINVAL);
assert(l);
if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
@ -117,8 +115,7 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
int r;
size_t t;
if (!s)
return false;
assert_return(s, false);
r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
if (r < 0)
@ -129,8 +126,7 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
bool signature_is_pair(const char *s) {
if (!s)
return false;
assert_return(s, false);
if (!bus_type_is_basic(*s))
return false;
@ -142,8 +138,7 @@ bool signature_is_valid(const char *s, bool allow_dict_entry) {
const char *p;
int r;
if (!s)
return false;
assert_return(s, false);
p = s;
while (*p) {