s3-nmbd: Cleanup code to make it more readable.

Found by Coverity.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>

diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index b56baedf270dcd101cc751cf486409c7c0224a1f..8bc28ad301bb93665a3ef61c179d4354377caa34 100644 (file)
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -402,7 +402,6 @@ static void get_domain_master_name_node_status_success(struct subnet_record *sub
                                               struct res_rec *answers,
                                               struct in_addr from_ip)
 {
                                               struct res_rec *answers,
                                               struct in_addr from_ip)
 {

-       struct work_record *work;

        unstring server_name;
 
        server_name[0] = 0;
        unstring server_name;
 
        server_name[0] = 0;


@@ -443,6 +442,8 @@ static void get_domain_master_name_node_status_success(struct subnet_record *sub
                        }
 
                        if(!(nb_flags & NB_GROUP) && (name_type == 0x1b)) {
                        }
 
                        if(!(nb_flags & NB_GROUP) && (name_type == 0x1b)) {

+                               struct work_record *work;
+

                                if( DEBUGLVL( 5 ) ) {
                                        dbgtext( "get_domain_master_name_node_status_success:\n" );
                                        dbgtext( "%s(%s) ", server_name, inet_ntoa(from_ip) );
                                if( DEBUGLVL( 5 ) ) {
                                        dbgtext( "get_domain_master_name_node_status_success:\n" );
                                        dbgtext( "%s(%s) ", server_name, inet_ntoa(from_ip) );


@@ -455,13 +456,16 @@ static void get_domain_master_name_node_status_success(struct subnet_record *sub
                                 * to the workgroup list on the unicast_subnet.
                                 */
 
                                 * to the workgroup list on the unicast_subnet.
                                 */
 

-                               if((work = find_workgroup_on_subnet( subrec, qname)) == NULL) {
+                               work = find_workgroup_on_subnet( subrec, qname);
+                               if (work == NULL) {

                                        struct nmb_name nmbname;
                                        /* 
                                         * Add it - with an hour in the cache.
                                         */
                                        struct nmb_name nmbname;
                                        /* 
                                         * Add it - with an hour in the cache.
                                         */

-                                       if(!(work= create_workgroup_on_subnet(subrec, qname, 60*60)))
+                                       work = create_workgroup_on_subnet(subrec, qname, 60*60);
+                                       if (work == NULL) {

                                                return;
                                                return;

+                                       }

 
                                        /* remember who the master is */
                                        strlcpy(work->local_master_browser_name,
 
                                        /* remember who the master is */
                                        strlcpy(work->local_master_browser_name,