Robert Shearman : rpcrt4: Rename protseq_ops to connection_ops to reflect the fact that

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 92c3979433ca668f1212964b500bd2dc496d3d9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=92c3979433ca668f1212964b50...

Author: Robert Shearman 
Date:   Mon Oct 16 16:47:39 2006 +0100

rpcrt4: Rename protseq_ops to connection_ops to reflect the fact that
the functions operate on an RpcConnection object, not an
RpcServerProtseq object.

---

dlls/rpcrt4/rpc_binding.h   |    6 +++---
 dlls/rpcrt4/rpc_transport.c |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h
index bf089a6..221918d 100644
--- a/dlls/rpcrt4/rpc_binding.h
+++ b/dlls/rpcrt4/rpc_binding.h
@@ -36,7 +36,7 @@ typedef struct _RpcAuthInfo
   TimeStamp exp;
 } RpcAuthInfo;

-struct protseq_ops;
+struct connection_ops;

typedef struct _RpcConnection
 {
@@ -45,7 +45,7 @@ typedef struct _RpcConnection
   BOOL server;
   LPSTR NetworkAddr;
   LPSTR Endpoint;
-  const struct protseq_ops *ops;
+  const struct connection_ops *ops;
   USHORT MaxTransmissionSize;
   /* The active interface bound to server. */
   RPC_SYNTAX_IDENTIFIER ActiveInterface;
@@ -61,7 +61,7 @@ typedef struct _RpcConnection
   struct list conn_pool_entry;
 } RpcConnection;

-struct protseq_ops {
+struct connection_ops {
   const char *name;
   unsigned char epm_protocols[2]; /* only floors 3 and 4. see http://www.opengroup.org/onlinepubs/9629399/apdxl.htm */
   RpcConnection *(*alloc)(void);
diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c
index a84e2c5..0f11bfa 100644
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -709,7 +709,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa
     return RPC_S_OK;
 }

-static const struct protseq_ops protseq_list[] = {
+static const struct connection_ops protseq_list[] = {
   { "ncacn_np",
     { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB },
     rpcrt4_conn_np_alloc,
@@ -750,7 +750,7 @@ static const struct protseq_ops protseq_

#define MAX_PROTSEQ (sizeof protseq_list / sizeof protseq_list[0])

-static const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq)
+static const struct connection_ops *rpcrt4_get_protseq_ops(const char *protseq)
 {
   int i;
   for(i=0; i<MAX_PROTSEQ; i++)
@@ -779,7 +779,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo
     LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint,
     LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcBinding* Binding)
 {
-  const struct protseq_ops *ops;
+  const struct connection_ops *ops;
   RpcConnection* NewConnection;

ops = rpcrt4_get_protseq_ops(Protseq);
@@ -875,7 +875,7 @@ RPC_STATUS RpcTransport_GetTopOfTower(un
                                       const char *endpoint)
 {
     twr_empty_floor_t *protocol_floor;
-    const struct protseq_ops *protseq_ops = rpcrt4_get_protseq_ops(protseq);
+    const struct connection_ops *protseq_ops = rpcrt4_get_protseq_ops(protseq);

*tower_size = 0;

@@ -913,7 +913,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(
 {
     const twr_empty_floor_t *protocol_floor;
     const twr_empty_floor_t *floor4;
-    const struct protseq_ops *protseq_ops = NULL;
+    const struct connection_ops *protseq_ops = NULL;
     RPC_STATUS status;
     int i;