[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-1018-g0de001a

[Michael Adam]

The branch, v3-2-test has been updated
       via  0de001a5446545b928eb88e1916b4fe674017424 (commit)
       via  04d671b8c9bd5bf811e6dbd6981f1874eb49740c (commit)
      from  f8fb9b7e3759bec7fbcf93b27438ca6b03202ddb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0de001a5446545b928eb88e1916b4fe674017424
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 20 22:06:37 2008 +0200

    rpc_parse: fix "assignment discards qualifier" warning by using CONST_DISCARD.
    
    Michael

commit 04d671b8c9bd5bf811e6dbd6981f1874eb49740c
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 20 21:49:01 2008 +0200

    vfs_cacheprime: fix C++ warning - make implicit cast explicit
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_cacheprime.c |    2 +-
 source/rpc_parse/parse_rpc.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_cacheprime.c b/source/modules/vfs_cacheprime.c
index be934f6..fed051c 100644
--- a/source/modules/vfs_cacheprime.c
+++ b/source/modules/vfs_cacheprime.c
@@ -54,7 +54,7 @@ static bool prime_cache(
         SMB_OFF_T * last;
         ssize_t nread;
 
-        last = VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T);
+        last = (SMB_OFF_T *)VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T);
         if (!last) {
                 return False;
         }
diff --git a/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c
index 893eb57..d0be83b 100644
--- a/source/rpc_parse/parse_rpc.c
+++ b/source/rpc_parse/parse_rpc.c
@@ -262,7 +262,7 @@ void init_rpc_context(RPC_CONTEXT *rpc_ctx, uint16 context_id,
 	rpc_ctx->abstract = *abstract;
 
 	/* vers. of interface to use for replies */
-	rpc_ctx->transfer = transfer;
+	rpc_ctx->transfer = CONST_DISCARD(RPC_IFACE *, transfer);
 }
 
 /*******************************************************************


-- 
Samba Shared Repository