X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Fsd-dhcp6-client.c;h=ab4d9e8f4202e034fa1fc08d9fe08b2a3ec7e154;hb=6ec60d20724d2a32e20d25ef75d2af178c242bc2;hp=ef5fb44c4da049f981f3613e4bf7c271ce23d91e;hpb=c806ffb9592fa9a2b13a1f9f9be4c77cd5b211aa;p=elogind.git

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index ef5fb44c4..ab4d9e8f4 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -310,7 +310,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
         sd_dhcp6_client *client = userdata;
         usec_t time_now, init_retransmit_time, max_retransmit_time;
         usec_t max_retransmit_duration;
-        uint8_t max_retransmit_count;
+        uint8_t max_retransmit_count = 0;
         char time_string[FORMAT_TIMESPAN_MAX];
 
         assert(s);
@@ -434,7 +434,7 @@ static int client_ensure_iaid(sd_dhcp6_client *client) {
         if (detect_container(NULL) <= 0) {
                 /* not in a container, udev will be around */
                 _cleanup_udev_unref_ struct udev *udev;
-                _cleanup_udev_device_unref_ struct udev_device *device;
+                _cleanup_udev_device_unref_ struct udev_device *device = NULL;
                 char ifindex_str[2 + DECIMAL_STR_MAX(int)];
 
                 udev = udev_new();
@@ -650,7 +650,7 @@ static int client_receive_message(sd_event_source *s, int fd, uint32_t revents,
 
         len = read(fd, message, buflen);
         if ((size_t)len < sizeof(DHCP6Message)) {
-                log_dhcp6_client(client, "could not receive message from UDP socket: %s", strerror(errno));
+                log_dhcp6_client(client, "could not receive message from UDP socket: %m");
                 return 0;
         }