chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: types - don't assert_return in private API
[elogind.git]
/
src
/
libsystemd
/
sd-rtnl
/
rtnl-types.c
diff --git
a/src/libsystemd/sd-rtnl/rtnl-types.c
b/src/libsystemd/sd-rtnl/rtnl-types.c
index 3f4ba2e0f0eb9bea4524d09821c4c09968c63fef..40dee56e98a03386853485820e9038577a1a38cd 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/
src/libsystemd/sd-rtnl/rtnl-types.c
@@
-23,6
+23,7
@@
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
+#include <linux/in6.h>
#include <linux/veth.h>
#include <linux/if_bridge.h>
#include <linux/if_addr.h>
#include <linux/veth.h>
#include <linux/if_bridge.h>
#include <linux/if_addr.h>
@@
-464,8
+465,7
@@
int type_system_get_type_system(const NLTypeSystem *type_system, const NLTypeSys
if (r < 0)
return r;
if (r < 0)
return r;
- assert_return(nl_type->type == NLA_NESTED, -EINVAL);
-
+ assert(nl_type->type == NLA_NESTED);
assert(nl_type->type_system);
*ret = nl_type->type_system;
assert(nl_type->type_system);
*ret = nl_type->type_system;
@@
-483,8
+483,7
@@
int type_system_get_type_system_union(const NLTypeSystem *type_system, const NLT
if (r < 0)
return r;
if (r < 0)
return r;
- assert_return(nl_type->type == NLA_UNION, -EINVAL);
-
+ assert(nl_type->type == NLA_UNION);
assert(nl_type->type_system_union);
*ret = nl_type->type_system_union;
assert(nl_type->type_system_union);
*ret = nl_type->type_system_union;
@@
-496,7
+495,7
@@
int type_system_union_get_type_system(const NLTypeSystemUnion *type_system_union
int type;
assert(type_system_union);
int type;
assert(type_system_union);
- assert
_return(type_system_union->match_type == NL_MATCH_SIBLING, -EINVAL
);
+ assert
(type_system_union->match_type == NL_MATCH_SIBLING
);
assert(type_system_union->lookup);
assert(type_system_union->type_systems);
assert(ret);
assert(type_system_union->lookup);
assert(type_system_union->type_systems);
assert(ret);
@@
-518,9
+517,8
@@
int type_system_union_protocol_get_type_system(const NLTypeSystemUnion *type_sys
assert(type_system_union);
assert(type_system_union->type_systems);
assert(type_system_union);
assert(type_system_union->type_systems);
+ assert(type_system_union->match_type == NL_MATCH_PROTOCOL);
assert(ret);
assert(ret);
- assert_return(type_system_union->match_type == NL_MATCH_PROTOCOL, -EINVAL);
- assert_return(protocol < type_system_union->num, -EINVAL);
if (protocol >= type_system_union->num)
return -ENOTSUP;
if (protocol >= type_system_union->num)
return -ENOTSUP;