[PATCH 0/1] MR2414: wldap32: Replace bvfreeU with plain free.

[PATCH 1/1] wldap32: Replace bvfreeU with plain free.

[Alex Henrie]

From: Alex Henrie

---
 dlls/wldap32/compare.c         | 4 ++--
 dlls/wldap32/extended.c        | 4 ++--
 dlls/wldap32/winldap_private.h | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c
index c7fb83a3723..d23e52ef207 100644
--- a/dlls/wldap32/compare.c
+++ b/dlls/wldap32/compare.c
@@ -141,7 +141,7 @@ exit:
     free( dnU );
     free( attrU );
     free( valueU );
-    bvfreeU( dataU );
+    free( dataU );
     controlarrayfreeU( serverctrlsU );
     controlarrayfreeU( clientctrlsU );
     return ret;
@@ -218,7 +218,7 @@ exit:
     free( dnU );
     free( attrU );
     free( valueU );
-    bvfreeU( dataU );
+    free( dataU );
     controlarrayfreeU( serverctrlsU );
     controlarrayfreeU( clientctrlsU );
     return ret;
diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c
index fad2a3d42d4..b168615c0fc 100644
--- a/dlls/wldap32/extended.c
+++ b/dlls/wldap32/extended.c
@@ -92,7 +92,7 @@ ULONG CDECL ldap_extended_operationW( LDAP *ld, WCHAR *oid, struct WLDAP32_berva

exit:
     free( oidU );
-    bvfreeU( dataU );
+    free( dataU );
     controlarrayfreeU( serverctrlsU );
     controlarrayfreeU( clientctrlsU );
     return ret;
@@ -174,7 +174,7 @@ ULONG CDECL ldap_extended_operation_sW( LDAP *ld, WCHAR *oid, struct WLDAP32_ber

exit:
     free( oidU );
-    bvfreeU( dataU );
+    free( dataU );
     controlarrayfreeU( serverctrlsU );
     controlarrayfreeU( clientctrlsU );
     return ret;
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index 47a67968651..69dca519b0e 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -743,11 +743,6 @@ static inline struct WLDAP32_berval **bvarrayUtoW( struct berval **bv )
     return ret;
 }

-static inline void bvfreeU( struct berval *berval )
-{
-    free( berval );
-}
-
 static inline struct berval **bvarrayWtoU( struct WLDAP32_berval **bv )
 {
     struct berval **ret = NULL;

[PATCH 0/1] MR2414: wldap32: Replace bvfreeU with plain free. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.