(svn r8860) -Cleanup: some style changes, proper #endif comments, variable initialisation, WINCE ifdef and a vsprintf to vsnprintf change.

7 files changed, 11 insertions, 21 deletions

diff --git a/src/music/bemidi.h b/src/music/bemidi.h
index 10ead59ff..1b3d4f3de 100644
--- a/src/music/bemidi.h
+++ b/src/music/bemidi.h
@@ -7,4 +7,4 @@
 
 extern const HalMusicDriver _bemidi_music_driver;
 
-#endif
+#endif /* MUSIC_BEMIDI_H */
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 9c2c6a2cd..c52e6f99b 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -1,9 +1,8 @@
 /* $Id$ */
 
-#include "../stdafx.h"
-
 #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
 
+#include "../stdafx.h"
 #include "../debug.h"
 #include "../win32.h"
 #include "dmusic.h"
diff --git a/src/music/extmidi.h b/src/music/extmidi.h
index 681c34bd6..f118f933a 100644
--- a/src/music/extmidi.h
+++ b/src/music/extmidi.h
@@ -7,4 +7,4 @@
 
 extern const HalMusicDriver _extmidi_music_driver;
 
-#endif
+#endif /* MUSIC_EXTERNAL_H */
diff --git a/src/music/null_m.cpp b/src/music/null_m.cpp
index c76a60211..b2b83877c 100644
--- a/src/music/null_m.cpp
+++ b/src/music/null_m.cpp
@@ -1,7 +1,6 @@
 /* $Id$ */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
diff --git a/src/music/os2_m.h b/src/music/os2_m.h
index 173f096a5..fef15b91f 100644
--- a/src/music/os2_m.h
+++ b/src/music/os2_m.h
@@ -7,4 +7,4 @@
 
 extern const HalMusicDriver _os2_music_driver;
 
-#endif
+#endif /* MUSIC_OS2_H */
diff --git a/src/music/qtmidi.h b/src/music/qtmidi.h
index 727ce25e1..0b9e5ff2e 100644
--- a/src/music/qtmidi.h
+++ b/src/music/qtmidi.h
@@ -7,4 +7,4 @@
 
 extern const HalMusicDriver _qtime_music_driver;
 
-#endif /* !MUSIC_MACOSX_QUICKTIME_H */
+#endif /* MUSIC_MACOSX_QUICKTIME_H */
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 36b79b30b..1096584d9 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -1,7 +1,6 @@
 /* $Id$ */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "win32_m.h"
 #include <windows.h>
 #include <mmsystem.h>
@@ -50,7 +49,7 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
 	char buf[512];
 
 	va_start(va, cmd);
-	vsprintf(buf, cmd, va);
+	vsnprintf(buf, lengthof(buf), cmd, va);
 	va_end(va);
 	return mciSendStringA(buf, NULL, 0, 0);
 }
@@ -58,12 +57,9 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
 static bool MidiIntPlaySong(const char *filename)
 {
 	MidiSendCommand("close all");
-	if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0)
-		return false;
+	if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0) return false;
 
-	if (MidiSendCommand("play song from 0") != 0)
-		return false;
-	return true;
+	return MidiSendCommand("play song from 0") == 0;
 }
 
 static void MidiIntStopSong(void)
@@ -104,9 +100,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
 			s[0] = '\0';
 
 			// Delay somewhat in case we don't manage to play.
-			if (!_midi.playing) {
-				Sleep(5000);
-			}
+			if (!_midi.playing) Sleep(5000);
 		}
 
 		if (_midi.stop_song && _midi.playing) {
@@ -115,8 +109,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
 			MidiIntStopSong();
 		}
 
-		if (_midi.playing && !MidiIntIsSongPlaying())
-			_midi.playing = false;
+		if (_midi.playing && !MidiIntIsSongPlaying()) _midi.playing = false;
 
 		WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000);
 	} while (!_midi.terminate);
@@ -148,8 +141,7 @@ static const char *Win32MidiStart(const char * const *parm)
 		}
 	}
 
-	if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL)
-		return "Failed to create thread";
+	if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL) return "Failed to create thread";
 
 	return NULL;
 }