fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 00:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

systemd/dhcp: make sd_dhcp_lease_*() functions public again

Browse source 
This reverts systemd-upstream commit
bd91b83e57

  commit bd91b83e578165b4c242c9f34ff1d3be8fb3ab22
  Author: Lennart Poettering <lennart@poettering.net>
  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.
This commit is contained in:
Thomas Haller 2015-09-16 14:53:47 +02:00
parent 3383d5d0a6
commit e82f430eae
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
View file

@ -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)

4
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
View file

@ -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

3
src/systemd/src/systemd/sd-dhcp-lease.h
View file

@ -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