[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3954-gf5212c6

Volker Lendecke vlendec at samba.org
Tue Sep 2 10:12:04 GMT 2008


The branch, v3-devel has been updated
       via  f5212c64d23a28fa40a14b45a8d1c0181f01a6da (commit)
      from  977fec76b77639403ba9ab7bb00c57601e23493d (commit)

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


- Log -----------------------------------------------------------------
commit f5212c64d23a28fa40a14b45a8d1c0181f01a6da
Author: Volker Lendecke <vl at sernet.de>
Date:   Tue Sep 2 09:44:39 2008 +0200

    Remove unused CLI_DO_RPC macros

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

Summary of changes:
 source/include/rpc_client.h |   48 -------------------------------------------
 1 files changed, 0 insertions(+), 48 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/rpc_client.h b/source/include/rpc_client.h
index d1af6f9..684044b 100644
--- a/source/include/rpc_client.h
+++ b/source/include/rpc_client.h
@@ -42,54 +42,6 @@
 
 /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */
 
-#define CLI_DO_RPC_INTERNAL( pcli, ctx, interface, opnum, q_in, r_out, \
-                             q_ps, r_ps, q_io_fn, r_io_fn, default_error, copy_sess_key ) \
-{\
-	SMB_ASSERT(ndr_syntax_id_equal(&pcli->abstract_syntax, interface)); \
-	if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \
-		return NT_STATUS_NO_MEMORY;\
-	}\
-	prs_init_empty( &r_ps, ctx, UNMARSHALL );\
-	if ( copy_sess_key) prs_set_session_key(&q_ps, (const char *)pcli->dc->sess_key);\
-	if ( q_io_fn("", &q_in, &q_ps, 0) ) {\
-		NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(pcli, opnum, &q_ps, &r_ps); \
-		if (!NT_STATUS_IS_OK(_smb_pipe_stat_)) {\
-			prs_mem_free( &q_ps );\
-			prs_mem_free( &r_ps );\
-			return _smb_pipe_stat_;\
-		}\
-		if ( copy_sess_key ) prs_set_session_key(&r_ps, (const char *)pcli->dc->sess_key);\
-		if (!r_io_fn("", &r_out, &r_ps, 0)) {\
-			prs_mem_free( &q_ps );\
-			prs_mem_free( &r_ps );\
-			return default_error;\
-		}\
-	} else {\
-		prs_mem_free( &q_ps );\
-		prs_mem_free( &r_ps );\
-		return default_error;\
-	}\
-	prs_mem_free( &q_ps );\
-	prs_mem_free( &r_ps );\
-}
-
-#define CLI_DO_RPC_COPY_SESS_KEY( pcli, ctx, p_idx, opnum, q_in, r_out, \
-				  q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
-{\
-	CLI_DO_RPC_INTERNAL( pcli, ctx, p_idx, opnum, q_in, r_out, \
-			     q_ps, r_ps, q_io_fn, r_io_fn, default_error, True ); \
-}
-
-#define CLI_DO_RPC( pcli, ctx, p_idx, opnum, q_in, r_out, \
-                    q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
-{\
-	CLI_DO_RPC_INTERNAL( pcli, ctx, p_idx, opnum, q_in, r_out, \
-			     q_ps, r_ps, q_io_fn, r_io_fn, default_error, False ); \
-}
-
-
-/* Arrrgg. Same but with WERRORS. Needed for registry code. */
-
 #define CLI_DO_RPC_WERR( pcli, ctx, interface, opnum, q_in, r_out, \
                              q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
 {\


-- 
Samba Shared Repository


More information about the samba-cvs mailing list