From 56065db4214a62a4d9ed4465333fcded35322aa8 Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Mon, 21 Sep 2015 16:51:31 +0200 Subject: sd-ipv4ll: do not assert_return when seed == 0 Now that seed is an unsigned and not an array, we do not need to assert on it. --- src/libsystemd-network/sd-ipv4ll.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index f0230b919c..f065e3e3e0 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -202,7 +202,6 @@ int sd_ipv4ll_set_address_seed(sd_ipv4ll *ll, unsigned seed) { int r; assert_return(ll, -EINVAL); - assert_return(seed, -EINVAL); random_data = new0(struct random_data, 1); if (!random_data) -- cgit v1.2.3-54-g00ecf From 5625be76c755c99f8b41d7fe84156ebc732b454c Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Mon, 21 Sep 2015 16:49:59 +0200 Subject: test-ipv4ll: use unsigned instead of an array for a seed ipv4ll use an unsigned instead of an uint8_t array. Hence, use an unsigned seed instead of declaring an array and then dereferencing it later. --- src/libsystemd-network/test-ipv4ll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c index f0e26bda07..44551e8f82 100644 --- a/src/libsystemd-network/test-ipv4ll.c +++ b/src/libsystemd-network/test-ipv4ll.c @@ -100,7 +100,7 @@ int arp_network_bind_raw_socket(int index, be32_t address, const struct ether_ad } static void test_public_api_setters(sd_event *e) { - uint8_t seed[8]; + unsigned seed = 0; sd_ipv4ll *ll; struct ether_addr mac_addr = { .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}}; @@ -118,8 +118,8 @@ static void test_public_api_setters(sd_event *e) { assert_se(sd_ipv4ll_set_callback(NULL, NULL, NULL) == -EINVAL); assert_se(sd_ipv4ll_set_callback(ll, NULL, NULL) == 0); - assert_se(sd_ipv4ll_set_address_seed(NULL, *(unsigned *) seed) == -EINVAL); - assert_se(sd_ipv4ll_set_address_seed(ll, *(unsigned *) seed) == 0); + assert_se(sd_ipv4ll_set_address_seed(NULL, seed) == -EINVAL); + assert_se(sd_ipv4ll_set_address_seed(ll, seed) == 0); assert_se(sd_ipv4ll_set_mac(NULL, NULL) == -EINVAL); assert_se(sd_ipv4ll_set_mac(ll, NULL) == -EINVAL); -- cgit v1.2.3-54-g00ecf