r25035: Fix some more warnings, use service pointer rather than service number in more places.

(This used to be commit df9cebcb97e20564359097148665bd519f31bc6f)

3 files changed, 6 insertions, 6 deletions

diff --git a/source4/torture/ndr/lsa.c b/source4/torture/ndr/lsa.c
index 768c8db63e..a72a03fa38 100644
--- a/source4/torture/ndr/lsa.c
+++ b/source4/torture/ndr/lsa.c
@@ -1747,7 +1747,7 @@ static const uint8_t lsarlookupsids3_out_data[] = {
 };
 
 static bool lsarlookupsids3_out_check(struct torture_context *tctx, 
-									 struct lsa_LookupSids3 *r)
+				      struct lsa_LookupSids3 *r)
 {
 	/* FIXME: Handle */
 	torture_assert(tctx, r->out.names != NULL, "names ptr");
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 5c7dfc7c29..18ede54867 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -36,7 +36,7 @@ static bool wrap_ndr_pull_test(struct torture_context *tctx,
 							   struct torture_test *test)
 {
 	bool (*check_fn) (struct torture_context *ctx, void *data) = test->fn;
-	const struct ndr_pull_test_data *data = test->data;
+	const struct ndr_pull_test_data *data = (const struct ndr_pull_test_data *)test->data;
 	void *ds = talloc_zero_size(tctx, data->struct_size);
 	struct ndr_pull *ndr = ndr_pull_init_blob(&(data->data), tctx);
 
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index d7c956efd6..ab256a7152 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -240,7 +240,7 @@ static const uint8_t querymultiplevalues_in_data[] = {
 };
 
 static bool querymultiplevalues_in_check(struct torture_context *tctx, 
-										 struct winreg_QueryMultipleValues *r)
+					 struct winreg_QueryMultipleValues *r)
 {
 	torture_assert_int_equal(tctx, r->in.num_values, 1, "num values");
 	torture_assert_str_equal(tctx, r->in.values[0].name->name, "HOMEPATH", 
@@ -272,7 +272,7 @@ static const uint8_t querymultiplevalues_out_data[] = {
 };
 
 static bool querymultiplevalues_out_check(struct torture_context *tctx, 
-										 struct winreg_QueryMultipleValues *r)
+					  struct winreg_QueryMultipleValues *r)
 {
 	torture_assert_str_equal(tctx, r->out.values[0].name->name, "HOMEPATH", 
 							 "name");
@@ -458,7 +458,7 @@ static const uint8_t getkeysecurity_in_data[] = {
 };
 
 static bool getkeysecurity_in_check(struct torture_context *tctx, 
-									struct winreg_GetKeySecurity *r)
+				    struct winreg_GetKeySecurity *r)
 {
 	/* FIXME: Handle */
 	torture_assert_int_equal(tctx, r->in.sec_info, 2, "sec info");
@@ -476,7 +476,7 @@ static const uint8_t getkeysecurity_out_data[] = {
 };
 
 static bool getkeysecurity_out_check(struct torture_context *tctx, 
-									 struct winreg_GetKeySecurity *r)
+				     struct winreg_GetKeySecurity *r)
 {
 	torture_assert_int_equal(tctx, r->in.sd->size, 20, "sd size");
 	torture_assert_int_equal(tctx, r->in.sd->len, 20, "sd len");