svn commit: samba r24718 - in branches/SAMBA_4_0: . source/lib/registry source/lib/registry/tests

[jelmer at samba.org]

Author: jelmer
Date: 2007-08-27 18:56:46 +0000 (Mon, 27 Aug 2007)
New Revision: 24718

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24718

Log:
Fix some compiler warnings.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/registry/rpc.c
   branches/SAMBA_4_0/source/lib/registry/tests/diff.c
   branches/SAMBA_4_0/source/lib/registry/tests/registry.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/registry/rpc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/rpc.c	2007-08-27 18:43:18 UTC (rev 24717)
+++ branches/SAMBA_4_0/source/lib/registry/rpc.c	2007-08-27 18:56:46 UTC (rev 24718)
@@ -90,7 +90,7 @@
 
 static WERROR rpc_query_key(const struct registry_key *k);
 
-static WERROR rpc_get_predefined_key(struct registry_context *ctx, 
+static WERROR rpc_get_predefined_key(const struct registry_context *ctx, 
 									 uint32_t hkey_type, 
 									 struct registry_key **k)
 {
@@ -336,7 +336,8 @@
 static WERROR rpc_get_info(TALLOC_CTX *mem_ctx, const struct registry_key *key,
 						   const char **classname, 
 						   uint32_t *numsubkeys,
-						   uint32_t *numvalue)
+						   uint32_t *numvalue,
+						   NTTIME *last_changed_time)
 {
 	struct rpc_key *mykeydata = talloc_get_type(key, struct rpc_key);
 	WERROR error;
@@ -347,8 +348,14 @@
 	}
 			
 	/* FIXME: *classname = talloc_strdup(mem_ctx, mykeydata->classname); */
-	*numvalue = mykeydata->num_values;
-	*numsubkeys = mykeydata->num_subkeys;
+	/* FIXME: *last_changed_time = mykeydata->last_changed_time */
+
+	if (numvalue != NULL)
+		*numvalue = mykeydata->num_values;
+
+	if (numsubkeys != NULL)
+		*numsubkeys = mykeydata->num_subkeys;
+
 	return WERR_OK;
 }
 
@@ -360,6 +367,7 @@
 	.create_key = rpc_add_key,
 	.delete_key = rpc_del_key,
 	.get_key_info = rpc_get_info,
+	.get_predefined_key = rpc_get_predefined_key,
 };
 
 _PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, 
@@ -394,6 +402,7 @@
 	}
 
 	*ctx = (struct registry_context *)rctx;
+	(*ctx)->ops = &reg_backend_rpc;
 
 	return WERR_OK;
 }

Modified: branches/SAMBA_4_0/source/lib/registry/tests/diff.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tests/diff.c	2007-08-27 18:43:18 UTC (rev 24717)
+++ branches/SAMBA_4_0/source/lib/registry/tests/diff.c	2007-08-27 18:56:46 UTC (rev 24718)
@@ -45,9 +45,7 @@
 
 static bool test_diff_apply(struct torture_context *test)
 {
-	/*
-_PUBLIC_ WERROR reg_diff_apply (const char *filename, struct registry_context *ctx)
-	*/
+	/* _PUBLIC_ WERROR reg_diff_apply (const char *filename, struct registry_context *ctx) */
 
 	return true;
 }

Modified: branches/SAMBA_4_0/source/lib/registry/tests/registry.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tests/registry.c	2007-08-27 18:43:18 UTC (rev 24717)
+++ branches/SAMBA_4_0/source/lib/registry/tests/registry.c	2007-08-27 18:56:46 UTC (rev 24718)
@@ -87,7 +87,7 @@
 	struct registry_key *root;
 	WERROR error;
 
-	error = reg_get_predefined_key_by_name(tctx, "BLA", &root);
+	error = reg_get_predefined_key_by_name(rctx, "BLA", &root);
 	torture_assert_werr_equal(tctx, error, WERR_BADFILE,
 						   "getting predefined key failed");
 	return true;