Clang fixes

Author: schellingb

dosbox_pure_libretro.cpp

@@ -2292,6 +2292,7 @@ static bool check_variables()
 	// Emulation options
 	const char* forcefps = DBP_Option::Get(DBP_Option::forcefps);
 	dbp_forcefps = (Bit16s)(forcefps[0] == 'f' ? 0 : forcefps[0] == 't' ? 60 : atoi(forcefps));
+	if (dbp_forcefps < 0) dbp_forcefps = 0;
 
 	switch (DBP_Option::Get(DBP_Option::perfstats)[0])
 	{
@@ -2314,14 +2315,14 @@ static bool check_variables()
 	bool cycles_numeric = (cycles[0] >= '0' && cycles[0] <= '9');
 	int cycles_max = (cycles_numeric ? 0 : atoi(DBP_Option::Get(DBP_Option::cycles_max, &cycles_changed)));
 	DBP_Option::SetDisplay(DBP_Option::cycles_max, !cycles_numeric);
-	DBP_Option::SetDisplay(DBP_Option::cycles_scale, cycles_numeric || cycles_max);
+	DBP_Option::SetDisplay(DBP_Option::cycles_scale, cycles_numeric || cycles_max > 0);
 	DBP_Option::SetDisplay(DBP_Option::cycle_limit, !cycles_numeric);
 	if (cycles_numeric)
 	{
 		snprintf(buf, sizeof(buf), "%d", (int)(atoi(cycles) * (float)atof(DBP_Option::Get(DBP_Option::cycles_scale, &cycles_changed)) + .499));
 		cycles = buf;
 	}
-	else if (cycles_max)
+	else if (cycles_max > 0)
 	{
 		snprintf(buf, sizeof(buf), "%s limit %d", cycles, (int)(cycles_max * (float)atof(DBP_Option::Get(DBP_Option::cycles_scale, &cycles_changed)) + .499));
 		cycles = buf;

dosbox_pure_pad.h

@@ -832,8 +832,8 @@ struct DBP_PadMapping
 
 	struct BindDecoder
 	{
-		INLINE BindDecoder(const Bit8u *ptr) : P(ptr), OutPtr(NULL), Remain(P ? *(P++)+1 : 1), KeyCount(0) { ++*this; }
-		INLINE BindDecoder(const Bit8u **ptr) : P(*ptr), OutPtr(ptr), Remain(P ? *(P++)+1 : 1), KeyCount(0) { ++*this; }
+		INLINE BindDecoder(const Bit8u *ptr) : P(ptr), OutPtr(NULL), Remain(P ? *(P++)+1 : 1), KeyCount(0), IsAnalog(false) { ++*this; }
+		INLINE BindDecoder(const Bit8u **ptr) : P(*ptr), OutPtr(ptr), Remain(P ? *(P++)+1 : 1), KeyCount(0), IsAnalog(false) { ++*this; }
 		INLINE const BindDecoder& begin() const { return *this; }
 		INLINE const BindDecoder& end() const { return *this; }
 		INLINE const BindDecoder& operator*() const { return *this; }

src/dos/drives.h

@@ -507,10 +507,10 @@ void DriveFileIterator(DOS_Drive* drv, void(*func)(const char* path, bool is_dir
 
 template <typename TVal> struct BaseHashMap
 {
-	INLINE BaseHashMap() { memset(this, 0, sizeof(*this)); }
+	INLINE BaseHashMap() : len(0), maxlen(0), keys(NULL), vals(NULL) { }
 	INLINE ~BaseHashMap() { free(keys); free(vals); }
 
-	INLINE void Free() { this->~BaseHashMap(); memset(this, 0, sizeof(*this)); }
+	INLINE void Free() { this->~BaseHashMap(); len = maxlen = 0; keys = NULL; vals = NULL; }
 	INLINE void Clear() { if (maxlen) memset(keys, len = 0, (maxlen + 1) * sizeof(Bit32u)); }
 
 	INLINE Bit32u Len() const { return len; }

src/gui/midi_oss.h

@@ -19,6 +19,10 @@
 #include <fcntl.h>
 #define SEQ_MIDIPUTC    5
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
 class MidiHandler_oss: public MidiHandler {
 private:
 	int  device;

src/gui/midi_win32.h

@@ -89,8 +89,8 @@ class MidiHandler_win32: public MidiHandler {
 		midiOutUnprepareHeader (m_out, &m_hdr, sizeof (m_hdr));
 
 		m_hdr.lpData = (char *) sysex;
-		m_hdr.dwBufferLength = len ;
-		m_hdr.dwBytesRecorded = len ;
+		m_hdr.dwBufferLength = (DWORD) len ;
+		m_hdr.dwBytesRecorded = (DWORD) len ;
 		m_hdr.dwUser = 0;
 
 		MMRESULT result = midiOutPrepareHeader (m_out, &m_hdr, sizeof (m_hdr));

src/hardware/voodoo.cpp

@@ -1119,7 +1119,7 @@ static INLINE INT64 fast_reciplog(INT64 value, INT32 *log2)
 	if (value & LONGTYPE(0xffff00000000))
 	{
 		temp = (UINT32)(value >> 16);
-		exp -= 16;
+		exp = -16;
 	}
 	else
 		temp = (UINT32)value;
@@ -2973,12 +2973,12 @@ template <typename TVal> struct GrowArray
 {
 	Bit32u num, cap;
 	TVal* data;
-	INLINE GrowArray() { memset(this, 0, sizeof(*this)); }
+	INLINE GrowArray() : num(0), cap(0), data(NULL) { }
 	INLINE ~GrowArray() { free(data); }
 	INLINE TVal& AddOne() { if ((++num) > cap) data = (TVal*)realloc(data, (cap = (cap < 16 ? 16 : cap * 2)) * sizeof(TVal)); return data[num - 1]; }
 	INLINE TVal* Add(UINT32 n) { num += n; while (num > cap) data = (TVal*)realloc(data, (cap = (cap < 16 ? 16 : cap * 2)) * sizeof(TVal)); return data + num - n; }
 	INLINE void Reset() { num = 0; }
-	INLINE void Free() { free(data); memset(this, 0, sizeof(*this)); }
+	INLINE void Free() { free(data); num = cap = 0; data = NULL; }
 	INLINE TVal* begin() { return data; }
 	INLINE TVal* end() { return data + num; }
 };

src/misc/setup.cpp

@@ -207,9 +207,15 @@ bool Value::set_int(string const &in) {
 }
 bool Value::set_double(string const &in) {
 	istringstream input(in);
+#ifdef C_DBP_LIBRETRO // fix infinity compile warning with Clang
+	double result = 0;
+	input >> result;
+	if(input.fail()) return false;
+#else
 	double result = std::numeric_limits<double>::infinity();
 	input >> result;
 	if(result == std::numeric_limits<double>::infinity()) return false;
+#endif
 	_double = result;
 	return true;
 }