From f7a92d1a7e351886fc1debb7f4b448287d18c20c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 May 2016 12:08:56 -0400 Subject: [PATCH] sd-dhcp: change uint8_t *duid to const void* --- src/libsystemd-network/sd-dhcp-client.c | 2 +- src/libsystemd-network/sd-dhcp6-client.c | 3 ++- src/systemd/sd-dhcp-client.h | 2 +- src/systemd/sd-dhcp6-client.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 15717543554..2ca25c9b337 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -322,7 +322,7 @@ int sd_dhcp_client_set_iaid_duid( sd_dhcp_client *client, uint32_t iaid, uint16_t duid_type, - uint8_t *duid, + const void *duid, size_t duid_len) { DHCP_CLIENT_DONT_DESTROY(client); diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 7dd4990bdae..d3714b174f6 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -189,8 +189,9 @@ static int client_ensure_duid(sd_dhcp6_client *client) { int sd_dhcp6_client_set_duid( sd_dhcp6_client *client, uint16_t duid_type, - uint8_t *duid, + const void *duid, size_t duid_len) { + int r; assert_return(client, -EINVAL); assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY); diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h index 6fcf781d90c..20b8c2873f2 100644 --- a/src/systemd/sd-dhcp-client.h +++ b/src/systemd/sd-dhcp-client.h @@ -116,7 +116,7 @@ int sd_dhcp_client_set_iaid_duid( sd_dhcp_client *client, uint32_t iaid, uint16_t duid_type, - uint8_t *duid, + const void *duid, size_t duid_len); int sd_dhcp_client_get_client_id( sd_dhcp_client *client, diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h index e29bcfdb8c7..90f62eaca4e 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/sd-dhcp6-client.h @@ -96,7 +96,7 @@ int sd_dhcp6_client_set_mac( int sd_dhcp6_client_set_duid( sd_dhcp6_client *client, uint16_t duid_type, - uint8_t *duid, + const void *duid, size_t duid_len); int sd_dhcp6_client_set_iaid( sd_dhcp6_client *client, -- 2.47.3