From 91a45d2ecc89d29e4317d21c7e59efabf64324f6 Mon Sep 17 00:00:00 2001 From: Michael Chicoine Date: Sun, 25 Jul 2010 19:35:19 +0000 Subject: [PATCH] Rename printf to prevent naming conflict. Also change comment to conform with Rockbox standards. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27562 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/midi/midiutil.c | 18 +++++++++--------- apps/plugins/midi/midiutil.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c index acb1558268..ab90e15c51 100644 --- a/apps/plugins/midi/midiutil.c +++ b/apps/plugins/midi/midiutil.c @@ -54,13 +54,13 @@ void *alloc(int size) if (size + 4 > (int)totalSize) { - printf("MALLOC BARF"); - printf("MALLOC BARF"); - printf("MALLOC BARF"); - printf("MALLOC BARF"); - printf("MALLOC BARF"); - printf("MALLOC BARF"); - printf("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); + midi_debug("MALLOC BARF"); /* We've made our point. */ return NULL; @@ -132,8 +132,8 @@ int eof(int fd) return size+1 == rb->lseek(fd, 0, SEEK_CUR); } -// Here is a hacked up printf command to get the output from the game. -int printf(const char *fmt, ...) +/* Here is a hacked up printf command to get the output from the game. */ +int midi_debug(const char *fmt, ...) { static int p_xtpt = 0; char p_buf[50]; diff --git a/apps/plugins/midi/midiutil.h b/apps/plugins/midi/midiutil.h index d7a252035d..62a31d0c65 100644 --- a/apps/plugins/midi/midiutil.h +++ b/apps/plugins/midi/midiutil.h @@ -142,7 +142,7 @@ struct Track void * dataBlock; }; -int printf(const char *fmt, ...); +int midi_debug(const char *fmt, ...); unsigned char readChar(int file); int readTwoBytes(int file); int readFourBytes(int file);