From 904e615af2cd375552842787e07997f97656f472 Mon Sep 17 00:00:00 2001
From: angel <angel@c87de0a0-a11c-0410-a1e5-866214bc28b2>
Date: Thu, 12 May 2005 05:32:23 +0000
Subject: [PATCH] Changed reallocs() in song.c, ss_song.c and midi_song.c to
 allow being easily replaced by the new GROW() macro.

git-svn-id: file:///home/angel/tmp/svn-triptico/ahxm/trunk@569 c87de0a0-a11c-0410-a1e5-866214bc28b2
---
 midi_song.c | 8 ++++----
 song.c      | 8 ++++----
 ss_song.c   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/midi_song.c b/midi_song.c
index 116df53..6502904 100644
--- a/midi_song.c
+++ b/midi_song.c
@@ -111,14 +111,14 @@ int midi_fd=2;
 static void add_midi_ev(union midi_ev * e)
 /* adds a MIDI song event */
 {
-	n_midi_ev++;
-
 	/* reallocs */
 	midi_song=(union midi_ev *)realloc(midi_song,
-		n_midi_ev * sizeof(union midi_ev));
+		(n_midi_ev + 1) * sizeof(union midi_ev));
 
 	/* store */
-	memcpy(&midi_song[n_midi_ev - 1], e, sizeof(union midi_ev));
+	memcpy(&midi_song[n_midi_ev], e, sizeof(union midi_ev));
+
+	n_midi_ev++;
 }
 
 
diff --git a/song.c b/song.c
index 6547083..2dc0bea 100644
--- a/song.c
+++ b/song.c
@@ -71,14 +71,14 @@ void song_clear(void)
  */
 void add_song_ev(union song_ev * ev)
 {
-	_n_song_ev++;
-
 	/* reallocs */
 	_song=(union song_ev *)realloc(_song,
-		_n_song_ev * sizeof(union song_ev));
+		(_n_song_ev + 1) * sizeof(union song_ev));
 
 	/* store */
-	memcpy(&_song[_n_song_ev - 1], ev, sizeof(union song_ev));
+	memcpy(&_song[_n_song_ev], ev, sizeof(union song_ev));
+
+	_n_song_ev++;
 }
 
 
diff --git a/ss_song.c b/ss_song.c
index 223237b..beca456 100644
--- a/ss_song.c
+++ b/ss_song.c
@@ -163,14 +163,14 @@ struct ss_ins song_ins[SONG_INS_NUM];
 static void add_ss_ev(union ss_ev * e)
 /* adds a softsynth song event */
 {
-	n_ss_ev++;
-
 	/* reallocs */
 	ss_song=(union ss_ev *)realloc(ss_song,
-		n_ss_ev * sizeof(union ss_ev));
+		(n_ss_ev + 1) * sizeof(union ss_ev));
 
 	/* store */
-	memcpy(&ss_song[n_ss_ev - 1], e, sizeof(union ss_ev));
+	memcpy(&ss_song[n_ss_ev], e, sizeof(union ss_ev));
+
+	n_ss_ev++;
 }
 
 
-- 
2.11.4.GIT