File 0003-Fix-operator-precedence-and-uninitialized-... of Package deadbeef

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch of Package deadbeef (Revision 6841edfbceb9f8e6a9d3aa46ef3d7eed)

Currently displaying revision 6841edfbceb9f8e6a9d3aa46ef3d7eed , Show latest

From 30080bc60897545bb39805eeaebe6588a760d126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Thu, 2 Nov 2017 20:10:18 +0100
Subject: [PATCH 3/3] Fix operator precedence and uninitialized value warnings

---
 plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h | 4 ++--
 plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
index 9fa8582d..d6d9c079 100644
--- a/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+++ b/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
@@ -115,7 +115,7 @@ inline void endian_16hi8 (uint_least16_t &word, uint8_t byte)
 #endif
 }
 
-// Set the hi byte (8 bit) in a word (16 bit)
+// Get the hi byte (8 bit) of a word (16 bit)
 inline uint8_t endian_16hi8 (uint_least16_t word)
 {
 #if defined(SID_OPTIMISE_MEMORY_ACCESS)
@@ -141,7 +141,7 @@ inline void endian_16swap8 (uint_least16_t &word)
 // Convert high-byte and low-byte to 16-bit word.
 inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
 {
-    uint_least16_t word;
+    uint_least16_t word = 0;
     endian_16lo8 (word, lo);
     endian_16hi8 (word, hi);
     return word;
diff --git a/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
index 98171d73..01799652 100644
--- a/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+++ b/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
@@ -197,7 +197,7 @@ private:
 
     // Compress address to not leave so many spaces
     uint_least8_t convertAddr(uint_least8_t addr)
-    { return (((addr) & 0x3) | ((addr) >> 3) & 0x0c); }
+    { return ((addr) & 0x3) | (((addr) >> 3) & 0x0c); }
 
     void    reset    (void);
     uint8_t read     (uint_least8_t  addr)
-- 
2.14.3

Places

File 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch of Package deadbeef (Revision 6841edfbceb9f8e6a9d3aa46ef3d7eed)

Places