Merge branch 'v0.23.x'

This commit is contained in:
Max Kellermann 2022-05-19 09:27:06 +02:00
commit 86e6f4fcc0
6 changed files with 11 additions and 24 deletions

12
.github/FUNDING.yml vendored
View File

@ -1,12 +0,0 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: MaxK
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

View File

@ -18,5 +18,9 @@ about: Create a bug report
<!-- Paste the output of "mpd --version" here --> <!-- Paste the output of "mpd --version" here -->
## Configuration
<!-- Paste your MPD configuration here -->
## Log ## Log
<!-- Paste relevant portions of the log file here (--verbose) --> <!-- Paste relevant portions of the log file here (--verbose) -->

View File

@ -1,9 +0,0 @@
---
name: Question
about: Ask a question about MPD
---
<!-- Before you ask a question on GitHub, please read MPD's
documentation. A copy is available at
https://www.musicpd.org/doc/html/ -->
## Question

View File

@ -41,7 +41,8 @@ jobs:
key: linux key: linux
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt install -y --no-install-recommends \ sudo apt-get update
sudo apt-get install -y --no-install-recommends \
g++-10 libfmt-dev libboost-dev \ g++-10 libfmt-dev libboost-dev \
libgtest-dev \ libgtest-dev \
libpcre2-dev \ libpcre2-dev \

2
NEWS
View File

@ -11,6 +11,8 @@ ver 0.24 (not yet released)
* tags * tags
- new tag "Mood" - new tag "Mood"
ver 0.23.8 (not yet released)
ver 0.23.7 (2022/05/09) ver 0.23.7 (2022/05/09)
* database * database
- upnp: support pupnp 1.14 - upnp: support pupnp 1.14

View File

@ -31,6 +31,7 @@
#include "ErrorRef.hxx" #include "ErrorRef.hxx"
#include "StringRef.hxx" #include "StringRef.hxx"
#include <cstring>
#include <stdexcept> #include <stdexcept>
namespace Apple { namespace Apple {
@ -57,8 +58,8 @@ ThrowOSStatus(OSStatus status, const char *_msg)
const Apple::StringRef cfstr(cferr.CopyDescription()); const Apple::StringRef cfstr(cferr.CopyDescription());
char msg[1024]; char msg[1024];
strcpy(msg, _msg); std::strcpy(msg, _msg);
size_t length = strlen(msg); size_t length = std::strlen(msg);
cfstr.GetCString(msg + length, sizeof(msg) - length); cfstr.GetCString(msg + length, sizeof(msg) - length);
throw std::runtime_error(msg); throw std::runtime_error(msg);