fix some warnings found by the Sun C compiler

(This used to be commit 585764305aa84a7732f71f2e01227e1a6a08664f)

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index fd51f3c57d998ac0060eaa0ed96f78782f66d231..e7c200218e231b6b46f7a44d2791c1c9c151838d 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -841,5 +841,5 @@ UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* src)
        strncpy_w(dst->buffer, src, dst->uni_max_len);
        
        return dst;
-};
+}
 

diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 4c86cd0f94bb29e06e58d94de3603259df9387c7..f8a97effee4d17791a1a0a1f3779b64eea552653 100644 (file)
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -330,8 +330,8 @@ BOOL dfs_redirect(char* pathname, connection_struct* conn,
                         pathname));
                return False;
        }
+
        /* never reached */
-       return False;
 }
 
 /**********************************************************************

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 25de4eff716bb1f382a762af370a6a7a93da570b..850a0b1a2d548566bd60441dc26037d6a1276322 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -895,6 +895,5 @@ BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16],
        }
        
        /* Failure */
-       return False;
 }
 

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 635b7e71350fc2785f7237161af4c790988633a1..f985ee9979bb21b26977697a4fb6953b0e00b55a 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -655,7 +655,7 @@ done:
        prs_mem_free(&rbuf);
        
        return result;
-};
+}
 
 /* Enumerate domain groups */
 

diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c
index b01dacd0f5378105022371fd3df9f0622a15273f..bae9a8b9d404fdc81ee1fa310bf7199ab5813741 100644 (file)
--- a/source3/tdb/tdbutil.c
+++ b/source3/tdb/tdbutil.c
@@ -807,7 +807,7 @@ TDB_LIST_NODE *tdb_search_keys(TDB_CONTEXT *tdb, const char* pattern)
        
        return list;
 
-};
+}
 
 
 /**
@@ -825,6 +825,6 @@ void tdb_search_list_free(TDB_LIST_NODE* node)
                SAFE_FREE(node);
                node = next_node;
        };
-};
+}
 
 

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 323f4afbc3b778486d575c50d20352f7b380f9e0..06a8daa7756e3dcbca08e2f6790c7ab095ec26bd 100644 (file)
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -508,9 +508,8 @@ int net_groupmap(int argc, const char **argv)
                return -1;
        }
        
-       return net_run_function(argc, argv, func, net_help_groupmap);
-       if ( 0 == argc )
-               return net_help_groupmap( argc, argv );
+       if ( argc )
+               return net_run_function(argc, argv, func, net_help_groupmap);
 
        return net_help_groupmap( argc, argv );
 }

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index fefc5af3653d93e2efc9067020d3b8ed15e4ab76..85818152d1d833b0dffed9385d62df4414c9da2a 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1976,7 +1976,7 @@ static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, struct cli_state
        sid_to_string(str_sid, domain_sid);
        d_printf("%s\n", str_sid);
        return NT_STATUS_OK;
-};
+}
 
 
 static int rpc_trustdom_list(int argc, const char **argv)