r15483: Fix 'declaration after code' warnings.
authorVolker Lendecke <vlendec@samba.org>
Sun, 7 May 2006 09:21:39 +0000 (09:21 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:16:54 +0000 (11:16 -0500)
Volker
(This used to be commit 7729799be9984a02a2a309289067b7500696e657)

source3/nmbd/nmbd_elections.c

index 6e8e8429becba31f767a2e32e231714ed86d78c4..50e13729361e2ca39660c3b934eb315bba03004b 100644 (file)
@@ -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",