summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMichael Chicoine <mc2739@gmail.com>2010-07-25 19:35:19 +0000
committerMichael Chicoine <mc2739@gmail.com>2010-07-25 19:35:19 +0000
commit91a45d2ecc89d29e4317d21c7e59efabf64324f6 (patch)
treed8c44866ae77daa276545202e032e4776faff7d1 /apps
parent803a0edb58e46e2031358b09ac340b38f58a87b5 (diff)
downloadrockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.zip
rockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.tar.gz
rockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.tar.bz2
rockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.tar.xz
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
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/midi/midiutil.c18
-rw-r--r--apps/plugins/midi/midiutil.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index acb1558..ab90e15 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 d7a2520..62a31d0 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);