1111
1212static int address_pool_new (
1313 Manager * m ,
14- AddressPool * * ret ,
1514 int family ,
1615 const union in_addr_union * u ,
1716 unsigned prefixlen ) {
1817
1918 AddressPool * p ;
2019
2120 assert (m );
22- assert (ret );
2321 assert (u );
2422
2523 p = new (AddressPool , 1 );
@@ -35,13 +33,11 @@ static int address_pool_new(
3533
3634 LIST_PREPEND (address_pools , m -> address_pools , p );
3735
38- * ret = p ;
3936 return 0 ;
4037}
4138
4239static int address_pool_new_from_string (
4340 Manager * m ,
44- AddressPool * * ret ,
4541 int family ,
4642 const char * p ,
4743 unsigned prefixlen ) {
@@ -50,14 +46,13 @@ static int address_pool_new_from_string(
5046 int r ;
5147
5248 assert (m );
53- assert (ret );
5449 assert (p );
5550
5651 r = in_addr_from_string (family , p , & u );
5752 if (r < 0 )
5853 return r ;
5954
60- return address_pool_new (m , ret , family , & u , prefixlen );
55+ return address_pool_new (m , family , & u , prefixlen );
6156}
6257
6358void address_pool_free (AddressPool * p ) {
@@ -72,26 +67,24 @@ void address_pool_free(AddressPool *p) {
7267}
7368
7469int address_pool_setup_default (Manager * m ) {
75- AddressPool * p ;
7670 int r ;
7771
7872 assert (m );
7973
8074 /* Add in the well-known private address ranges. */
81-
82- r = address_pool_new_from_string (m , & p , AF_INET6 , "fd00::" , 8 );
75+ r = address_pool_new_from_string (m , AF_INET6 , "fd00::" , 8 );
8376 if (r < 0 )
8477 return r ;
8578
86- r = address_pool_new_from_string (m , & p , AF_INET , "10.0.0.0" , 8 );
79+ r = address_pool_new_from_string (m , AF_INET , "10.0.0.0" , 8 );
8780 if (r < 0 )
8881 return r ;
8982
90- r = address_pool_new_from_string (m , & p , AF_INET , "172.16.0.0" , 12 );
83+ r = address_pool_new_from_string (m , AF_INET , "172.16.0.0" , 12 );
9184 if (r < 0 )
9285 return r ;
9386
94- r = address_pool_new_from_string (m , & p , AF_INET , "192.168.0.0" , 16 );
87+ r = address_pool_new_from_string (m , AF_INET , "192.168.0.0" , 16 );
9588 if (r < 0 )
9689 return r ;
9790
0 commit comments