From e8c94dca66cf0b1734431fba929878b1b32be5f5 Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 26 Mar 2020 21:32:37 +0000 Subject: audio/libsidplay: fix -Wchar-subscripts --- audio/libsidplay/distinfo | 3 ++- audio/libsidplay/patches/patch-src_mus__.cpp | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 audio/libsidplay/patches/patch-src_mus__.cpp (limited to 'audio/libsidplay') diff --git a/audio/libsidplay/distinfo b/audio/libsidplay/distinfo index 2db8a905116..a398b316116 100644 --- a/audio/libsidplay/distinfo +++ b/audio/libsidplay/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 01:12:38 agc Exp $ +$NetBSD: distinfo,v 1.9 2020/03/26 21:32:37 rillig Exp $ SHA1 (libsidplay-1.36.59.tar.bz2) = 8a5c057a44de6f1fd008e8d37a1e5cbe335f72bb RMD160 (libsidplay-1.36.59.tar.bz2) = 1a49d6e818bf231d22564884d2f4999885bb3bff SHA512 (libsidplay-1.36.59.tar.bz2) = 21aacdd7a44c6bb410dd3383e85a4560fd142504fc37e3f0878aa2b8ba76e8cf310d61ff9741100b166c88dbdb78b574eec0e8b24d7d6b90187633009d5fcec9 Size (libsidplay-1.36.59.tar.bz2) = 307720 bytes +SHA1 (patch-src_mus__.cpp) = 31c8174d10ae9757de84d5357c69eba17408aece diff --git a/audio/libsidplay/patches/patch-src_mus__.cpp b/audio/libsidplay/patches/patch-src_mus__.cpp new file mode 100644 index 00000000000..a93a81b1d55 --- /dev/null +++ b/audio/libsidplay/patches/patch-src_mus__.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-src_mus__.cpp,v 1.1 2020/03/26 21:32:37 rillig Exp $ + +mus_.cpp: In member function 'virtual bool sidTune::MUS_fileSupport(const void*, udword)': +mus_.cpp:76:38: error: array subscript has type 'char' [-Werror=char-subscripts] + infoString[line][si++] = c; // copy to info string + ^ + +Using a char here is ok, but GCC cannot prove it. It is used only in the +range [0, 31]. + +--- src/mus_.cpp.orig 2004-08-17 11:43:38.000000000 +0000 ++++ src/mus_.cpp +@@ -66,7 +66,7 @@ bool sidTune::MUS_fileSupport(const void + for ( int line = 0; line < 5; line++ ) + { + char c; +- char si = 0; // count copied characters ++ unsigned char si = 0; // count copied characters + do + { + // ASCII CHR$ conversion -- cgit v1.2.3