Move cli_api_pipe() to its only user cli_pipe.c

diff --git a/source3/include/proto.h b/source3/include/proto.h
index a3791348482f4cd8a9ad3239bcacddd6958c8e9f..9a0ba9a4015ad13958cbe650d1e6fa4081bca7ac 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2629,12 +2629,6 @@ void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, bool _numeric, voi
 
 /* The following definitions come from libsmb/clirap.c  */
 
-bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
-                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
-                  char *params, uint32 param_count, uint32 max_param_count,
-                  char *data, uint32 data_count, uint32 max_data_count,
-                  char **rparam, uint32 *rparam_count,
-                  char **rdata, uint32 *rdata_count);
 bool cli_api(struct cli_state *cli,
             char *param, int prcnt, int mprcnt,
             char *data, int drcnt, int mdrcnt,

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index eee8636fdd6379c51fd08f4bf0ca16b1b5910402..1656d9eb1cfef6e46980063e5471585603aafacb 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -21,29 +21,6 @@
 
 #include "includes.h"
 
-/****************************************************************************
- Call a remote api on an arbitrary pipe.  takes param, data and setup buffers.
-****************************************************************************/
-
-bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
-                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
-                  char *params, uint32 param_count, uint32 max_param_count,
-                  char *data, uint32 data_count, uint32 max_data_count,
-                  char **rparam, uint32 *rparam_count,
-                  char **rdata, uint32 *rdata_count)
-{
-       cli_send_trans(cli, SMBtrans,
-                 pipe_name,
-                 0,0,                         /* fid, flags */
-                 setup, setup_count, max_setup_count,
-                 params, param_count, max_param_count,
-                 data, data_count, max_data_count);
-
-       return (cli_receive_trans(cli, SMBtrans,
-                            rparam, (unsigned int *)rparam_count,
-                            rdata, (unsigned int *)rdata_count));
-}
-
 /****************************************************************************
  Call a remote api
 ****************************************************************************/

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 3fd31e2867605ef985380b863cdbfd6d6b75ff2a..c87df0901975fd93d8645492aeb5155a4692b72a 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -833,6 +833,32 @@ static NTSTATUS cli_pipe_reset_current_pdu(struct rpc_pipe_client *cli, RPC_HDR
        return NT_STATUS_OK;
 }
 
+/****************************************************************************
+ Call a remote api on an arbitrary pipe.  takes param, data and setup buffers.
+****************************************************************************/
+
+static bool cli_api_pipe(struct cli_state *cli, const char *pipe_name,
+                        uint16 *setup, uint32 setup_count,
+                        uint32 max_setup_count,
+                        char *params, uint32 param_count,
+                        uint32 max_param_count,
+                        char *data, uint32 data_count,
+                        uint32 max_data_count,
+                        char **rparam, uint32 *rparam_count,
+                        char **rdata, uint32 *rdata_count)
+{
+       cli_send_trans(cli, SMBtrans,
+                 pipe_name,
+                 0,0,                         /* fid, flags */
+                 setup, setup_count, max_setup_count,
+                 params, param_count, max_param_count,
+                 data, data_count, max_data_count);
+
+       return (cli_receive_trans(cli, SMBtrans,
+                            rparam, (unsigned int *)rparam_count,
+                            rdata, (unsigned int *)rdata_count));
+}
+
 /****************************************************************************
  Send data on an rpc pipe via trans. The prs_struct data must be the last
  pdu fragment of an NDR data stream.