[PATCH 2/13] rpcrt4: Make some parameters of non-exported functions const.

Robert Shearman rob at codeweavers.com
Mon Mar 26 12:14:27 CDT 2007


---
  dlls/rpcrt4/rpc_binding.c |   24 ++++++++++++------------
  dlls/rpcrt4/rpc_binding.h |    4 ++--
  2 files changed, 14 insertions(+), 14 deletions(-)
-------------- next part --------------
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index b554e7f..807921b 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -110,7 +110,7 @@ static RPC_STATUS RPCRT4_AllocBinding(Rp
   return RPC_S_OK;
 }
 
-static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq)
+static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPCSTR Protseq)
 {
   RpcBinding* NewBinding;
 
@@ -123,7 +123,7 @@ static RPC_STATUS RPCRT4_CreateBindingA(
   return RPC_S_OK;
 }
 
-static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq)
+static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPCWSTR Protseq)
 {
   RpcBinding* NewBinding;
 
@@ -136,8 +136,8 @@ static RPC_STATUS RPCRT4_CreateBindingW(
   return RPC_S_OK;
 }
 
-static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr,
-                                          LPSTR Endpoint, LPSTR NetworkOptions)
+static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPCSTR NetworkAddr,
+                                          LPCSTR Endpoint, LPCSTR NetworkOptions)
 {
   RPC_STATUS status;
 
@@ -165,8 +165,8 @@ static RPC_STATUS RPCRT4_CompleteBinding
   return RPC_S_OK;
 }
 
-static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr,
-                                          LPWSTR Endpoint, LPWSTR NetworkOptions)
+static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPCWSTR NetworkAddr,
+                                          LPCWSTR Endpoint, LPCWSTR NetworkOptions)
 {
   RPC_STATUS status;
 
@@ -194,7 +194,7 @@ static RPC_STATUS RPCRT4_CompleteBinding
   return RPC_S_OK;
 }
 
-RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint)
+RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint)
 {
   RPC_STATUS status;
 
@@ -214,7 +214,7 @@ RPC_STATUS RPCRT4_ResolveBinding(RpcBind
   return RPC_S_OK;
 }
 
-RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid)
+RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid)
 {
   TRACE("(*RpcBinding == ^%p, UUID == %s)\n", Binding, debugstr_guid(ObjectUuid)); 
   if (ObjectUuid) memcpy(&Binding->ObjectUuid, ObjectUuid, sizeof(UUID));
@@ -838,17 +838,17 @@ RPC_STATUS WINAPI RpcBindingToStringBind
 {
   RPC_STATUS ret;
   RpcBinding* bind = (RpcBinding*)Binding;
-  LPSTR ObjectUuid;
+  RPC_CSTR ObjectUuid;
 
   TRACE("(%p,%p)\n", Binding, StringBinding);
 
-  ret = UuidToStringA(&bind->ObjectUuid, (unsigned char**)&ObjectUuid);
+  ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid);
   if (ret != RPC_S_OK) return ret;
 
-  ret = RpcStringBindingComposeA((unsigned char*) ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr,
+  ret = RpcStringBindingComposeA(ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr,
                                  (unsigned char*) bind->Endpoint, NULL, StringBinding);
 
-  RpcStringFreeA((unsigned char**)&ObjectUuid);
+  RpcStringFreeA(&ObjectUuid);
 
   return ret;
 }
diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h
index 2ad90f8..5328ac0 100644
--- a/dlls/rpcrt4/rpc_binding.h
+++ b/dlls/rpcrt4/rpc_binding.h
@@ -144,8 +144,8 @@ RPC_STATUS RPCRT4_OpenClientConnection(R
 RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection);
 RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection);
 
-RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint);
-RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid);
+RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint);
+RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid);
 RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection);
 RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding);
 RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding);


More information about the wine-patches mailing list