[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Mon Jul 23 18:02:02 MDT 2012
The branch, master has been updated
via 69e98ff Remove unused variable.
via 644d48d Fix compiler warning message.
via b76d574 Fix incorrect use of server as a talloc context.
via 61cec27 Fix unused variable.
via e5a3218 Fix compiler warning.
via 4c1762c Fix debug print warning message.
via 00050a1 build: Add -Werror=address to the developer build
from 43b070d libcli/smb: pass down smbXcli_session to smb1cli_req_create/send() and smb1cli_trans*
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 69e98ff86c4e90d2259b7a4ea93e45e2ec426bc3
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:35:49 2012 -0700
Remove unused variable.
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Jul 24 02:01:00 CEST 2012 on sn-devel-104
commit 644d48d53946885cb3a6ec52fbc22ead6273f234
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:34:28 2012 -0700
Fix compiler warning message.
commit b76d574b980461cbbf9130ef7945f262faa5d734
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:32:34 2012 -0700
Fix incorrect use of server as a talloc context.
commit 61cec270c269c3a9025bf5303247ec6a1b416284
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:30:46 2012 -0700
Fix unused variable.
commit e5a3218b0ee3a1ac55a1f44fa1c939b2d51002e2
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:30:25 2012 -0700
Fix compiler warning.
commit 4c1762c3a87021002da35609f455e34516de2324
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jul 23 13:21:25 2012 -0700
Fix debug print warning message.
commit 00050a12b07f5e148c57711a22bdf47ab6983931
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jul 23 19:25:11 2012 +1000
build: Add -Werror=address to the developer build
Signed-off-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 2 +-
source3/printing/print_iprint.c | 2 +-
source3/rpc_server/rpc_server.c | 1 -
source3/rpcclient/cmd_fss.c | 4 ++--
source3/smbd/close.c | 1 -
source3/smbd/reply.c | 2 +-
source4/ldap_server/ldap_backend.c | 4 +++-
7 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index be5e926..3e4b06a 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -622,7 +622,7 @@ def SAMBA_CONFIG_H(conf, path=None):
if Options.options.developer:
# we add these here to ensure that -Wstrict-prototypes is not set during configure
- conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common',
+ conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes -fno-common -Werror=address',
testflags=True)
conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
conf.env.DEVELOPER_MODE = True
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index 7cb1999..ad61a0a 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -95,7 +95,7 @@ static const char *iprint_server(void)
{
const char *server = lp_iprint_server(talloc_tos());
- if ((lp_iprint_server(server) != NULL) && (strlen(server) > 0)) {
+ if ((server != NULL) && (strlen(server) > 0)) {
DEBUG(10, ("iprint server explicitly set to %s\n",
server));
return server;
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 5e51f52..1a5fa57 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -64,7 +64,6 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
int *perrno)
{
struct pipes_struct *p;
- NTSTATUS status;
int ret;
ret = make_base_pipes_struct(mem_ctx, msg_ctx, pipe_name,
diff --git a/source3/rpcclient/cmd_fss.c b/source3/rpcclient/cmd_fss.c
index a9e4394..af194e2 100644
--- a/source3/rpcclient/cmd_fss.c
+++ b/source3/rpcclient/cmd_fss.c
@@ -314,7 +314,7 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
}
printf("%s: prepare completed in %llu secs\n",
GUID_string(tmp_ctx, r_scset_start.out.pShadowCopySetId),
- (uint64_t)(time_mono(NULL) - start_time));
+ (long long unsigned int)(time_mono(NULL) - start_time));
start_time = time_mono(NULL);
ZERO_STRUCT(r_scset_commit);
@@ -328,7 +328,7 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
}
printf("%s: commit completed in %llu secs\n",
GUID_string(tmp_ctx, r_scset_start.out.pShadowCopySetId),
- (uint64_t)(time_mono(NULL) - start_time));
+ (long long unsigned int)(time_mono(NULL) - start_time));
ZERO_STRUCT(r_scset_expose);
r_scset_expose.in.ShadowCopySetId = *r_scset_start.out.pShadowCopySetId;
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 3c5b6d7..d4b9ad0 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -708,7 +708,6 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
connection_struct *conn = fsp->conn;
if (fsp->num_aio_requests != 0) {
- char *str;
/*
* reply_close and the smb2 close must have taken care of
* this. No other callers of close_file should ever have
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 97abc85..c043bb6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4945,7 +4945,7 @@ static void do_smb1_close(struct tevent_req *req)
reply_nterror(smbreq, status);
}
if (!srv_send_smb(smbreq->sconn,
- smbreq->outbuf,
+ (char *)smbreq->outbuf,
true,
smbreq->seqnum+1,
IS_CONN_ENCRYPTED(smbreq->conn)||smbreq->encrypted,
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 000d7e2..f415e9b 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -1205,7 +1205,9 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
if (NT_STATUS_IS_OK(status)) {
lastts = (time_t *)ldb_get_opaque(samdb, DSDB_OPAQUE_LAST_SCHEMA_UPDATE_MSG_OPAQUE_NAME);
if (lastts && !*lastts) {
- DEBUG(10, ("Schema update now was requested, fullfilling the request ts = %d\n", lastts));
+ DEBUG(10, ("Schema update now was requested, "
+ "fullfilling the request ts = %d\n",
+ (int)*lastts));
/*
* Just requesting the schema will do the trick
* as the delay for reload is experied, we will have a reload
--
Samba Shared Repository
More information about the samba-cvs
mailing list