diff options
author | Michael Chicoine <mc2739@gmail.com> | 2010-07-25 19:35:19 +0000 |
---|---|---|
committer | Michael Chicoine <mc2739@gmail.com> | 2010-07-25 19:35:19 +0000 |
commit | 91a45d2ecc89d29e4317d21c7e59efabf64324f6 (patch) | |
tree | d8c44866ae77daa276545202e032e4776faff7d1 /apps/plugins | |
parent | 803a0edb58e46e2031358b09ac340b38f58a87b5 (diff) | |
download | rockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.tar.gz rockbox-91a45d2ecc89d29e4317d21c7e59efabf64324f6.zip |
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/plugins')
-rw-r--r-- | apps/plugins/midi/midiutil.c | 18 | ||||
-rw-r--r-- | 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) | |||
54 | 54 | ||
55 | if (size + 4 > (int)totalSize) | 55 | if (size + 4 > (int)totalSize) |
56 | { | 56 | { |
57 | printf("MALLOC BARF"); | 57 | midi_debug("MALLOC BARF"); |
58 | printf("MALLOC BARF"); | 58 | midi_debug("MALLOC BARF"); |
59 | printf("MALLOC BARF"); | 59 | midi_debug("MALLOC BARF"); |
60 | printf("MALLOC BARF"); | 60 | midi_debug("MALLOC BARF"); |
61 | printf("MALLOC BARF"); | 61 | midi_debug("MALLOC BARF"); |
62 | printf("MALLOC BARF"); | 62 | midi_debug("MALLOC BARF"); |
63 | printf("MALLOC BARF"); | 63 | midi_debug("MALLOC BARF"); |
64 | /* We've made our point. */ | 64 | /* We've made our point. */ |
65 | 65 | ||
66 | return NULL; | 66 | return NULL; |
@@ -132,8 +132,8 @@ int eof(int fd) | |||
132 | return size+1 == rb->lseek(fd, 0, SEEK_CUR); | 132 | return size+1 == rb->lseek(fd, 0, SEEK_CUR); |
133 | } | 133 | } |
134 | 134 | ||
135 | // Here is a hacked up printf command to get the output from the game. | 135 | /* Here is a hacked up printf command to get the output from the game. */ |
136 | int printf(const char *fmt, ...) | 136 | int midi_debug(const char *fmt, ...) |
137 | { | 137 | { |
138 | static int p_xtpt = 0; | 138 | static int p_xtpt = 0; |
139 | char p_buf[50]; | 139 | 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 | |||
142 | void * dataBlock; | 142 | void * dataBlock; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | int printf(const char *fmt, ...); | 145 | int midi_debug(const char *fmt, ...); |
146 | unsigned char readChar(int file); | 146 | unsigned char readChar(int file); |
147 | int readTwoBytes(int file); | 147 | int readTwoBytes(int file); |
148 | int readFourBytes(int file); | 148 | int readFourBytes(int file); |