summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-08-03 16:36:51 +0200
committerLukáš Nykrýn <lnykryn@redhat.com>2019-05-03 12:50:30 +0200
commit03f2823251d39ea455c2e98ae8bf109f6caf153f (patch)
treee311ce7f5f77e88de63959933706e9a67053c897
parent871bb5457c5951870d447f53c976a1a1f2dac85d (diff)
downloadsystemd-03f2823251d39ea455c2e98ae8bf109f6caf153f.tar.gz
bus-message: drop asserts in functions which are wrappers for varargs version
The function does no processing on it's own, and just forwards arguments to the other function. Let's just use the asserts there. (cherry picked from commit 8792bdf8a3311f9e629daa0ec592c97c1cfb2a7c) Resolves: #1696224
-rw-r--r--src/libsystemd/sd-bus/bus-message.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index ac823aaf58..153cdf933b 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -2469,11 +2469,6 @@ _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
va_list ap;
int r;
- assert_return(m, -EINVAL);
- assert_return(types, -EINVAL);
- assert_return(!m->sealed, -EPERM);
- assert_return(!m->poisoned, -ESTALE);
-
va_start(ap, types);
r = sd_bus_message_appendv(m, types, ap);
va_end(ap);
@@ -4524,10 +4519,6 @@ _public_ int sd_bus_message_read(sd_bus_message *m, const char *types, ...) {
va_list ap;
int r;
- assert_return(m, -EINVAL);
- assert_return(m->sealed, -EPERM);
- assert_return(types, -EINVAL);
-
va_start(ap, types);
r = message_read_ap(m, types, ap);
va_end(ap);