From: Alex Henrie alexhenrie24@gmail.com
--- dlls/dnsapi/dnsapi.h | 27 --------------------------- dlls/dnsapi/query.c | 2 +- dlls/dnsapi/record.c | 6 +++--- 3 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index a81cb712f3e..250b0a1b4c3 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -25,33 +25,6 @@ #include "winternl.h" #include "wine/unixlib.h"
-static inline char *strdup_a( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (lstrlenA( src ) + 1) * sizeof(char) ); - if (dst) lstrcpyA( dst, src ); - return dst; -} - -static inline char *strdup_u( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (strlen( src ) + 1) * sizeof(char) ); - if (dst) strcpy( dst, src ); - return dst; -} - -static inline WCHAR *strdup_w( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *strdup_aw( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 0e2f1b39ece..90a3a3e9950 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -73,7 +73,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) } else { - record->pName = strdup_u( name ); + record->pName = strdup( name ); if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 04694fc575c..01786842b73 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -455,7 +455,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (out) { - case DnsCharSetUnicode: return strdup_w( src ); + case DnsCharSetUnicode: return wcsdup( src ); case DnsCharSetUtf8: return strdup_wu( src ); case DnsCharSetAnsi: return strdup_wa( src ); default: @@ -468,7 +468,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) switch (out) { case DnsCharSetUnicode: return strdup_uw( src ); - case DnsCharSetUtf8: return strdup_u( src ); + case DnsCharSetUtf8: return strdup( src ); case DnsCharSetAnsi: return strdup_ua( src ); default: WARN( "unhandled target charset: %d\n", out ); @@ -480,7 +480,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { case DnsCharSetUnicode: return strdup_aw( src ); case DnsCharSetUtf8: return strdup_au( src ); - case DnsCharSetAnsi: return strdup_a( src ); + case DnsCharSetAnsi: return strdup( src ); default: WARN( "unhandled target charset: %d\n", out ); break;