diff --git a/src/dos/cdrom_image.cpp b/src/dos/cdrom_image.cpp index c3f4d5e5..dcf687ea 100644 --- a/src/dos/cdrom_image.cpp +++ b/src/dos/cdrom_image.cpp @@ -77,9 +77,9 @@ bool CDROM_Interface_Image::BinaryFile::read(uint8_t *buffer, const uint32_t requested_bytes) { // Check for logic bugs and illegal values - assertm(file && buffer, "The file and/or buffer pointer is invalid [Bug]"); - assertm(offset <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size [Bug]"); - assertm(requested_bytes <= MAX_REDBOOK_BYTES, "Requested bytes exceeds CDROM size [Bug]"); + assertm(file && buffer, "The file and/or buffer pointer is invalid"); + assertm(offset <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size"); + assertm(requested_bytes <= MAX_REDBOOK_BYTES, "Requested bytes exceeds CDROM size"); file->seekg(offset, ios::beg); file->read((char*)buffer, requested_bytes); @@ -89,7 +89,7 @@ bool CDROM_Interface_Image::BinaryFile::read(uint8_t *buffer, int CDROM_Interface_Image::BinaryFile::getLength() { // Check for logic bugs and illegal values - assertm(file, "The file pointer is invalid [Bug]"); + assertm(file, "The file pointer is invalid"); /** * All read operations involve an absolute position and @@ -100,7 +100,7 @@ int CDROM_Interface_Image::BinaryFile::getLength() const int length = static_cast(file->tellg()); assertm(length == -1 // allow the length to fail, which is valid || static_cast(length) <= MAX_REDBOOK_BYTES, - "Length exceeds the maximum CDROM size [Bug]"); + "Length exceeds the maximum CDROM size"); #ifdef DEBUG LOG_MSG("CDROM: Length of image is %d bytes", length); #endif @@ -118,8 +118,8 @@ Bit16u CDROM_Interface_Image::BinaryFile::getEndian() bool CDROM_Interface_Image::BinaryFile::seek(const uint32_t offset) { // Check for logic bugs and illegal values - assertm(file, "The file pointer needs to be valid, but is the nullptr [Bug]"); - assertm(offset <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size [Bug]"); + assertm(file, "The file pointer needs to be valid, but is the nullptr"); + assertm(offset <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size"); file->seekg(offset, ios::beg); return !file->fail(); @@ -129,9 +129,9 @@ uint32_t CDROM_Interface_Image::BinaryFile::decode(int16_t *buffer, const uint32_t desired_track_frames) { // Guard against logic bugs and illegal values - assertm(buffer && file, "The file pointer or buffer are invalid [bug]"); + assertm(buffer && file, "The file pointer or buffer are invalid"); assertm(desired_track_frames <= MAX_REDBOOK_FRAMES, - "Requested number of frames exceeds the maximum for a CDROM [Bug]"); + "Requested number of frames exceeds the maximum for a CDROM"); file->read((char*)buffer, desired_track_frames * BYTES_PER_REDBOOK_PCM_FRAME); /** @@ -190,8 +190,8 @@ CDROM_Interface_Image::AudioFile::~AudioFile() bool CDROM_Interface_Image::AudioFile::seek(const uint32_t requested_pos) { // Check for logic bugs and if the track is already positioned as requested - assertm(sample, "Audio sample needs to be valid, but is the nullptr [Bug]"); - assertm(requested_pos <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size [Bug]"); + assertm(sample, "Audio sample needs to be valid, but is the nullptr"); + assertm(requested_pos <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size"); if (track_pos == requested_pos) { #ifdef DEBUG LOG_MSG("CDROM: seek to %u avoided with position-tracking", requested_pos); @@ -250,10 +250,10 @@ bool CDROM_Interface_Image::AudioFile::read(uint8_t *buffer, const uint32_t requested_bytes) { // Guard again logic bugs and the no-op case - assertm(buffer != nullptr, "buffer needs to be allocated but is the nullptr [Bug]"); - assertm(sample != nullptr, "Audio sample needs to be valid, but is the nullptr [Bug]"); - assertm(requested_pos <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size [Bug]"); - assertm(requested_bytes <= MAX_REDBOOK_BYTES, "Requested bytes exceeds CDROM size [Bug]"); + assertm(buffer != nullptr, "buffer needs to be allocated but is the nullptr"); + assertm(sample != nullptr, "Audio sample needs to be valid, but is the nullptr"); + assertm(requested_pos <= MAX_REDBOOK_BYTES, "Requested offset exceeds CDROM size"); + assertm(requested_bytes <= MAX_REDBOOK_BYTES, "Requested bytes exceeds CDROM size"); if (requested_bytes == 0) return true; diff --git a/src/libs/decoders/opus.cpp b/src/libs/decoders/opus.cpp index c0d6be39..b1d26132 100644 --- a/src/libs/decoders/opus.cpp +++ b/src/libs/decoders/opus.cpp @@ -67,7 +67,7 @@ static void opus_quit(void) static int RWops_opus_read(void * stream, uint8_t * buffer, int32_t requested_bytes) { // Guard against invalid inputs and the no-op scenario - assertm(stream && buffer, "OPUS: Inputs are not initialized [bug]"); + assertm(stream && buffer, "OPUS: Inputs are not initialized"); if (requested_bytes <= 0) return 0; @@ -120,9 +120,9 @@ static int RWops_opus_read(void * stream, uint8_t * buffer, int32_t requested_by static int32_t RWops_opus_seek(void * stream, const opus_int64 offset, const int32_t whence) { // Guard against invalid inputs - assertm(stream, "OPUS: Input is not initialized [bug]"); + assertm(stream, "OPUS: Input is not initialized"); assertm(whence == SEEK_SET || whence == SEEK_CUR || whence == SEEK_END, - "OPUS: The position from where to seek is invalid [bug]"); + "OPUS: The position from where to seek is invalid"); const int64_t offset_after_seek = SDL_RWseek(static_cast(stream), static_cast(offset), @@ -158,7 +158,7 @@ static int32_t RWops_opus_close(void * stream) static opus_int64 RWops_opus_tell(void * stream) { // Guard against invalid input - assertm(stream, "OPUS: Input is not initialized [bug]"); + assertm(stream, "OPUS: Input is not initialized"); const int64_t current_offset = SDL_RWtell(static_cast(stream)); SNDDBG(("Opus ops tell: " @@ -180,7 +180,7 @@ static __inline__ void output_opus_info(const OggOpusFile * of, const OpusHead * { #if (defined DEBUG_CHATTER) // Guard against invalid input - assertm(of && oh, "OPUS: Inputs are not initialized [bug]"); + assertm(of && oh, "OPUS: Inputs are not initialized"); const OpusTags* ot = op_tags(of, -1); if (ot != nullptr) { @@ -239,7 +239,7 @@ static void opus_close(Sound_Sample * sample) static int32_t opus_open(Sound_Sample * sample, const char * ext) { // Guard against invalid input - assertm(sample, "OPUS: Input is not initialized [bug]"); + assertm(sample, "OPUS: Input is not initialized"); (void) ext; // deliberately unused, but present for API compliance int32_t rcode = 0; // assume failure until determined otherwise @@ -278,7 +278,7 @@ static int32_t opus_open(Sound_Sample * sample, const char * ext) static uint32_t opus_read(Sound_Sample * sample, void * buffer, uint32_t requested_frames) { // Guard against invalid inputs and the no-op case - assertm(sample && buffer, "OPUS: Inputs are not initialized [bug]"); + assertm(sample && buffer, "OPUS: Inputs are not initialized"); if (requested_frames == 0) return 0u; @@ -324,7 +324,7 @@ static uint32_t opus_read(Sound_Sample * sample, void * buffer, uint32_t request static int32_t opus_seek(Sound_Sample * sample, const uint32_t ms) { // Guard against invalid input - assertm(sample, "OPUS: Input is not initialized [bug]"); + assertm(sample, "OPUS: Input is not initialized"); int rcode = -1; @@ -367,7 +367,7 @@ static int32_t opus_seek(Sound_Sample * sample, const uint32_t ms) static int32_t opus_rewind(Sound_Sample* sample) { // Guard against invalid input - assertm(sample, "OPUS: Input is not initialized [bug]"); + assertm(sample, "OPUS: Input is not initialized"); const int32_t rcode = opus_seek(sample, 0); assertm(rcode >= 0, "OPUS: seek failed [bug or corrupt Opus track]"); return rcode;