From 21a2d68ebae1abead01fa34a6b9542c536959605 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Feb 2015 12:34:04 +0100 Subject: dhcp: remove local modifications initializing cleanup variables I cannot reproduce any compiler warnings with these changes. I think it is desirable, that our version is as similar as possible as the systemd provided ones. Undo these local modifications. --- .../systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c | 2 +- .../systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c | 2 +- .../systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c | 2 +- src/dhcp-manager/systemd-dhcp/src/shared/fileio.c | 6 ++++-- src/dhcp-manager/systemd-dhcp/src/shared/util.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c index 4a2792cca7..d3cc1b8cd4 100644 --- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c +++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c @@ -401,7 +401,7 @@ static void client_stop(sd_dhcp_client *client, int error) { static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, uint8_t type, size_t *_optlen, size_t *_optoffset) { - _cleanup_free_ DHCPPacket *packet = NULL; + _cleanup_free_ DHCPPacket *packet; size_t optlen, optoffset, size; be16_t max_size; usec_t time_now; diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c index ee6d72dffc..14658742c7 100644 --- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c @@ -672,7 +672,7 @@ int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { r = sd_dhcp_lease_get_client_id(lease, &client_id, &client_id_len); if (r >= 0) { - _cleanup_free_ char *client_id_hex = NULL; + _cleanup_free_ char *client_id_hex; client_id_hex = hexmem (client_id, client_id_len); if (!client_id_hex) { diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c index d53fc64484..e6f963667f 100644 --- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c @@ -846,7 +846,7 @@ static int client_receive_message(sd_event_source *s, int fd, uint32_t revents, void *userdata) { sd_dhcp6_client *client = userdata; DHCP6_CLIENT_DONT_DESTROY(client); - _cleanup_free_ DHCP6Message *message = NULL; + _cleanup_free_ DHCP6Message *message; int r, buflen, len; assert(s); diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c index 84fd50495f..88b15fb4af 100644 --- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c +++ b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c @@ -510,15 +510,17 @@ static int parse_env_file_push( va_list aq, *ap = userdata; if (!utf8_is_valid(key)) { - _cleanup_free_ char *p = utf8_escape_invalid(key); + _cleanup_free_ char *p; + p = utf8_escape_invalid(key); log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.", strna(filename), line, p); return -EINVAL; } if (value && !utf8_is_valid(value)) { - _cleanup_free_ char *p = utf8_escape_invalid(value); + _cleanup_free_ char *p; + p = utf8_escape_invalid(value); log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", strna(filename), line, key, p); return -EINVAL; } diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c index dcf713d6ed..d1dc229689 100644 --- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c +++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c @@ -3696,7 +3696,7 @@ char *ellipsize(const char *s, size_t length, unsigned percent) { } int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode) { - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd; int r; assert(path); -- cgit v1.2.1