summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2022-07-11 16:09:02 -0400
committerSolomon Peachy <pizza@shaftnet.org>2022-07-11 16:11:29 -0400
commit05149cd4dc3896103a58903f635dc42135c53d96 (patch)
tree6cf16da60fb45c2d44273f1507f18f7cb17b61b8
parent4917f764bbb9580d9ec312794c0d7ae71c6792e1 (diff)
downloadrockbox-05149cd4dc.tar.gz
rockbox-05149cd4dc.zip
Fix a couple of warnings uncovered by GCC12
Change-Id: Ib628a27bfc6f95a822e46b931ccfbed90f41b122
-rw-r--r--apps/menus/main_menu.c2
-rw-r--r--lib/rbcodec/codecs/libgme/blip_buffer.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 5e9b935937..321f2cdec4 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -338,7 +338,7 @@ static int info_speak_item(int selected_item, void * data)
#ifdef HAVE_RECORDING
case INFO_REC_DIR:
talk_id(LANG_REC_DIR, false);
- if (global_settings.rec_directory && global_settings.rec_directory[0])
+ if (global_settings.rec_directory[0])
{
long *pathsep = NULL;
char rec_directory[MAX_PATHNAME+1];
diff --git a/lib/rbcodec/codecs/libgme/blip_buffer.c b/lib/rbcodec/codecs/libgme/blip_buffer.c
index ba0a6558d2..9aaa9d2482 100644
--- a/lib/rbcodec/codecs/libgme/blip_buffer.c
+++ b/lib/rbcodec/codecs/libgme/blip_buffer.c
@@ -53,7 +53,9 @@ void Blip_clear( struct Blip_Buffer* this )
this->reader_accum_ = 0;
this->modified = false;
+#if 0 // this is redundant as buffer is static and triggers -Waddress
if ( this->buffer_ )
+#endif
{
int count = (entire_buffer ? this->buffer_size_ : Blip_samples_avail( this ));
memset( this->buffer_, 0, (count + blip_buffer_extra_) * sizeof (delta_t) );