From e82f430eae841032c7961d2eca694435425e4d51 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 16 Sep 2015 14:53:47 +0200 Subject: [PATCH] systemd/dhcp: make sd_dhcp_lease_*() functions public again This reverts systemd-upstream commit https://github.com/systemd/systemd/commit/bd91b83e578165b4c242c9f34ff1d3be8fb3ab22 commit bd91b83e578165b4c242c9f34ff1d3be8fb3ab22 Author: Lennart Poettering Date: Wed Aug 26 20:48:21 2015 dhcp: keep lease save/load functions private When we make sd-dhcp public one day we really should not make sd_dhcp_lease_save() and sd_dhcp_lease_load() public, since it's pretty much only useful as internal utility for networkd itself. --- src/systemd/src/libsystemd-network/dhcp-lease-internal.h | 3 --- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 4 ++-- src/systemd/src/systemd/sd-dhcp-lease.h | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h index c6b97ca8f7..481368ff28 100644 --- a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h @@ -101,8 +101,5 @@ int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease); int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const void *client_id, size_t client_id_len); -int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file); -int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file); - DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref); #define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp) diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c index aa07846693..acbd3dca7e 100644 --- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c @@ -702,7 +702,7 @@ int dhcp_lease_new(sd_dhcp_lease **ret) { return 0; } -int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { +int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; struct sd_dhcp_raw_option *option; @@ -853,7 +853,7 @@ fail: return log_error_errno(r, "Failed to save lease data %s: %m", lease_file); } -int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) { +int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) { _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL; _cleanup_free_ char diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h index ed5bceecdd..0c7c1a22e9 100644 --- a/src/systemd/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/src/systemd/sd-dhcp-lease.h @@ -52,4 +52,7 @@ int sd_dhcp_lease_get_vendor_specific(sd_dhcp_lease *lease, const void **data, s int sd_dhcp_lease_get_client_id(sd_dhcp_lease *lease, const void **client_id, size_t *client_id_len); int sd_dhcp_lease_get_timezone(sd_dhcp_lease *lease, const char **timezone); +int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file); +int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file); + #endif