From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 7 May 2006 09:21:39 +0000 (+0000)
Subject: r15483: Fix 'declaration after code' warnings.
X-Git-Tag: samba-4.0.0alpha6~801^2~8481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce5f1afc75d0ece2ebc06eb06ec404c2a8467480;p=thirdparty%2Fsamba.git

r15483: Fix 'declaration after code' warnings.

Volker
(This used to be commit 7729799be9984a02a2a309289067b7500696e657)
---

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 6e8e8429bec..50e13729361 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -166,13 +166,16 @@ void run_elections(time_t t)
   
 	struct subnet_record *subrec;
   
+	START_PROFILE(run_elections);
+
 	/* Send election packets once every 2 seconds - note */
-	if (lastime && (t - lastime < 2))
+	if (lastime && (t - lastime < 2)) {
+		END_PROFILE(run_elections);
 		return;
+	}
   
 	lastime = t;
   
-	START_PROFILE(run_elections);
 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
 		struct work_record *work;
 
@@ -267,10 +270,11 @@ void process_election(struct subnet_record *subrec, struct packet_struct *p, cha
 	struct work_record *work;
 	unstring workgroup_name;
 
+	START_PROFILE(election);
+
 	pull_ascii_nstring(server_name, sizeof(server_name), buf+13);
 	pull_ascii_nstring(workgroup_name, sizeof(workgroup_name), dgram->dest_name.name);
 
-	START_PROFILE(election);
 	server_name[15] = 0;  
 
 	DEBUG(3,("process_election: Election request from %s at IP %s on subnet %s for workgroup %s.\n",