File bug-1063051_0006-cleanup-move-var-declaration.p... of Package lvm2.5953

Overview Repositories Revisions Requests Users Attributes Meta

File bug-1063051_0006-cleanup-move-var-declaration.patch of Package lvm2.5953

From 3813bba48bac98ffe27f86e725d2b0d6d67fd3ff Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 18 Aug 2015 15:47:07 +0200
Subject: [PATCH 07/10] cleanup: move var declaration

(cherry picked from commit abb24370e9bee7e218c333a23c574fed0b4d95ff)
---
 daemons/clvmd/clvmd.c            | 4 ++--
 libdaemon/server/daemon-server.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index b0595b1..2c1cf23 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -864,12 +864,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++;
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index c2230d2..8a185ed 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -537,6 +537,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
@@ -610,7 +611,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)
-- 
2.10.2

Places

File bug-1063051_0006-cleanup-move-var-declaration.patch of Package lvm2.5953

Places