oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu/Win32: use std::unique_ptr

This commit is contained in:
Max Kellermann 2016-04-13 11:53:35 +02:00
parent 01b68db30e
commit 225984822d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/icu/Win32.cxx
View File

@ -21,6 +21,8 @@
#include "Win32.hxx"
#include "util/AllocatedString.hxx"
#include <memory>
#include <windows.h>
AllocatedString<char>
@ -31,15 +33,14 @@ WideCharToMultiByte(unsigned code_page, const wchar_t *src)
if (length <= 0)
return nullptr;
char *buffer = new char[length];
length = WideCharToMultiByte(code_page, 0, src, -1, buffer, length,
std::unique_ptr<char[]> buffer(new char[length]);
length = WideCharToMultiByte(code_page, 0, src, -1,
buffer.get(), length,
nullptr, nullptr);
if (length <= 0) {
delete[] buffer;
if (length <= 0)
return nullptr;
}
return AllocatedString<char>::Donate(buffer);
return AllocatedString<char>::Donate(buffer.release());
}
AllocatedString<wchar_t>
@ -49,12 +50,11 @@ MultiByteToWideChar(unsigned code_page, const char *src)
if (length <= 0)
return nullptr;
wchar_t *buffer = new wchar_t[length];
length = MultiByteToWideChar(code_page, 0, src, -1, buffer, length);
if (length <= 0) {
delete[] buffer;
std::unique_ptr<wchar_t[]> buffer(new wchar_t[length]);
length = MultiByteToWideChar(code_page, 0, src, -1,
buffer.get(), length);
if (length <= 0)
return nullptr;
}
return AllocatedString<wchar_t>::Donate(buffer);
return AllocatedString<wchar_t>::Donate(buffer.release());
}