dhcp: several coding style cleanups

- rename arguments for storing results,
- reorder arguments to move ret_xyz at the end,
- add several missing assertions.

diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c
index f08eef01c968d4ca969b6afe4b96bad533807c9f..4384a05d96af4f87b8ae8c5d9f32480c12c29623 100644 (file)
--- a/src/libsystemd-network/dhcp-packet.c
+++ b/src/libsystemd-network/dhcp-packet.c
@@ -22,13 +22,15 @@ int dhcp_message_init(
                 const uint8_t *chaddr,
                 uint8_t type,
                 size_t optlen,
-                size_t *optoffset) {
+                size_t *ret_optoffset) {
 
         size_t offset = 0;
         int r;
 
+        assert(message);
         assert(IN_SET(op, BOOTREQUEST, BOOTREPLY));
         assert(chaddr || hlen == 0);
+        assert(ret_optoffset);
 
         message->op = op;
         message->htype = arp_type;
@@ -55,8 +57,7 @@ int dhcp_message_init(
         if (r < 0)
                 return r;
 
-        *optoffset = offset;
-
+        *ret_optoffset = offset;
         return 0;
 }
 

diff --git a/src/libsystemd-network/dhcp-packet.h b/src/libsystemd-network/dhcp-packet.h
index c289daa038e079d21cba418e07051ad0e2082990..ab29ab616a29bf14719267ccb1da95bfe337dd39 100644 (file)
--- a/src/libsystemd-network/dhcp-packet.h
+++ b/src/libsystemd-network/dhcp-packet.h
@@ -13,7 +13,7 @@ int dhcp_message_init(
                 const uint8_t *chaddr,
                 uint8_t type,
                 size_t optlen,
-                size_t *optoffset);
+                size_t *ret_optoffset);
 
 uint16_t dhcp_packet_checksum(uint8_t *buf, size_t len);
 

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 7e2ce91a314b45f6ca463cfa83712abf3410ccf2..c7565aec798e8082d5a0bbc0d55a85f569dcf201 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -764,10 +764,10 @@ static int cmp_uint8(const uint8_t *a, const uint8_t *b) {
 
 static int client_message_init(
                 sd_dhcp_client *client,
-                DHCPPacket **ret,
                 uint8_t type,
-                size_t *_optlen,
-                size_t *_optoffset) {
+                DHCPPacket **ret_packet,
+                size_t *ret_optlen,
+                size_t *ret_optoffset) {
 
         _cleanup_free_ DHCPPacket *packet = NULL;
         size_t optlen, optoffset, size;
@@ -776,11 +776,10 @@ static int client_message_init(
         int r;
 
         assert(client);
-        assert(client->start_time);
-        assert(ret);
-        assert(_optlen);
-        assert(_optoffset);
         assert(IN_SET(type, DHCP_DISCOVER, DHCP_REQUEST, DHCP_RELEASE, DHCP_DECLINE));
+        assert(ret_packet);
+        assert(ret_optlen);
+        assert(ret_optoffset);
 
         optlen = DHCP_MIN_OPTIONS_SIZE;
         size = sizeof(DHCPPacket) + optlen;
@@ -900,9 +899,9 @@ static int client_message_init(
                         return r;
         }
 
-        *_optlen = optlen;
-        *_optoffset = optoffset;
-        *ret = TAKE_PTR(packet);
+        *ret_optlen = optlen;
+        *ret_optoffset = optoffset;
+        *ret_packet = TAKE_PTR(packet);
 
         return 0;
 }
@@ -1020,8 +1019,7 @@ static int client_send_discover(sd_dhcp_client *client) {
         assert(client);
         assert(IN_SET(client->state, DHCP_STATE_INIT, DHCP_STATE_SELECTING));
 
-        r = client_message_init(client, &discover, DHCP_DISCOVER,
-                                &optlen, &optoffset);
+        r = client_message_init(client, DHCP_DISCOVER, &discover, &optlen, &optoffset);
         if (r < 0)
                 return r;
 
@@ -1077,7 +1075,7 @@ static int client_send_request(sd_dhcp_client *client) {
 
         assert(client);
 
-        r = client_message_init(client, &request, DHCP_REQUEST, &optlen, &optoffset);
+        r = client_message_init(client, DHCP_REQUEST, &request, &optlen, &optoffset);
         if (r < 0)
                 return r;
 
@@ -2224,7 +2222,7 @@ int sd_dhcp_client_send_release(sd_dhcp_client *client) {
         if (!sd_dhcp_client_is_running(client) || !client->lease)
                 return 0; /* do nothing */
 
-        r = client_message_init(client, &release, DHCP_RELEASE, &optlen, &optoffset);
+        r = client_message_init(client, DHCP_RELEASE, &release, &optlen, &optoffset);
         if (r < 0)
                 return r;
 
@@ -2262,7 +2260,7 @@ int sd_dhcp_client_send_decline(sd_dhcp_client *client) {
         if (!sd_dhcp_client_is_running(client) || !client->lease)
                 return 0; /* do nothing */
 
-        r = client_message_init(client, &release, DHCP_DECLINE, &optlen, &optoffset);
+        r = client_message_init(client, DHCP_DECLINE, &release, &optlen, &optoffset);
         if (r < 0)
                 return r;