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

io/BufferedOutputStream: use std::byte

Browse Source
This commit is contained in:
Max Kellermann 2021-01-26 22:27:18 +01:00 committed by Max Kellermann
parent 35c11afd54
commit 8c6bc02bf7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/io/BufferedOutputStream.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014-2018 Max Kellermann <max.kellermann@gmail.com> * Copyright 2014-2021 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -88,7 +88,7 @@ BufferedOutputStream::Format(const char *fmt, ...)
/* format into the buffer */ /* format into the buffer */
std::va_list ap; std::va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
std::size_t size = vsnprintf(r.data, r.size, fmt, ap); std::size_t size = vsnprintf((char *)r.data, r.size, fmt, ap);
va_end(ap); va_end(ap);
if (gcc_unlikely(size >= r.size)) { if (gcc_unlikely(size >= r.size)) {
@ -108,7 +108,7 @@ BufferedOutputStream::Format(const char *fmt, ...)
/* format into the new buffer */ /* format into the new buffer */
va_start(ap, fmt); va_start(ap, fmt);
size = vsnprintf(r.data, r.size, fmt, ap); size = vsnprintf((char *)r.data, r.size, fmt, ap);
va_end(ap); va_end(ap);
/* this time, it must fit */ /* this time, it must fit */
@ -140,7 +140,8 @@ BufferedOutputStream::WriteWideToUTF8(const wchar_t *src,
} }
int length = WideCharToMultiByte(CP_UTF8, 0, src, src_length, int length = WideCharToMultiByte(CP_UTF8, 0, src, src_length,
r.data, r.size, nullptr, nullptr); (char *)r.data, r.size,
nullptr, nullptr);
if (length <= 0) { if (length <= 0) {
const auto error = GetLastError(); const auto error = GetLastError();
if (error != ERROR_INSUFFICIENT_BUFFER) if (error != ERROR_INSUFFICIENT_BUFFER)

2
src/io/BufferedOutputStream.hxx
View File

@ -53,7 +53,7 @@ class OutputStream;
class BufferedOutputStream { class BufferedOutputStream {
OutputStream &os; OutputStream &os;
DynamicFifoBuffer<char> buffer; DynamicFifoBuffer<std::byte> buffer;
public: public:
explicit BufferedOutputStream(OutputStream &_os, explicit BufferedOutputStream(OutputStream &_os,