Automatic merge
This commit is contained in:
commit
8a31819d03
@ -470,6 +470,8 @@ ssize_t log_flush_timeout_ms = 0;
|
||||
for (n = 0; n < n_threads - 1; n++)
|
||||
thread_wait(threads[n]);
|
||||
|
||||
free(threads);
|
||||
|
||||
/**
|
||||
* Wait the flush thread.
|
||||
*/
|
||||
|
@ -189,5 +189,6 @@ char *sep, *user;
|
||||
sep = ", ";
|
||||
}
|
||||
dcb_printf(dcb, "\n");
|
||||
hashtable_iterator_free(iter);
|
||||
}
|
||||
}
|
||||
|
@ -265,7 +265,7 @@ int n_connect = 0;
|
||||
{
|
||||
int so;
|
||||
struct sockaddr_in addr;
|
||||
socklen_t addrlen;
|
||||
socklen_t addrlen = sizeof(struct sockaddr);
|
||||
DCB *client;
|
||||
|
||||
if ((so = accept(dcb->fd, (struct sockaddr *)&addr, &addrlen)) == -1)
|
||||
|
Loading…
x
Reference in New Issue
Block a user