shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

cleanup: move var declaration

Browse Source
This commit is contained in:
Zdenek Kabelac 2015-08-18 15:47:07 +02:00
parent 6e1feb0f73
commit abb24370e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemons/clvmd/clvmd.c
View File

@ -855,12 +855,12 @@ static void main_loop(int cmd_timeout)
int quorate = clops->is_quorate();
int client_count = 0;
int max_fd = 0;
struct local_client *lastfd = &local_client_head;
struct local_client *nextfd = local_client_head.next;
/* Wait on the cluster FD and all local sockets/pipes */
local_client_head.fd = clops->get_main_cluster_fd();
FD_ZERO(&in);
struct local_client *lastfd = &local_client_head;
struct local_client *nextfd = local_client_head.next;
for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) {
client_count++;

2
libdaemon/server/daemon-server.c
View File

@ -539,6 +539,7 @@ void daemon_start(daemon_state s)
log_state _log = { { 0 } };
thread_state _threads = { .next = NULL };
unsigned timeout_count = 0;
fd_set in;
/*
* Switch to C locale to avoid reading large locale-archive file used by
@ -623,7 +624,6 @@ void daemon_start(daemon_state s)
while (!_shutdown_requested && !failed) {
_reset_timeout(s);
fd_set in;
FD_ZERO(&in);
FD_SET(s.socket_fd, &in);
if (select(FD_SETSIZE, &in, NULL, NULL, _get_timeout(s)) < 0 && errno != EINTR)