2 files changed, 24 insertions, 18 deletions

diff --git a/src/audio.c b/src/audio.c
index 4eb1c4a38..7b659a895 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -274,7 +274,7 @@ static void syncAudioDeviceStates(void)
 
 	if (!audio_format.channels)
 		return;
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i ) {
 		switch (audioDeviceStates[i]) {
 		case DEVICE_ON:
 			/* This will reopen only if the audio format changed */
@@ -303,7 +303,7 @@ static int flushAudioBuffer(void)
 
 	syncAudioDeviceStates();
 
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i) {
 		if (audioDeviceStates[i] != DEVICE_ON)
 			continue;
 		err = playAudioOutput(&audioOutputArray[i], audioBuffer,
@@ -340,7 +340,7 @@ int openAudioDevice(AudioFormat * audioFormat)
 
 	syncAudioDeviceStates();
 
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i) {
 		if (audioOutputArray[i].open)
 			ret = 0;
 	}
@@ -349,7 +349,7 @@ int openAudioDevice(AudioFormat * audioFormat)
 		audioOpened = 1;
 	else {
 		/* close all devices if there was an error */
-		for (i = audioOutputArraySize; --i >= 0; ) {
+		for (i = 0; i < audioOutputArraySize; ++i) {
 			closeAudioOutput(&audioOutputArray[i]);
 		}
 
@@ -393,7 +393,7 @@ void dropBufferedAudio(void)
 	syncAudioDeviceStates();
 	audioBufferPos = 0;
 
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i) {
 		if (audioDeviceStates[i] == DEVICE_ON)
 			dropBufferedAudioOutput(&audioOutputArray[i]);
 	}
@@ -409,7 +409,7 @@ void closeAudioDevice(void)
 	audioBuffer = NULL;
 	audioBufferSize = 0;
 
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i) {
 		if (audioDeviceStates[i] == DEVICE_ON)
 			audioDeviceStates[i] = DEVICE_ENABLE;
 		closeAudioOutput(&audioOutputArray[i]);
@@ -422,7 +422,7 @@ void sendMetadataToAudioDevice(MpdTag * tag)
 {
 	int i;
 
-	for (i = audioOutputArraySize; --i >= 0; ) {
+	for (i = 0; i < audioOutputArraySize; ++i) {
 		sendMetadataToAudioOutput(&audioOutputArray[i], tag);
 	}
 }
@@ -500,7 +500,7 @@ void readAudioDevicesState(FILE *fp)
 		if (!name || !(++name))
 			goto errline;
 
-		for (i = audioOutputArraySize; --i >= 0; ) {
+		for (i = 0; i < audioOutputArraySize; ++i) {
 			if (!strcmp(name, audioOutputArray[i].name)) {
 				/* devices default to on */
 				if (!atoi(c))
diff --git a/src/log.c b/src/log.c
index a59b331f1..2e6eb3575 100644
--- a/src/log.c
+++ b/src/log.c
@@ -93,22 +93,28 @@ static void do_log(FILE *fp, const char *fmt, va_list args)
 
 void flushWarningLog(void)
 {
-	char *s;
+	char *s = warningBuffer;
 
 	DEBUG("flushing warning messages\n");
 
-	if (warningBuffer == NULL)
-		return;
-
-	s = strtok(warningBuffer, "\n");
-	while (s != NULL) {
-		fprintf(stderr, "%s\n", s);
-		s = strtok(NULL, "\n");
+	if (warningBuffer != NULL)
+	{
+		while (s != NULL) {
+			char * next = strchr(s, '\n');
+			if (next != NULL) {
+				*next = '\0';
+				next++;
+			}
+			fprintf(stderr, "%s\n", s);
+			s = next;
+		}
+
+		warningBuffer = NULL;
 	}
 
-	free(warningBuffer);
-	warningBuffer = NULL;
 	warningFlushed = 1;
+
+	DEBUG("done flushing warning messages\n");
 }
 
 void initLog(const int verbose)