win32/HResult: un-inline FormatHResultError()
Reduce header dependencies.
This commit is contained in:
parent
74f9e07151
commit
6b83fc6b57
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2020-2021 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "HResult.hxx"
|
||||||
|
|
||||||
|
#include <cstdarg>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
std::system_error
|
||||||
|
FormatHResultError(HRESULT result, const char *fmt, ...) noexcept
|
||||||
|
{
|
||||||
|
std::va_list args1, args2;
|
||||||
|
va_start(args1, fmt);
|
||||||
|
va_copy(args2, args1);
|
||||||
|
|
||||||
|
const int size = vsnprintf(nullptr, 0, fmt, args1);
|
||||||
|
va_end(args1);
|
||||||
|
assert(size >= 0);
|
||||||
|
|
||||||
|
auto buffer = std::make_unique<char[]>(size + 1);
|
||||||
|
vsprintf(buffer.get(), fmt, args2);
|
||||||
|
va_end(args2);
|
||||||
|
|
||||||
|
return std::system_error(std::error_code(result, hresult_category()),
|
||||||
|
std::string(buffer.get(), size));
|
||||||
|
}
|
|
@ -23,7 +23,6 @@
|
||||||
#include "util/Compiler.h"
|
#include "util/Compiler.h"
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdarg>
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <system_error>
|
#include <system_error>
|
||||||
|
@ -86,22 +85,7 @@ static inline const std::error_category &hresult_category() noexcept {
|
||||||
return hresult_category_instance;
|
return hresult_category_instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
gcc_printf(2, 3) static inline std::system_error
|
gcc_printf(2, 3) std::system_error
|
||||||
FormatHResultError(HRESULT result, const char *fmt, ...) noexcept {
|
FormatHResultError(HRESULT result, const char *fmt, ...) noexcept;
|
||||||
std::va_list args1, args2;
|
|
||||||
va_start(args1, fmt);
|
|
||||||
va_copy(args2, args1);
|
|
||||||
|
|
||||||
const int size = vsnprintf(nullptr, 0, fmt, args1);
|
|
||||||
va_end(args1);
|
|
||||||
assert(size >= 0);
|
|
||||||
|
|
||||||
auto buffer = std::make_unique<char[]>(size + 1);
|
|
||||||
vsprintf(buffer.get(), fmt, args2);
|
|
||||||
va_end(args2);
|
|
||||||
|
|
||||||
return std::system_error(std::error_code(result, hresult_category()),
|
|
||||||
std::string(buffer.get(), size));
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,6 +6,7 @@ endif
|
||||||
win32 = static_library(
|
win32 = static_library(
|
||||||
'win32',
|
'win32',
|
||||||
'ComWorker.cxx',
|
'ComWorker.cxx',
|
||||||
|
'HResult.cxx',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue