5 files changed, 3 insertions, 48 deletions
diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 407d0d3345..76de2f041f 100644
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -127,13 +127,6 @@ WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, const char *
 	return WERR_BADFILE;
 }
 
-WERROR reg_close (struct registry_context *ctx)
-{
-	talloc_free(ctx);
-
-	return WERR_OK;
-}
-
 WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t hkey, struct registry_key **key)
 {
 	WERROR ret = ctx->get_predefined_key(ctx, hkey, key);
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index d4fdc59d70..e12cff186a 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -139,44 +139,6 @@ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *da
 	return True;
 }
 
-WERROR reg_key_get_subkey_val(TALLOC_CTX *mem_ctx, struct registry_key *key, const char *subname, const char *valname, struct registry_value **val)
-{
-	struct registry_key *k;
-	WERROR error = reg_key_get_subkey_by_name(mem_ctx, key, subname, &k);
-	if(!W_ERROR_IS_OK(error)) return error;
-	
-	return reg_key_get_value_by_name(mem_ctx, k, valname, val);
-}
-
-/***********************************************************************
- Utility function for splitting the base path of a registry path off
- by setting base and new_path to the apprapriate offsets withing the
- path.
- 
- WARNING!!  Does modify the original string!
- ***********************************************************************/
-
-BOOL reg_split_path( char *path, char **base, char **new_path )
-{
-	char *p;
-	
-	*new_path = *base = NULL;
-	
-	if ( !path)
-		return False;
-	
-	*base = path;
-	
-	p = strchr( path, '\\' );
-	
-	if ( p ) {
-		*p = '\0';
-		*new_path = p+1;
-	}
-	
-	return True;
-}
-
 /**
  * Replace all \'s with /'s
  */
diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index 5240cf5696..88cce2584e 100644
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -77,7 +77,7 @@ struct rpc_key_data {
 	int max_valdatalen;
 };
 
-struct {
+static struct {
 	uint32_t hkey;
 	WERROR (*open) (struct dcerpc_pipe *p, TALLOC_CTX *, struct policy_handle *h);
 } known_hives[] = {
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 2462fd8241..aeb418560d 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -576,7 +576,7 @@ typedef struct command_ops_s {
   int (*exec_cmd)(CMD *cmd);
 } CMD_OPS;
 
-CMD_OPS default_cmd_ops[] = {
+static CMD_OPS default_cmd_ops[] = {
   {0, regedit4_file_type, regedit4_get_cmd, regedit4_exec_cmd},
   {1, editreg_1_0_file_type, editreg_1_0_get_cmd, editreg_1_0_exec_cmd},
   {-1,  NULL, NULL, NULL}
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index bb7533e55e..ecc2bfc7aa 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -187,7 +187,7 @@ static struct registry_key *cmd_exit(TALLOC_CTX *mem_ctx, struct registry_contex
 
 static struct registry_key *cmd_help(TALLOC_CTX *mem_ctx, struct registry_context *ctx,struct registry_key *, int, char **);
 
-struct {
+static struct {
 	const char *name;
 	const char *alias;
 	const char *help;