[PATCH 0/1] MR3012: rpcrt4: Replace RPCRT4_strndupA with strdup.

[PATCH 1/1] rpcrt4: Replace RPCRT4_strndupA with strdup.

[Alex Henrie]

From: Alex Henrie

---
 dlls/rpcrt4/rpc_binding.c | 19 +++----------------
 dlls/rpcrt4/rpc_binding.h |  1 -
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index fec9aa999aa..d4e35bdf116 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -43,19 +43,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(rpc);

-LPSTR RPCRT4_strndupA(LPCSTR src, INT slen)
-{
-  DWORD len;
-  LPSTR s;
-  if (!src) return NULL;
-  if (slen == -1) slen = strlen(src);
-  len = slen;
-  s = malloc(len + 1);
-  memcpy(s, src, len);
-  s[len] = 0;
-  return s;
-}
-
 LPSTR RPCRT4_strdupWtoA(LPCWSTR src)
 {
   DWORD len;
@@ -992,9 +979,9 @@ RPC_STATUS RPC_ENTRY RpcBindingCopy(

DestBinding->ObjectUuid = SrcBinding->ObjectUuid;
   DestBinding->BlockingFn = SrcBinding->BlockingFn;
-  DestBinding->Protseq = RPCRT4_strndupA(SrcBinding->Protseq, -1);
-  DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1);
-  DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1);
+  DestBinding->Protseq = strdup(SrcBinding->Protseq);
+  DestBinding->NetworkAddr = strdup(SrcBinding->NetworkAddr);
+  DestBinding->Endpoint = strdup(SrcBinding->Endpoint);
   DestBinding->NetworkOptions = wcsdup(SrcBinding->NetworkOptions);
   DestBinding->CookieAuth = wcsdup(SrcBinding->CookieAuth);
   if (SrcBinding->Assoc) SrcBinding->Assoc->refs++;
diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h
index d742c68eda9..78a9dfd0a00 100644
--- a/dlls/rpcrt4/rpc_binding.h
+++ b/dlls/rpcrt4/rpc_binding.h
@@ -143,7 +143,6 @@ typedef struct _RpcBinding
   LPWSTR CookieAuth;
 } RpcBinding;

-LPSTR RPCRT4_strndupA(LPCSTR src, INT len) DECLSPEC_HIDDEN;
 LPWSTR RPCRT4_strndupW(LPCWSTR src, INT len) DECLSPEC_HIDDEN;
 LPSTR RPCRT4_strdupWtoA(LPCWSTR src) DECLSPEC_HIDDEN;
 LPWSTR RPCRT4_strdupAtoW(LPCSTR src) DECLSPEC_HIDDEN;

[PATCH 0/1] MR3012: rpcrt4: Replace RPCRT4_strndupA with strdup. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.