Merge disorder.macros branch.

[disorder] / server / state.c

diff --git a/server/state.c b/server/state.c
index e9525561a84daf8d79c846b6864baa5da952ab6e..f88067b80eb8dd7b094fc62793d22bf28d64f6e2 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -69,14 +69,10 @@ static void reset_socket(ev_source *ev) {
   char *name;
   
   static const struct addrinfo pref = {
-    AI_PASSIVE,
-    PF_INET,
-    SOCK_STREAM,
-    IPPROTO_TCP,
-    0,
-    0,
-    0,
-    0
+    .ai_flags = AI_PASSIVE,
+    .ai_family = PF_INET,
+    .ai_socktype = SOCK_STREAM,
+    .ai_protocol = IPPROTO_TCP,
   };
 
   /* unix first */
@@ -158,7 +154,7 @@ int reconfigure(ev_source *ev, int reload) {
     /* We only allow for upgrade at startup */
     trackdb_open(TRACKDB_CAN_UPGRADE);
   if(need_another_rescan)
-    trackdb_rescan(ev, 1/*check*/);
+    trackdb_rescan(ev, 1/*check*/, 0, 0);
   if(!ret) {
     queue_read();
     recent_read();