tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / network / tc / htb.c

diff --git a/src/network/tc/htb.c b/src/network/tc/htb.c
index f50b0e50107e0934b152418829e417cf29462d6b..eb2c8cfff4cd14ee415a923261bf4c6c713733da 100644 (file)
--- a/src/network/tc/htb.c
+++ b/src/network/tc/htb.c
@@ -59,13 +59,12 @@ int config_parse_hierarchy_token_bucket_default_class(
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         HierarchyTokenBucket *htb;
-        Network *network = data;
+        Network *network = ASSERT_PTR(data);
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = qdisc_new_static(QDISC_KIND_HTB, network, filename, section_line, &qdisc);
         if (r == -ENOMEM)
@@ -112,13 +111,12 @@ int config_parse_hierarchy_token_bucket_u32(
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         HierarchyTokenBucket *htb;
-        Network *network = data;
+        Network *network = ASSERT_PTR(data);
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = qdisc_new_static(QDISC_KIND_HTB, network, filename, section_line, &qdisc);
         if (r == -ENOMEM)
@@ -255,14 +253,13 @@ int config_parse_hierarchy_token_bucket_class_u32(
 
         _cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
         HierarchyTokenBucketClass *htb;
-        Network *network = data;
+        Network *network = ASSERT_PTR(data);
         uint32_t v;
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
         if (r == -ENOMEM)
@@ -309,14 +306,13 @@ int config_parse_hierarchy_token_bucket_class_size(
 
         _cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
         HierarchyTokenBucketClass *htb;
-        Network *network = data;
+        Network *network = ASSERT_PTR(data);
         uint64_t v;
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
         if (r == -ENOMEM)
@@ -393,14 +389,13 @@ int config_parse_hierarchy_token_bucket_class_rate(
 
         _cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
         HierarchyTokenBucketClass *htb;
-        Network *network = data;
+        Network *network = ASSERT_PTR(data);
         uint64_t *v;
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
         if (r == -ENOMEM)