Rename written -> w

Author: ssahani

src/netlog/netlog-manager.c

@@ -524,9 +524,11 @@ int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo
                         m->address.sockaddr.in.sin_port = htobe16((uint16_t) m->port);
 
                 sockaddr_pretty(&m->address.sockaddr.sa, m->socklen, true, true, &pretty);
-                m->resolving = false;
 
                 log_debug("Resolved address %s for %s.", pretty, m->server_name);
+
+                /* take the first one */
+                break;
         }
 
         if (!IN_SET(m->address.sockaddr.sa.sa_family, AF_INET, AF_INET6)) {
@@ -536,6 +538,7 @@ int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo
                 return manager_connect(m);
         }
 
+        m->resolving = false;
         return manager_connect(m);
 }
 

src/netlog/netlog-protocol.c

@@ -51,18 +51,18 @@ void format_rfc3339_timestamp(const struct timeval *tv, char *header_time, size_
         char gm_buf[sizeof("+0530") + 1];
         struct tm tm;
         time_t t;
-        size_t written;
+        size_t w;
         int r;
 
         assert(header_time);
 
         t = tv ? tv->tv_sec : ((time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC));
         localtime_r(&t, &tm);
 
-        written = strftime(header_time, header_size, "%Y-%m-%dT%T", &tm);
-        assert(written != 0);
-        header_time += written;
-        header_size -= written;
+        w = strftime(header_time, header_size, "%Y-%m-%dT%T", &tm);
+        assert(w != 0);
+        header_time += w;
+        header_size -= w;
 
         /* add fractional part */
         if (tv) {