svn commit: samba r26645 - in branches/SAMBA_4_0: .
source/cluster/ctdb source/torture/libnet
jelmer at samba.org
jelmer at samba.org
Wed Jan 2 18:39:12 GMT 2008
Author: jelmer
Date: 2008-01-02 18:39:11 +0000 (Wed, 02 Jan 2008)
New Revision: 26645
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26645
Log:
Janitorial: Fix a couple of warnings.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c
branches/SAMBA_4_0/source/torture/libnet/libnet_share.c
branches/SAMBA_4_0/source/torture/libnet/libnet_user.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/cluster/ctdb/brlock_ctdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2008-01-02 18:39:01 UTC (rev 26644)
+++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2008-01-02 18:39:11 UTC (rev 26645)
@@ -102,7 +102,7 @@
talloc_free(). We need the messaging_ctx to allow for
pending lock notifications.
*/
-static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server,
+static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, struct loadparm_context *lp_ctx,
struct messaging_context *messaging_ctx)
{
struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(),
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c 2008-01-02 18:39:01 UTC (rev 26644)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c 2008-01-02 18:39:11 UTC (rev 26645)
@@ -36,7 +36,7 @@
TALLOC_CTX *mem_ctx;
struct libnet_context *ctx;
struct libnet_Lookup lookup;
- struct dcerpc_binding *bind;
+ struct dcerpc_binding *binding;
mem_ctx = talloc_init("test_lookup");
@@ -45,9 +45,9 @@
lookup.in.hostname = torture_setting_string(torture, "host", NULL);
if (lookup.in.hostname == NULL) {
- status = torture_rpc_binding(torture, &bind);
+ status = torture_rpc_binding(torture, &binding);
if (NT_STATUS_IS_OK(status)) {
- lookup.in.hostname = bind->host;
+ lookup.in.hostname = binding->host;
}
}
@@ -80,7 +80,7 @@
TALLOC_CTX *mem_ctx;
struct libnet_context *ctx;
struct libnet_Lookup lookup;
- struct dcerpc_binding *bind;
+ struct dcerpc_binding *binding;
mem_ctx = talloc_init("test_lookup_host");
@@ -89,9 +89,9 @@
lookup.in.hostname = torture_setting_string(torture, "host", NULL);
if (lookup.in.hostname == NULL) {
- status = torture_rpc_binding(torture, &bind);
+ status = torture_rpc_binding(torture, &binding);
if (NT_STATUS_IS_OK(status)) {
- lookup.in.hostname = bind->host;
+ lookup.in.hostname = binding->host;
}
}
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_share.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_share.c 2008-01-02 18:39:01 UTC (rev 26644)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_share.c 2008-01-02 18:39:11 UTC (rev 26645)
@@ -121,11 +121,11 @@
int i;
bool ret = true;
struct libnet_context* libnetctx;
- struct dcerpc_binding *bind;
+ struct dcerpc_binding *binding;
TALLOC_CTX *mem_ctx;
mem_ctx = talloc_init("test_listshares");
- status = torture_rpc_binding(torture, &bind);
+ status = torture_rpc_binding(torture, &binding);
if (!NT_STATUS_IS_OK(status)) {
ret = false;
goto done;
@@ -142,7 +142,7 @@
printf("Testing libnet_ListShare\n");
- share.in.server_name = talloc_asprintf(mem_ctx, "%s", bind->host);
+ share.in.server_name = talloc_asprintf(mem_ctx, "%s", binding->host);
for (i = 0; i < ARRAY_SIZE(levels); i++) {
share.in.level = levels[i];
@@ -199,7 +199,7 @@
bool torture_delshare(struct torture_context *torture)
{
struct dcerpc_pipe *p;
- struct dcerpc_binding *bind;
+ struct dcerpc_binding *binding;
struct libnet_context* libnetctx;
const char *host;
NTSTATUS status;
@@ -207,7 +207,7 @@
struct libnet_DelShare share;
host = torture_setting_string(torture, "host", NULL);
- status = torture_rpc_binding(torture, &bind);
+ status = torture_rpc_binding(torture, &binding);
torture_assert_ntstatus_ok(torture, status, "Failed to get binding");
libnetctx = libnet_context_init(NULL, torture->lp_ctx);
@@ -223,7 +223,7 @@
return false;
}
- share.in.server_name = bind->host;
+ share.in.server_name = binding->host;
share.in.share_name = TEST_SHARENAME;
status = libnet_DelShare(libnetctx, torture, &share);
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_user.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2008-01-02 18:39:01 UTC (rev 26644)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2008-01-02 18:39:11 UTC (rev 26645)
@@ -461,7 +461,7 @@
bool torture_modifyuser(struct torture_context *torture)
{
NTSTATUS status;
- struct dcerpc_binding *bind;
+ struct dcerpc_binding *binding;
struct dcerpc_pipe *p;
TALLOC_CTX *prep_mem_ctx;
struct policy_handle h;
@@ -499,7 +499,7 @@
goto done;
}
- status = torture_rpc_binding(torture, &bind);
+ status = torture_rpc_binding(torture, &binding);
if (!NT_STATUS_IS_OK(status)) {
ret = false;
goto done;
More information about the samba-cvs
mailing list