diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2012-03-04 20:13:43 +0100 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2012-04-14 17:31:14 +0200 |
commit | c26ab37aca59da2fde7d96ab8528ac2b002a8192 (patch) | |
tree | 49c977c9f8662a20b99769c9c0cb7b5fd5fb3645 /apps/plugins | |
parent | cf1e54b21edc9f68e65694249f0b8c61b3e515c1 (diff) | |
download | rockbox-c26ab37aca59da2fde7d96ab8528ac2b002a8192.tar.gz rockbox-c26ab37aca59da2fde7d96ab8528ac2b002a8192.zip |
mikmod plugin: make functions static when possible
Change-Id: Ic0102071318c55c19952029be6998ecf5f33eb98
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/mikmod/load_669.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_amf.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_dsm.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_far.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_gdm.c | 14 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_gt2.c | 12 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_imf.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_it.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_med.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_mtm.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_okt.c | 6 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_s3m.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_stm.c | 8 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_ult.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_uni.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/load_xm.c | 10 | ||||
-rw-r--r-- | apps/plugins/mikmod/mdreg.c | 2 | ||||
-rw-r--r-- | apps/plugins/mikmod/mdriver.c | 2 | ||||
-rw-r--r-- | apps/plugins/mikmod/mikmod.c | 30 | ||||
-rw-r--r-- | apps/plugins/mikmod/mloader.c | 4 | ||||
-rw-r--r-- | apps/plugins/mikmod/mlreg.c | 2 | ||||
-rw-r--r-- | apps/plugins/mikmod/mmerror.c | 2 | ||||
-rw-r--r-- | apps/plugins/mikmod/mplayer.c | 12 |
23 files changed, 107 insertions, 107 deletions
diff --git a/apps/plugins/mikmod/load_669.c b/apps/plugins/mikmod/load_669.c index aad0145cef..000e51d985 100644 --- a/apps/plugins/mikmod/load_669.c +++ b/apps/plugins/mikmod/load_669.c | |||
@@ -88,7 +88,7 @@ static CHAR* S69_Version[]={ | |||
88 | 88 | ||
89 | /*========== Loader code */ | 89 | /*========== Loader code */ |
90 | 90 | ||
91 | int S69_Test(void) | 91 | static int S69_Test(void) |
92 | { | 92 | { |
93 | UBYTE buf[0x80]; | 93 | UBYTE buf[0x80]; |
94 | 94 | ||
@@ -122,7 +122,7 @@ int S69_Test(void) | |||
122 | return 1; | 122 | return 1; |
123 | } | 123 | } |
124 | 124 | ||
125 | int S69_Init(void) | 125 | static int S69_Init(void) |
126 | { | 126 | { |
127 | if(!(s69pat=(S69NOTE *)MikMod_malloc(64*8*sizeof(S69NOTE)))) return 0; | 127 | if(!(s69pat=(S69NOTE *)MikMod_malloc(64*8*sizeof(S69NOTE)))) return 0; |
128 | if(!(mh=(S69HEADER *)MikMod_malloc(sizeof(S69HEADER)))) return 0; | 128 | if(!(mh=(S69HEADER *)MikMod_malloc(sizeof(S69HEADER)))) return 0; |
@@ -130,7 +130,7 @@ int S69_Init(void) | |||
130 | return 1; | 130 | return 1; |
131 | } | 131 | } |
132 | 132 | ||
133 | void S69_Cleanup(void) | 133 | static void S69_Cleanup(void) |
134 | { | 134 | { |
135 | MikMod_free(s69pat); | 135 | MikMod_free(s69pat); |
136 | MikMod_free(mh); | 136 | MikMod_free(mh); |
@@ -245,7 +245,7 @@ static int S69_LoadPatterns(void) | |||
245 | return 1; | 245 | return 1; |
246 | } | 246 | } |
247 | 247 | ||
248 | int S69_Load(int curious) | 248 | static int S69_Load(int curious) |
249 | { | 249 | { |
250 | int i; | 250 | int i; |
251 | SAMPLE *current; | 251 | SAMPLE *current; |
@@ -343,7 +343,7 @@ int S69_Load(int curious) | |||
343 | return 1; | 343 | return 1; |
344 | } | 344 | } |
345 | 345 | ||
346 | CHAR *S69_LoadTitle(void) | 346 | static CHAR *S69_LoadTitle(void) |
347 | { | 347 | { |
348 | CHAR s[36]; | 348 | CHAR s[36]; |
349 | 349 | ||
diff --git a/apps/plugins/mikmod/load_amf.c b/apps/plugins/mikmod/load_amf.c index 5bb1c672fa..32067602f2 100644 --- a/apps/plugins/mikmod/load_amf.c +++ b/apps/plugins/mikmod/load_amf.c | |||
@@ -88,7 +88,7 @@ static AMFNOTE *track = NULL; | |||
88 | 88 | ||
89 | /*========== Loader code */ | 89 | /*========== Loader code */ |
90 | 90 | ||
91 | int AMF_Test(void) | 91 | static int AMF_Test(void) |
92 | { | 92 | { |
93 | UBYTE id[3],ver; | 93 | UBYTE id[3],ver; |
94 | 94 | ||
@@ -100,7 +100,7 @@ int AMF_Test(void) | |||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | int AMF_Init(void) | 103 | static int AMF_Init(void) |
104 | { | 104 | { |
105 | if(!(mh=(AMFHEADER*)MikMod_malloc(sizeof(AMFHEADER)))) return 0; | 105 | if(!(mh=(AMFHEADER*)MikMod_malloc(sizeof(AMFHEADER)))) return 0; |
106 | if(!(track=(AMFNOTE*)MikMod_calloc(64,sizeof(AMFNOTE)))) return 0; | 106 | if(!(track=(AMFNOTE*)MikMod_calloc(64,sizeof(AMFNOTE)))) return 0; |
@@ -108,7 +108,7 @@ int AMF_Init(void) | |||
108 | return 1; | 108 | return 1; |
109 | } | 109 | } |
110 | 110 | ||
111 | void AMF_Cleanup(void) | 111 | static void AMF_Cleanup(void) |
112 | { | 112 | { |
113 | MikMod_free(mh); | 113 | MikMod_free(mh); |
114 | MikMod_free(track); | 114 | MikMod_free(track); |
@@ -330,7 +330,7 @@ static UBYTE* AMF_ConvertTrack(void) | |||
330 | return UniDup(); | 330 | return UniDup(); |
331 | } | 331 | } |
332 | 332 | ||
333 | int AMF_Load(int curious) | 333 | static int AMF_Load(int curious) |
334 | { | 334 | { |
335 | int u,defaultpanning; | 335 | int u,defaultpanning; |
336 | unsigned int t,realtrackcnt,realsmpcnt; | 336 | unsigned int t,realtrackcnt,realsmpcnt; |
@@ -545,7 +545,7 @@ int AMF_Load(int curious) | |||
545 | return 1; | 545 | return 1; |
546 | } | 546 | } |
547 | 547 | ||
548 | CHAR *AMF_LoadTitle(void) | 548 | static CHAR *AMF_LoadTitle(void) |
549 | { | 549 | { |
550 | CHAR s[32]; | 550 | CHAR s[32]; |
551 | 551 | ||
diff --git a/apps/plugins/mikmod/load_dsm.c b/apps/plugins/mikmod/load_dsm.c index 9423405cff..59abf0bcfe 100644 --- a/apps/plugins/mikmod/load_dsm.c +++ b/apps/plugins/mikmod/load_dsm.c | |||
@@ -105,7 +105,7 @@ static unsigned char DSMSIG[4+4]={'R','I','F','F','D','S','M','F'}; | |||
105 | 105 | ||
106 | /*========== Loader code */ | 106 | /*========== Loader code */ |
107 | 107 | ||
108 | int DSM_Test(void) | 108 | static int DSM_Test(void) |
109 | { | 109 | { |
110 | UBYTE id[12]; | 110 | UBYTE id[12]; |
111 | 111 | ||
@@ -115,14 +115,14 @@ int DSM_Test(void) | |||
115 | return 0; | 115 | return 0; |
116 | } | 116 | } |
117 | 117 | ||
118 | int DSM_Init(void) | 118 | static int DSM_Init(void) |
119 | { | 119 | { |
120 | if(!(dsmbuf=(DSMNOTE *)MikMod_malloc(DSM_MAXCHAN*64*sizeof(DSMNOTE)))) return 0; | 120 | if(!(dsmbuf=(DSMNOTE *)MikMod_malloc(DSM_MAXCHAN*64*sizeof(DSMNOTE)))) return 0; |
121 | if(!(mh=(DSMSONG *)MikMod_calloc(1,sizeof(DSMSONG)))) return 0; | 121 | if(!(mh=(DSMSONG *)MikMod_calloc(1,sizeof(DSMSONG)))) return 0; |
122 | return 1; | 122 | return 1; |
123 | } | 123 | } |
124 | 124 | ||
125 | void DSM_Cleanup(void) | 125 | static void DSM_Cleanup(void) |
126 | { | 126 | { |
127 | MikMod_free(dsmbuf); | 127 | MikMod_free(dsmbuf); |
128 | MikMod_free(mh); | 128 | MikMod_free(mh); |
@@ -231,7 +231,7 @@ static UBYTE *DSM_ConvertTrack(DSMNOTE *tr) | |||
231 | return UniDup(); | 231 | return UniDup(); |
232 | } | 232 | } |
233 | 233 | ||
234 | int DSM_Load(int curious) | 234 | static int DSM_Load(int curious) |
235 | { | 235 | { |
236 | int t; | 236 | int t; |
237 | DSMINST s; | 237 | DSMINST s; |
@@ -338,7 +338,7 @@ int DSM_Load(int curious) | |||
338 | return 1; | 338 | return 1; |
339 | } | 339 | } |
340 | 340 | ||
341 | CHAR *DSM_LoadTitle(void) | 341 | static CHAR *DSM_LoadTitle(void) |
342 | { | 342 | { |
343 | CHAR s[28]; | 343 | CHAR s[28]; |
344 | 344 | ||
diff --git a/apps/plugins/mikmod/load_far.c b/apps/plugins/mikmod/load_far.c index a45e207737..2a1a44eda9 100644 --- a/apps/plugins/mikmod/load_far.c +++ b/apps/plugins/mikmod/load_far.c | |||
@@ -96,7 +96,7 @@ static unsigned char FARSIG[4+3]={'F','A','R',0xfe,13,10,26}; | |||
96 | 96 | ||
97 | /*========== Loader code */ | 97 | /*========== Loader code */ |
98 | 98 | ||
99 | int FAR_Test(void) | 99 | static int FAR_Test(void) |
100 | { | 100 | { |
101 | UBYTE id[47]; | 101 | UBYTE id[47]; |
102 | 102 | ||
@@ -105,7 +105,7 @@ int FAR_Test(void) | |||
105 | return 1; | 105 | return 1; |
106 | } | 106 | } |
107 | 107 | ||
108 | int FAR_Init(void) | 108 | static int FAR_Init(void) |
109 | { | 109 | { |
110 | if(!(mh1 = (FARHEADER1*)MikMod_malloc(sizeof(FARHEADER1)))) return 0; | 110 | if(!(mh1 = (FARHEADER1*)MikMod_malloc(sizeof(FARHEADER1)))) return 0; |
111 | if(!(mh2 = (FARHEADER2*)MikMod_malloc(sizeof(FARHEADER2)))) return 0; | 111 | if(!(mh2 = (FARHEADER2*)MikMod_malloc(sizeof(FARHEADER2)))) return 0; |
@@ -114,7 +114,7 @@ int FAR_Init(void) | |||
114 | return 1; | 114 | return 1; |
115 | } | 115 | } |
116 | 116 | ||
117 | void FAR_Cleanup(void) | 117 | static void FAR_Cleanup(void) |
118 | { | 118 | { |
119 | MikMod_free(mh1); | 119 | MikMod_free(mh1); |
120 | MikMod_free(mh2); | 120 | MikMod_free(mh2); |
@@ -173,7 +173,7 @@ static UBYTE *FAR_ConvertTrack(FARNOTE* n,int rows) | |||
173 | return UniDup(); | 173 | return UniDup(); |
174 | } | 174 | } |
175 | 175 | ||
176 | int FAR_Load(int curious) | 176 | static int FAR_Load(int curious) |
177 | { | 177 | { |
178 | int t,u,tracks=0; | 178 | int t,u,tracks=0; |
179 | SAMPLE *q; | 179 | SAMPLE *q; |
@@ -321,7 +321,7 @@ int FAR_Load(int curious) | |||
321 | return 1; | 321 | return 1; |
322 | } | 322 | } |
323 | 323 | ||
324 | CHAR *FAR_LoadTitle(void) | 324 | static CHAR *FAR_LoadTitle(void) |
325 | { | 325 | { |
326 | CHAR s[40]; | 326 | CHAR s[40]; |
327 | 327 | ||
diff --git a/apps/plugins/mikmod/load_gdm.c b/apps/plugins/mikmod/load_gdm.c index 18a1d8eb1e..694d534236 100644 --- a/apps/plugins/mikmod/load_gdm.c +++ b/apps/plugins/mikmod/load_gdm.c | |||
@@ -116,7 +116,7 @@ static GDMNOTE *gdmbuf=NULL; /* pointer to a complete GDM pattern */ | |||
116 | 116 | ||
117 | CHAR GDM_Version[]="General DigiMusic 1.xx"; | 117 | CHAR GDM_Version[]="General DigiMusic 1.xx"; |
118 | 118 | ||
119 | int GDM_Test(void) | 119 | static int GDM_Test(void) |
120 | { | 120 | { |
121 | /* test for gdm magic numbers */ | 121 | /* test for gdm magic numbers */ |
122 | UBYTE id[4]; | 122 | UBYTE id[4]; |
@@ -134,7 +134,7 @@ int GDM_Test(void) | |||
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | int GDM_Init(void) | 137 | static int GDM_Init(void) |
138 | { | 138 | { |
139 | if (!(gdmbuf=(GDMNOTE*)MikMod_malloc(32*64*sizeof(GDMNOTE)))) return 0; | 139 | if (!(gdmbuf=(GDMNOTE*)MikMod_malloc(32*64*sizeof(GDMNOTE)))) return 0; |
140 | if (!(mh=(GDMHEADER*)MikMod_malloc(sizeof(GDMHEADER)))) return 0; | 140 | if (!(mh=(GDMHEADER*)MikMod_malloc(sizeof(GDMHEADER)))) return 0; |
@@ -142,13 +142,13 @@ int GDM_Init(void) | |||
142 | return 1; | 142 | return 1; |
143 | } | 143 | } |
144 | 144 | ||
145 | void GDM_Cleanup(void) | 145 | static void GDM_Cleanup(void) |
146 | { | 146 | { |
147 | MikMod_free(mh); | 147 | MikMod_free(mh); |
148 | MikMod_free(gdmbuf); | 148 | MikMod_free(gdmbuf); |
149 | } | 149 | } |
150 | 150 | ||
151 | int GDM_ReadPattern(void) | 151 | static int GDM_ReadPattern(void) |
152 | { | 152 | { |
153 | int pos,flag,ch,i,maxch; | 153 | int pos,flag,ch,i,maxch; |
154 | GDMNOTE n; | 154 | GDMNOTE n; |
@@ -200,7 +200,7 @@ int GDM_ReadPattern(void) | |||
200 | return 1; | 200 | return 1; |
201 | } | 201 | } |
202 | 202 | ||
203 | UBYTE *GDM_ConvertTrack(GDMNOTE*tr) | 203 | static UBYTE *GDM_ConvertTrack(GDMNOTE*tr) |
204 | { | 204 | { |
205 | int t,i=0; | 205 | int t,i=0; |
206 | UBYTE note,ins,inf; | 206 | UBYTE note,ins,inf; |
@@ -337,7 +337,7 @@ UBYTE *GDM_ConvertTrack(GDMNOTE*tr) | |||
337 | return UniDup(); | 337 | return UniDup(); |
338 | } | 338 | } |
339 | 339 | ||
340 | int GDM_Load(int curious) | 340 | static int GDM_Load(int curious) |
341 | { | 341 | { |
342 | int i,x,u,track; | 342 | int i,x,u,track; |
343 | SAMPLE *q; | 343 | SAMPLE *q; |
@@ -534,7 +534,7 @@ int GDM_Load(int curious) | |||
534 | return 1; | 534 | return 1; |
535 | } | 535 | } |
536 | 536 | ||
537 | CHAR *GDM_LoadTitle(void) | 537 | static CHAR *GDM_LoadTitle(void) |
538 | { | 538 | { |
539 | CHAR s[32]; | 539 | CHAR s[32]; |
540 | 540 | ||
diff --git a/apps/plugins/mikmod/load_gt2.c b/apps/plugins/mikmod/load_gt2.c index 9baef5c09b..26b4d1f59a 100644 --- a/apps/plugins/mikmod/load_gt2.c +++ b/apps/plugins/mikmod/load_gt2.c | |||
@@ -192,7 +192,7 @@ typedef union GT_CHUNK | |||
192 | ENDC_CHUNK endc; | 192 | ENDC_CHUNK endc; |
193 | } GT_CHUNK; | 193 | } GT_CHUNK; |
194 | 194 | ||
195 | GT_CHUNK *loadChunk(void) | 195 | static GT_CHUNK *loadChunk(void) |
196 | { | 196 | { |
197 | GT_CHUNK *new_chunk = MikMod_malloc(sizeof(GT_CHUNK)); | 197 | GT_CHUNK *new_chunk = MikMod_malloc(sizeof(GT_CHUNK)); |
198 | 198 | ||
@@ -312,12 +312,12 @@ GT_CHUNK *loadChunk(void) | |||
312 | return NULL; // unknown chunk | 312 | return NULL; // unknown chunk |
313 | } | 313 | } |
314 | 314 | ||
315 | int GT2_Init(void) | 315 | static int GT2_Init(void) |
316 | { | 316 | { |
317 | return 1; | 317 | return 1; |
318 | } | 318 | } |
319 | 319 | ||
320 | int GT2_Test(void) | 320 | static int GT2_Test(void) |
321 | { | 321 | { |
322 | UBYTE magic[3]; | 322 | UBYTE magic[3]; |
323 | _mm_fseek(modreader, 0, SEEK_SET); | 323 | _mm_fseek(modreader, 0, SEEK_SET); |
@@ -329,7 +329,7 @@ int GT2_Test(void) | |||
329 | return 0; | 329 | return 0; |
330 | } | 330 | } |
331 | 331 | ||
332 | int GT2_Load(int curious) | 332 | static int GT2_Load(int curious) |
333 | { | 333 | { |
334 | GT_CHUNK *tmp; | 334 | GT_CHUNK *tmp; |
335 | (void)curious; | 335 | (void)curious; |
@@ -344,11 +344,11 @@ int GT2_Load(int curious) | |||
344 | return 0; | 344 | return 0; |
345 | } | 345 | } |
346 | 346 | ||
347 | void GT2_Cleanup(void) | 347 | static void GT2_Cleanup(void) |
348 | { | 348 | { |
349 | } | 349 | } |
350 | 350 | ||
351 | CHAR *GT2_LoadTitle(void) | 351 | static CHAR *GT2_LoadTitle(void) |
352 | { | 352 | { |
353 | CHAR title[33]; | 353 | CHAR title[33]; |
354 | _mm_fseek(modreader, 8, SEEK_SET); | 354 | _mm_fseek(modreader, 8, SEEK_SET); |
diff --git a/apps/plugins/mikmod/load_imf.c b/apps/plugins/mikmod/load_imf.c index 568af2935e..9c93d97e23 100644 --- a/apps/plugins/mikmod/load_imf.c +++ b/apps/plugins/mikmod/load_imf.c | |||
@@ -125,7 +125,7 @@ static IMFHEADER *mh=NULL; | |||
125 | 125 | ||
126 | /*========== Loader code */ | 126 | /*========== Loader code */ |
127 | 127 | ||
128 | int IMF_Test(void) | 128 | static int IMF_Test(void) |
129 | { | 129 | { |
130 | UBYTE id[4]; | 130 | UBYTE id[4]; |
131 | 131 | ||
@@ -135,7 +135,7 @@ int IMF_Test(void) | |||
135 | return 0; | 135 | return 0; |
136 | } | 136 | } |
137 | 137 | ||
138 | int IMF_Init(void) | 138 | static int IMF_Init(void) |
139 | { | 139 | { |
140 | if(!(imfpat=(IMFNOTE*)MikMod_malloc(32*256*sizeof(IMFNOTE)))) return 0; | 140 | if(!(imfpat=(IMFNOTE*)MikMod_malloc(32*256*sizeof(IMFNOTE)))) return 0; |
141 | if(!(mh=(IMFHEADER*)MikMod_malloc(sizeof(IMFHEADER)))) return 0; | 141 | if(!(mh=(IMFHEADER*)MikMod_malloc(sizeof(IMFHEADER)))) return 0; |
@@ -143,7 +143,7 @@ int IMF_Init(void) | |||
143 | return 1; | 143 | return 1; |
144 | } | 144 | } |
145 | 145 | ||
146 | void IMF_Cleanup(void) | 146 | static void IMF_Cleanup(void) |
147 | { | 147 | { |
148 | FreeLinear(); | 148 | FreeLinear(); |
149 | 149 | ||
@@ -377,7 +377,7 @@ static UBYTE* IMF_ConvertTrack(IMFNOTE* tr,UWORD rows) | |||
377 | return UniDup(); | 377 | return UniDup(); |
378 | } | 378 | } |
379 | 379 | ||
380 | int IMF_Load(int curious) | 380 | static int IMF_Load(int curious) |
381 | { | 381 | { |
382 | #define IMF_SMPINCR 64 | 382 | #define IMF_SMPINCR 64 |
383 | int t,u,track=0,oldnumsmp; | 383 | int t,u,track=0,oldnumsmp; |
@@ -713,7 +713,7 @@ int IMF_Load(int curious) | |||
713 | return 1; | 713 | return 1; |
714 | } | 714 | } |
715 | 715 | ||
716 | CHAR *IMF_LoadTitle(void) | 716 | static CHAR *IMF_LoadTitle(void) |
717 | { | 717 | { |
718 | CHAR s[31]; | 718 | CHAR s[31]; |
719 | 719 | ||
diff --git a/apps/plugins/mikmod/load_it.c b/apps/plugins/mikmod/load_it.c index 7f966339cf..c48d126f77 100644 --- a/apps/plugins/mikmod/load_it.c +++ b/apps/plugins/mikmod/load_it.c | |||
@@ -181,7 +181,7 @@ static UBYTE portatable[10]= {0,1,4,8,16,32,64,96,128,255}; | |||
181 | 181 | ||
182 | /*========== Loader code */ | 182 | /*========== Loader code */ |
183 | 183 | ||
184 | int IT_Test(void) | 184 | static int IT_Test(void) |
185 | { | 185 | { |
186 | UBYTE id[4]; | 186 | UBYTE id[4]; |
187 | 187 | ||
@@ -190,7 +190,7 @@ int IT_Test(void) | |||
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |
192 | 192 | ||
193 | int IT_Init(void) | 193 | static int IT_Init(void) |
194 | { | 194 | { |
195 | if(!(mh=(ITHEADER*)MikMod_malloc(sizeof(ITHEADER)))) return 0; | 195 | if(!(mh=(ITHEADER*)MikMod_malloc(sizeof(ITHEADER)))) return 0; |
196 | if(!(poslookup=(UBYTE*)MikMod_malloc(256*sizeof(UBYTE)))) return 0; | 196 | if(!(poslookup=(UBYTE*)MikMod_malloc(256*sizeof(UBYTE)))) return 0; |
@@ -201,7 +201,7 @@ int IT_Init(void) | |||
201 | return 1; | 201 | return 1; |
202 | } | 202 | } |
203 | 203 | ||
204 | void IT_Cleanup(void) | 204 | static void IT_Cleanup(void) |
205 | { | 205 | { |
206 | FreeLinear(); | 206 | FreeLinear(); |
207 | 207 | ||
@@ -441,7 +441,7 @@ static void IT_LoadMidiConfiguration(MREADER* modreader) | |||
441 | } | 441 | } |
442 | } | 442 | } |
443 | 443 | ||
444 | int IT_Load(int curious) | 444 | static int IT_Load(int curious) |
445 | { | 445 | { |
446 | int t,u,lp; | 446 | int t,u,lp; |
447 | INSTRUMENT *d; | 447 | INSTRUMENT *d; |
@@ -985,7 +985,7 @@ int IT_Load(int curious) | |||
985 | return 1; | 985 | return 1; |
986 | } | 986 | } |
987 | 987 | ||
988 | CHAR *IT_LoadTitle(void) | 988 | static CHAR *IT_LoadTitle(void) |
989 | { | 989 | { |
990 | CHAR s[26]; | 990 | CHAR s[26]; |
991 | 991 | ||
diff --git a/apps/plugins/mikmod/load_med.c b/apps/plugins/mikmod/load_med.c index 21a85b39a0..aafb6602a6 100644 --- a/apps/plugins/mikmod/load_med.c +++ b/apps/plugins/mikmod/load_med.c | |||
@@ -159,7 +159,7 @@ static CHAR MED_Version[] = "OctaMED (MMDx)"; | |||
159 | 159 | ||
160 | /*========== Loader code */ | 160 | /*========== Loader code */ |
161 | 161 | ||
162 | int MED_Test(void) | 162 | static int MED_Test(void) |
163 | { | 163 | { |
164 | UBYTE id[4]; | 164 | UBYTE id[4]; |
165 | 165 | ||
@@ -170,7 +170,7 @@ int MED_Test(void) | |||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | int MED_Init(void) | 173 | static int MED_Init(void) |
174 | { | 174 | { |
175 | if (!(me = (MEDEXP *)MikMod_malloc(sizeof(MEDEXP)))) | 175 | if (!(me = (MEDEXP *)MikMod_malloc(sizeof(MEDEXP)))) |
176 | return 0; | 176 | return 0; |
@@ -181,7 +181,7 @@ int MED_Init(void) | |||
181 | return 1; | 181 | return 1; |
182 | } | 182 | } |
183 | 183 | ||
184 | void MED_Cleanup(void) | 184 | static void MED_Cleanup(void) |
185 | { | 185 | { |
186 | MikMod_free(me); | 186 | MikMod_free(me); |
187 | MikMod_free(mh); | 187 | MikMod_free(mh); |
@@ -426,7 +426,7 @@ static int LoadMMD1Patterns(void) | |||
426 | return 1; | 426 | return 1; |
427 | } | 427 | } |
428 | 428 | ||
429 | int MED_Load(int curious) | 429 | static int MED_Load(int curious) |
430 | { | 430 | { |
431 | int t; | 431 | int t; |
432 | ULONG sa[64]; | 432 | ULONG sa[64]; |
@@ -680,7 +680,7 @@ int MED_Load(int curious) | |||
680 | return 1; | 680 | return 1; |
681 | } | 681 | } |
682 | 682 | ||
683 | CHAR *MED_LoadTitle(void) | 683 | static CHAR *MED_LoadTitle(void) |
684 | { | 684 | { |
685 | ULONG posit, namelen; | 685 | ULONG posit, namelen; |
686 | CHAR *name, *retvalue = NULL; | 686 | CHAR *name, *retvalue = NULL; |
diff --git a/apps/plugins/mikmod/load_mtm.c b/apps/plugins/mikmod/load_mtm.c index bd6223d948..6c9fb30846 100644 --- a/apps/plugins/mikmod/load_mtm.c +++ b/apps/plugins/mikmod/load_mtm.c | |||
@@ -87,7 +87,7 @@ static CHAR MTM_Version[] = "MTM"; | |||
87 | 87 | ||
88 | /*========== Loader code */ | 88 | /*========== Loader code */ |
89 | 89 | ||
90 | int MTM_Test(void) | 90 | static int MTM_Test(void) |
91 | { | 91 | { |
92 | UBYTE id[3]; | 92 | UBYTE id[3]; |
93 | 93 | ||
@@ -96,7 +96,7 @@ int MTM_Test(void) | |||
96 | return 0; | 96 | return 0; |
97 | } | 97 | } |
98 | 98 | ||
99 | int MTM_Init(void) | 99 | static int MTM_Init(void) |
100 | { | 100 | { |
101 | if(!(mtmtrk=(MTMNOTE*)MikMod_calloc(64,sizeof(MTMNOTE)))) return 0; | 101 | if(!(mtmtrk=(MTMNOTE*)MikMod_calloc(64,sizeof(MTMNOTE)))) return 0; |
102 | if(!(mh=(MTMHEADER*)MikMod_malloc(sizeof(MTMHEADER)))) return 0; | 102 | if(!(mh=(MTMHEADER*)MikMod_malloc(sizeof(MTMHEADER)))) return 0; |
@@ -104,7 +104,7 @@ int MTM_Init(void) | |||
104 | return 1; | 104 | return 1; |
105 | } | 105 | } |
106 | 106 | ||
107 | void MTM_Cleanup(void) | 107 | static void MTM_Cleanup(void) |
108 | { | 108 | { |
109 | MikMod_free(mtmtrk); | 109 | MikMod_free(mtmtrk); |
110 | MikMod_free(mh); | 110 | MikMod_free(mh); |
@@ -140,7 +140,7 @@ static UBYTE* MTM_Convert(void) | |||
140 | return UniDup(); | 140 | return UniDup(); |
141 | } | 141 | } |
142 | 142 | ||
143 | int MTM_Load(int curious) | 143 | static int MTM_Load(int curious) |
144 | { | 144 | { |
145 | int t,u; | 145 | int t,u; |
146 | MTMSAMPLE s; | 146 | MTMSAMPLE s; |
@@ -260,7 +260,7 @@ int MTM_Load(int curious) | |||
260 | return 1; | 260 | return 1; |
261 | } | 261 | } |
262 | 262 | ||
263 | CHAR *MTM_LoadTitle(void) | 263 | static CHAR *MTM_LoadTitle(void) |
264 | { | 264 | { |
265 | CHAR s[20]; | 265 | CHAR s[20]; |
266 | 266 | ||
diff --git a/apps/plugins/mikmod/load_okt.c b/apps/plugins/mikmod/load_okt.c index 08d743242c..6a40b5fe03 100644 --- a/apps/plugins/mikmod/load_okt.c +++ b/apps/plugins/mikmod/load_okt.c | |||
@@ -74,7 +74,7 @@ static OKTNOTE *okttrk = NULL; | |||
74 | 74 | ||
75 | /*========== Loader code */ | 75 | /*========== Loader code */ |
76 | 76 | ||
77 | int OKT_Test(void) | 77 | static int OKT_Test(void) |
78 | { | 78 | { |
79 | CHAR id[8]; | 79 | CHAR id[8]; |
80 | 80 | ||
@@ -322,7 +322,7 @@ static void OKT_doSBOD(int insnum) | |||
322 | of.samples[insnum].seekpos = _mm_ftell(modreader); | 322 | of.samples[insnum].seekpos = _mm_ftell(modreader); |
323 | } | 323 | } |
324 | 324 | ||
325 | int OKT_Load(int curious) | 325 | static int OKT_Load(int curious) |
326 | { | 326 | { |
327 | UBYTE id[4]; | 327 | UBYTE id[4]; |
328 | ULONG len; | 328 | ULONG len; |
@@ -440,7 +440,7 @@ int OKT_Load(int curious) | |||
440 | return 1; | 440 | return 1; |
441 | } | 441 | } |
442 | 442 | ||
443 | CHAR *OKT_LoadTitle(void) | 443 | static CHAR *OKT_LoadTitle(void) |
444 | { | 444 | { |
445 | return StrDup(""); | 445 | return StrDup(""); |
446 | } | 446 | } |
diff --git a/apps/plugins/mikmod/load_s3m.c b/apps/plugins/mikmod/load_s3m.c index 71183d2225..e162388f15 100644 --- a/apps/plugins/mikmod/load_s3m.c +++ b/apps/plugins/mikmod/load_s3m.c | |||
@@ -117,7 +117,7 @@ static int numeric[NUMTRACKERS]={14,14,16,16}; | |||
117 | 117 | ||
118 | /*========== Loader code */ | 118 | /*========== Loader code */ |
119 | 119 | ||
120 | int S3M_Test(void) | 120 | static int S3M_Test(void) |
121 | { | 121 | { |
122 | UBYTE id[4]; | 122 | UBYTE id[4]; |
123 | 123 | ||
@@ -127,7 +127,7 @@ int S3M_Test(void) | |||
127 | return 0; | 127 | return 0; |
128 | } | 128 | } |
129 | 129 | ||
130 | int S3M_Init(void) | 130 | static int S3M_Init(void) |
131 | { | 131 | { |
132 | if(!(s3mbuf=(S3MNOTE*)MikMod_malloc(32*64*sizeof(S3MNOTE)))) return 0; | 132 | if(!(s3mbuf=(S3MNOTE*)MikMod_malloc(32*64*sizeof(S3MNOTE)))) return 0; |
133 | if(!(mh=(S3MHEADER*)MikMod_malloc(sizeof(S3MHEADER)))) return 0; | 133 | if(!(mh=(S3MHEADER*)MikMod_malloc(sizeof(S3MHEADER)))) return 0; |
@@ -137,7 +137,7 @@ int S3M_Init(void) | |||
137 | return 1; | 137 | return 1; |
138 | } | 138 | } |
139 | 139 | ||
140 | void S3M_Cleanup(void) | 140 | static void S3M_Cleanup(void) |
141 | { | 141 | { |
142 | MikMod_free(s3mbuf); | 142 | MikMod_free(s3mbuf); |
143 | MikMod_free(paraptr); | 143 | MikMod_free(paraptr); |
@@ -250,7 +250,7 @@ static UBYTE* S3M_ConvertTrack(S3MNOTE* tr) | |||
250 | return UniDup(); | 250 | return UniDup(); |
251 | } | 251 | } |
252 | 252 | ||
253 | int S3M_Load(int curious) | 253 | static int S3M_Load(int curious) |
254 | { | 254 | { |
255 | int t,u,track = 0; | 255 | int t,u,track = 0; |
256 | SAMPLE *q; | 256 | SAMPLE *q; |
@@ -444,7 +444,7 @@ int S3M_Load(int curious) | |||
444 | return 1; | 444 | return 1; |
445 | } | 445 | } |
446 | 446 | ||
447 | CHAR *S3M_LoadTitle(void) | 447 | static CHAR *S3M_LoadTitle(void) |
448 | { | 448 | { |
449 | CHAR s[28]; | 449 | CHAR s[28]; |
450 | 450 | ||
diff --git a/apps/plugins/mikmod/load_stm.c b/apps/plugins/mikmod/load_stm.c index c1d771df11..b2537ab68f 100644 --- a/apps/plugins/mikmod/load_stm.c +++ b/apps/plugins/mikmod/load_stm.c | |||
@@ -98,7 +98,7 @@ static CHAR* STM_Version[STM_NTRACKERS] = { | |||
98 | 98 | ||
99 | /*========== Loader code */ | 99 | /*========== Loader code */ |
100 | 100 | ||
101 | int STM_Test(void) | 101 | static int STM_Test(void) |
102 | { | 102 | { |
103 | UBYTE str[44]; | 103 | UBYTE str[44]; |
104 | int t; | 104 | int t; |
@@ -118,7 +118,7 @@ int STM_Test(void) | |||
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | 120 | ||
121 | int STM_Init(void) | 121 | static int STM_Init(void) |
122 | { | 122 | { |
123 | if(!(mh=(STMHEADER*)MikMod_malloc(sizeof(STMHEADER)))) return 0; | 123 | if(!(mh=(STMHEADER*)MikMod_malloc(sizeof(STMHEADER)))) return 0; |
124 | if(!(stmbuf=(STMNOTE*)MikMod_calloc(64U*4,sizeof(STMNOTE)))) return 0; | 124 | if(!(stmbuf=(STMNOTE*)MikMod_calloc(64U*4,sizeof(STMNOTE)))) return 0; |
@@ -250,7 +250,7 @@ static int STM_LoadPatterns(void) | |||
250 | return 1; | 250 | return 1; |
251 | } | 251 | } |
252 | 252 | ||
253 | int STM_Load(int curious) | 253 | static int STM_Load(int curious) |
254 | { | 254 | { |
255 | int t; | 255 | int t; |
256 | ULONG MikMod_ISA; /* We must generate our own ISA, it's not stored in stm */ | 256 | ULONG MikMod_ISA; /* We must generate our own ISA, it's not stored in stm */ |
@@ -349,7 +349,7 @@ int STM_Load(int curious) | |||
349 | return 1; | 349 | return 1; |
350 | } | 350 | } |
351 | 351 | ||
352 | CHAR *STM_LoadTitle(void) | 352 | static CHAR *STM_LoadTitle(void) |
353 | { | 353 | { |
354 | CHAR s[20]; | 354 | CHAR s[20]; |
355 | 355 | ||
diff --git a/apps/plugins/mikmod/load_ult.c b/apps/plugins/mikmod/load_ult.c index 2d8d3a9788..f56c2df06b 100644 --- a/apps/plugins/mikmod/load_ult.c +++ b/apps/plugins/mikmod/load_ult.c | |||
@@ -86,7 +86,7 @@ static ULTEVENT ev; | |||
86 | 86 | ||
87 | /*========== Loader code */ | 87 | /*========== Loader code */ |
88 | 88 | ||
89 | int ULT_Test(void) | 89 | static int ULT_Test(void) |
90 | { | 90 | { |
91 | CHAR id[16]; | 91 | CHAR id[16]; |
92 | 92 | ||
@@ -96,12 +96,12 @@ int ULT_Test(void) | |||
96 | return 1; | 96 | return 1; |
97 | } | 97 | } |
98 | 98 | ||
99 | int ULT_Init(void) | 99 | static int ULT_Init(void) |
100 | { | 100 | { |
101 | return 1; | 101 | return 1; |
102 | } | 102 | } |
103 | 103 | ||
104 | void ULT_Cleanup(void) | 104 | static void ULT_Cleanup(void) |
105 | { | 105 | { |
106 | } | 106 | } |
107 | 107 | ||
@@ -124,7 +124,7 @@ static UBYTE ReadUltEvent(ULTEVENT* event) | |||
124 | return rep; | 124 | return rep; |
125 | } | 125 | } |
126 | 126 | ||
127 | int ULT_Load(int curious) | 127 | static int ULT_Load(int curious) |
128 | { | 128 | { |
129 | int t,u,tracks=0; | 129 | int t,u,tracks=0; |
130 | SAMPLE *q; | 130 | SAMPLE *q; |
@@ -313,7 +313,7 @@ int ULT_Load(int curious) | |||
313 | return 1; | 313 | return 1; |
314 | } | 314 | } |
315 | 315 | ||
316 | CHAR *ULT_LoadTitle(void) | 316 | static CHAR *ULT_LoadTitle(void) |
317 | { | 317 | { |
318 | CHAR s[32]; | 318 | CHAR s[32]; |
319 | 319 | ||
diff --git a/apps/plugins/mikmod/load_uni.c b/apps/plugins/mikmod/load_uni.c index 7a5a24a507..7bedd8f16c 100644 --- a/apps/plugins/mikmod/load_uni.c +++ b/apps/plugins/mikmod/load_uni.c | |||
@@ -108,7 +108,7 @@ static char* readstring(void) | |||
108 | return s; | 108 | return s; |
109 | } | 109 | } |
110 | 110 | ||
111 | int UNI_Test(void) | 111 | static int UNI_Test(void) |
112 | { | 112 | { |
113 | char id[6]; | 113 | char id[6]; |
114 | 114 | ||
@@ -125,12 +125,12 @@ int UNI_Test(void) | |||
125 | return 0; | 125 | return 0; |
126 | } | 126 | } |
127 | 127 | ||
128 | int UNI_Init(void) | 128 | static int UNI_Init(void) |
129 | { | 129 | { |
130 | return 1; | 130 | return 1; |
131 | } | 131 | } |
132 | 132 | ||
133 | void UNI_Cleanup(void) | 133 | static void UNI_Cleanup(void) |
134 | { | 134 | { |
135 | MikMod_free(wh); | 135 | MikMod_free(wh); |
136 | s=NULL; | 136 | s=NULL; |
@@ -498,7 +498,7 @@ static int loadsmp5(void) | |||
498 | return 1; | 498 | return 1; |
499 | } | 499 | } |
500 | 500 | ||
501 | int UNI_Load(int curious) | 501 | static int UNI_Load(int curious) |
502 | { | 502 | { |
503 | int t; | 503 | int t; |
504 | char *modtype,*oldtype=NULL; | 504 | char *modtype,*oldtype=NULL; |
@@ -689,7 +689,7 @@ int UNI_Load(int curious) | |||
689 | return 1; | 689 | return 1; |
690 | } | 690 | } |
691 | 691 | ||
692 | CHAR *UNI_LoadTitle(void) | 692 | static CHAR *UNI_LoadTitle(void) |
693 | { | 693 | { |
694 | UBYTE ver; | 694 | UBYTE ver; |
695 | int posit[3]={304,306,26}; | 695 | int posit[3]={304,306,26}; |
diff --git a/apps/plugins/mikmod/load_xm.c b/apps/plugins/mikmod/load_xm.c index 8eaafc3d93..ffbd6dff4d 100644 --- a/apps/plugins/mikmod/load_xm.c +++ b/apps/plugins/mikmod/load_xm.c | |||
@@ -136,7 +136,7 @@ static XMWAVHEADER *wh=NULL,*s=NULL; | |||
136 | 136 | ||
137 | /*========== Loader code */ | 137 | /*========== Loader code */ |
138 | 138 | ||
139 | int XM_Test(void) | 139 | static int XM_Test(void) |
140 | { | 140 | { |
141 | UBYTE id[38]; | 141 | UBYTE id[38]; |
142 | 142 | ||
@@ -146,13 +146,13 @@ int XM_Test(void) | |||
146 | return 0; | 146 | return 0; |
147 | } | 147 | } |
148 | 148 | ||
149 | int XM_Init(void) | 149 | static int XM_Init(void) |
150 | { | 150 | { |
151 | if(!(mh=(XMHEADER *)MikMod_malloc(sizeof(XMHEADER)))) return 0; | 151 | if(!(mh=(XMHEADER *)MikMod_malloc(sizeof(XMHEADER)))) return 0; |
152 | return 1; | 152 | return 1; |
153 | } | 153 | } |
154 | 154 | ||
155 | void XM_Cleanup(void) | 155 | static void XM_Cleanup(void) |
156 | { | 156 | { |
157 | MikMod_free(mh); | 157 | MikMod_free(mh); |
158 | } | 158 | } |
@@ -657,7 +657,7 @@ static int LoadInstruments(void) | |||
657 | return 1; | 657 | return 1; |
658 | } | 658 | } |
659 | 659 | ||
660 | int XM_Load(int curious) | 660 | static int XM_Load(int curious) |
661 | { | 661 | { |
662 | INSTRUMENT *d; | 662 | INSTRUMENT *d; |
663 | SAMPLE *q; | 663 | SAMPLE *q; |
@@ -804,7 +804,7 @@ int XM_Load(int curious) | |||
804 | return 1; | 804 | return 1; |
805 | } | 805 | } |
806 | 806 | ||
807 | CHAR *XM_LoadTitle(void) | 807 | static CHAR *XM_LoadTitle(void) |
808 | { | 808 | { |
809 | CHAR s[21]; | 809 | CHAR s[21]; |
810 | 810 | ||
diff --git a/apps/plugins/mikmod/mdreg.c b/apps/plugins/mikmod/mdreg.c index 8385e15ff5..6cbaad2932 100644 --- a/apps/plugins/mikmod/mdreg.c +++ b/apps/plugins/mikmod/mdreg.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | #include "mikmod_internals.h" | 33 | #include "mikmod_internals.h" |
34 | 34 | ||
35 | void _mm_registeralldrivers(void) | 35 | static void _mm_registeralldrivers(void) |
36 | { | 36 | { |
37 | #if 0 | 37 | #if 0 |
38 | 38 | ||
diff --git a/apps/plugins/mikmod/mdriver.c b/apps/plugins/mikmod/mdriver.c index e11d32539b..2e8e9b5e41 100644 --- a/apps/plugins/mikmod/mdriver.c +++ b/apps/plugins/mikmod/mdriver.c | |||
@@ -765,7 +765,7 @@ MIKMODAPI int MikMod_Active(void) | |||
765 | criticals). | 765 | criticals). |
766 | 766 | ||
767 | Returns the voice that the sound is being played on. */ | 767 | Returns the voice that the sound is being played on. */ |
768 | SBYTE Sample_Play_internal(SAMPLE *s,ULONG start,UBYTE flags) | 768 | static SBYTE Sample_Play_internal(SAMPLE *s,ULONG start,UBYTE flags) |
769 | { | 769 | { |
770 | int orig=sfxpool;/* for cases where all channels are critical */ | 770 | int orig=sfxpool;/* for cases where all channels are critical */ |
771 | int c; | 771 | int c; |
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c index eb3be13140..3302fc306a 100644 --- a/apps/plugins/mikmod/mikmod.c +++ b/apps/plugins/mikmod/mikmod.c | |||
@@ -151,7 +151,7 @@ static int compare(const void* p1, const void* p2) | |||
151 | } | 151 | } |
152 | */ | 152 | */ |
153 | 153 | ||
154 | bool mod_ext(const char ext[]) | 154 | static bool mod_ext(const char ext[]) |
155 | { | 155 | { |
156 | if(!ext) | 156 | if(!ext) |
157 | return false; | 157 | return false; |
@@ -181,7 +181,7 @@ bool mod_ext(const char ext[]) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | /*Read directory contents for scrolling. */ | 183 | /*Read directory contents for scrolling. */ |
184 | void get_mod_list(void) | 184 | static void get_mod_list(void) |
185 | { | 185 | { |
186 | struct tree_context *tree = rb->tree_get_context(); | 186 | struct tree_context *tree = rb->tree_get_context(); |
187 | struct entry *dircache = rb->tree_get_entries(tree); | 187 | struct entry *dircache = rb->tree_get_entries(tree); |
@@ -211,7 +211,7 @@ void get_mod_list(void) | |||
211 | } | 211 | } |
212 | } | 212 | } |
213 | 213 | ||
214 | int change_filename(int direct) | 214 | static int change_filename(int direct) |
215 | { | 215 | { |
216 | bool file_erased = (file_pt[curfile] == NULL); | 216 | bool file_erased = (file_pt[curfile] == NULL); |
217 | direction = direct; | 217 | direction = direct; |
@@ -268,7 +268,7 @@ static inline void synthbuf(void) | |||
268 | VC_WriteBytes(outptr, BUF_SIZE); | 268 | VC_WriteBytes(outptr, BUF_SIZE); |
269 | } | 269 | } |
270 | 270 | ||
271 | void get_more(const void** start, size_t* size) | 271 | static void get_more(const void** start, size_t* size) |
272 | { | 272 | { |
273 | #ifndef SYNC | 273 | #ifndef SYNC |
274 | if (lastswap != swap) | 274 | if (lastswap != swap) |
@@ -289,7 +289,7 @@ void get_more(const void** start, size_t* size) | |||
289 | #endif | 289 | #endif |
290 | } | 290 | } |
291 | 291 | ||
292 | void showinfo(void) | 292 | static void showinfo(void) |
293 | { | 293 | { |
294 | char statustext[LINE_LENGTH]; | 294 | char statustext[LINE_LENGTH]; |
295 | 295 | ||
@@ -347,7 +347,7 @@ void showinfo(void) | |||
347 | rb->lcd_update(); | 347 | rb->lcd_update(); |
348 | } | 348 | } |
349 | 349 | ||
350 | void showsamples(void) | 350 | static void showsamples(void) |
351 | { | 351 | { |
352 | int i; | 352 | int i; |
353 | char statustext[LINE_LENGTH]; | 353 | char statustext[LINE_LENGTH]; |
@@ -366,7 +366,7 @@ void showsamples(void) | |||
366 | screenupdated = true; | 366 | screenupdated = true; |
367 | } | 367 | } |
368 | 368 | ||
369 | void showinstruments(void) | 369 | static void showinstruments(void) |
370 | { | 370 | { |
371 | int i; | 371 | int i; |
372 | char statustext[LINE_LENGTH]; | 372 | char statustext[LINE_LENGTH]; |
@@ -385,7 +385,7 @@ void showinstruments(void) | |||
385 | screenupdated = true; | 385 | screenupdated = true; |
386 | } | 386 | } |
387 | 387 | ||
388 | void showcomments(void) | 388 | static void showcomments(void) |
389 | { | 389 | { |
390 | int i, j=0, k=0, l; | 390 | int i, j=0, k=0, l; |
391 | char statustext[LINE_LENGTH]; | 391 | char statustext[LINE_LENGTH]; |
@@ -424,7 +424,7 @@ void showcomments(void) | |||
424 | screenupdated = true; | 424 | screenupdated = true; |
425 | } | 425 | } |
426 | 426 | ||
427 | void changedisplay(void) | 427 | static void changedisplay(void) |
428 | { | 428 | { |
429 | display = (display+1) % 4; | 429 | display = (display+1) % 4; |
430 | 430 | ||
@@ -493,7 +493,7 @@ static struct configdata config[] = | |||
493 | { TYPE_BOOL, 0, 1, { .bool_p = &settings.boost }, "CPU Boost", NULL}, | 493 | { TYPE_BOOL, 0, 1, { .bool_p = &settings.boost }, "CPU Boost", NULL}, |
494 | }; | 494 | }; |
495 | 495 | ||
496 | void applysettings(void) | 496 | static void applysettings(void) |
497 | { | 497 | { |
498 | md_pansep = settings.pansep; | 498 | md_pansep = settings.pansep; |
499 | md_reverb = settings.reverb; | 499 | md_reverb = settings.reverb; |
@@ -521,7 +521,7 @@ void applysettings(void) | |||
521 | /** | 521 | /** |
522 | Shows the settings menu | 522 | Shows the settings menu |
523 | */ | 523 | */ |
524 | int settings_menu(void) | 524 | static int settings_menu(void) |
525 | { | 525 | { |
526 | int selection = 0; | 526 | int selection = 0; |
527 | 527 | ||
@@ -581,7 +581,7 @@ int settings_menu(void) | |||
581 | /** | 581 | /** |
582 | Show the main menu | 582 | Show the main menu |
583 | */ | 583 | */ |
584 | int main_menu(void) | 584 | static int main_menu(void) |
585 | { | 585 | { |
586 | int selection = 0; | 586 | int selection = 0; |
587 | int result; | 587 | int result; |
@@ -614,7 +614,7 @@ int main_menu(void) | |||
614 | 614 | ||
615 | #ifdef USETHREADS | 615 | #ifdef USETHREADS |
616 | /* double buffering thread */ | 616 | /* double buffering thread */ |
617 | void thread(void) | 617 | static void thread(void) |
618 | { | 618 | { |
619 | struct queue_event ev; | 619 | struct queue_event ev; |
620 | 620 | ||
@@ -630,13 +630,13 @@ void thread(void) | |||
630 | } | 630 | } |
631 | #endif | 631 | #endif |
632 | 632 | ||
633 | void mm_errorhandler(void) | 633 | static void mm_errorhandler(void) |
634 | { | 634 | { |
635 | rb->splashf(HZ, "%s", MikMod_strerror(MikMod_errno)); | 635 | rb->splashf(HZ, "%s", MikMod_strerror(MikMod_errno)); |
636 | quit = true; | 636 | quit = true; |
637 | } | 637 | } |
638 | 638 | ||
639 | int playfile(char* filename) | 639 | static int playfile(char* filename) |
640 | { | 640 | { |
641 | int vol = 0; | 641 | int vol = 0; |
642 | int button; | 642 | int button; |
diff --git a/apps/plugins/mikmod/mloader.c b/apps/plugins/mikmod/mloader.c index 7bce40578e..5f58d8102f 100644 --- a/apps/plugins/mikmod/mloader.c +++ b/apps/plugins/mikmod/mloader.c | |||
@@ -342,7 +342,7 @@ static MODULE *ML_AllocUniMod(void) | |||
342 | return (mf=MikMod_malloc(sizeof(MODULE))); | 342 | return (mf=MikMod_malloc(sizeof(MODULE))); |
343 | } | 343 | } |
344 | 344 | ||
345 | void Player_Free_internal(MODULE *mf) | 345 | static void Player_Free_internal(MODULE *mf) |
346 | { | 346 | { |
347 | if(mf) { | 347 | if(mf) { |
348 | Player_Exit_internal(mf); | 348 | Player_Exit_internal(mf); |
@@ -443,7 +443,7 @@ MIKMODAPI CHAR* Player_LoadTitle(CHAR* filename) | |||
443 | } | 443 | } |
444 | 444 | ||
445 | /* Loads a module given an reader */ | 445 | /* Loads a module given an reader */ |
446 | MODULE* Player_LoadGeneric_internal(MREADER *reader,int maxchan,int curious) | 446 | static MODULE* Player_LoadGeneric_internal(MREADER *reader,int maxchan,int curious) |
447 | { | 447 | { |
448 | int t; | 448 | int t; |
449 | MLOADER *l; | 449 | MLOADER *l; |
diff --git a/apps/plugins/mikmod/mlreg.c b/apps/plugins/mikmod/mlreg.c index e57e82553b..c8850fb62f 100644 --- a/apps/plugins/mikmod/mlreg.c +++ b/apps/plugins/mikmod/mlreg.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | #include "mikmod_internals.h" | 33 | #include "mikmod_internals.h" |
34 | 34 | ||
35 | void MikMod_RegisterAllLoaders_internal(void) | 35 | static void MikMod_RegisterAllLoaders_internal(void) |
36 | { | 36 | { |
37 | _mm_registerloader(&load_669); | 37 | _mm_registerloader(&load_669); |
38 | _mm_registerloader(&load_amf); | 38 | _mm_registerloader(&load_amf); |
diff --git a/apps/plugins/mikmod/mmerror.c b/apps/plugins/mikmod/mmerror.c index bd703f6c26..ed7c66a10f 100644 --- a/apps/plugins/mikmod/mmerror.c +++ b/apps/plugins/mikmod/mmerror.c | |||
@@ -191,7 +191,7 @@ MikMod_handler_t _mm_errorhandler = NULL; | |||
191 | MIKMODAPI int _mm_errno = 0; | 191 | MIKMODAPI int _mm_errno = 0; |
192 | MIKMODAPI int _mm_critical = 0; | 192 | MIKMODAPI int _mm_critical = 0; |
193 | 193 | ||
194 | MikMod_handler_t _mm_registererrorhandler(MikMod_handler_t proc) | 194 | static MikMod_handler_t _mm_registererrorhandler(MikMod_handler_t proc) |
195 | { | 195 | { |
196 | MikMod_handler_t oldproc=_mm_errorhandler; | 196 | MikMod_handler_t oldproc=_mm_errorhandler; |
197 | 197 | ||
diff --git a/apps/plugins/mikmod/mplayer.c b/apps/plugins/mikmod/mplayer.c index 396cf6c115..88d6a81af4 100644 --- a/apps/plugins/mikmod/mplayer.c +++ b/apps/plugins/mikmod/mplayer.c | |||
@@ -2458,7 +2458,7 @@ static void DoNNAEffects(MODULE *mod, MP_CONTROL *a, UBYTE dat) | |||
2458 | } | 2458 | } |
2459 | } | 2459 | } |
2460 | 2460 | ||
2461 | void pt_UpdateVoices(MODULE *mod, int max_volume) | 2461 | static void pt_UpdateVoices(MODULE *mod, int max_volume) |
2462 | { | 2462 | { |
2463 | SWORD envpan,envvol,envpit,channel; | 2463 | SWORD envpan,envvol,envpit,channel; |
2464 | UWORD playperiod; | 2464 | UWORD playperiod; |
@@ -2661,7 +2661,7 @@ void pt_UpdateVoices(MODULE *mod, int max_volume) | |||
2661 | } | 2661 | } |
2662 | 2662 | ||
2663 | /* Handles new notes or instruments */ | 2663 | /* Handles new notes or instruments */ |
2664 | void pt_Notes(MODULE *mod) | 2664 | static void pt_Notes(MODULE *mod) |
2665 | { | 2665 | { |
2666 | SWORD channel; | 2666 | SWORD channel; |
2667 | MP_CONTROL *a; | 2667 | MP_CONTROL *a; |
@@ -2799,7 +2799,7 @@ void pt_Notes(MODULE *mod) | |||
2799 | } | 2799 | } |
2800 | 2800 | ||
2801 | /* Handles effects */ | 2801 | /* Handles effects */ |
2802 | void pt_EffectsPass1(MODULE *mod) | 2802 | static void pt_EffectsPass1(MODULE *mod) |
2803 | { | 2803 | { |
2804 | SWORD channel; | 2804 | SWORD channel; |
2805 | MP_CONTROL *a; | 2805 | MP_CONTROL *a; |
@@ -2850,7 +2850,7 @@ void pt_EffectsPass1(MODULE *mod) | |||
2850 | } | 2850 | } |
2851 | 2851 | ||
2852 | /* NNA management */ | 2852 | /* NNA management */ |
2853 | void pt_NNA(MODULE *mod) | 2853 | static void pt_NNA(MODULE *mod) |
2854 | { | 2854 | { |
2855 | SWORD channel; | 2855 | SWORD channel; |
2856 | MP_CONTROL *a; | 2856 | MP_CONTROL *a; |
@@ -2931,7 +2931,7 @@ void pt_NNA(MODULE *mod) | |||
2931 | } | 2931 | } |
2932 | 2932 | ||
2933 | /* Setup module and NNA voices */ | 2933 | /* Setup module and NNA voices */ |
2934 | void pt_SetupVoices(MODULE *mod) | 2934 | static void pt_SetupVoices(MODULE *mod) |
2935 | { | 2935 | { |
2936 | SWORD channel; | 2936 | SWORD channel; |
2937 | MP_CONTROL *a; | 2937 | MP_CONTROL *a; |
@@ -2972,7 +2972,7 @@ void pt_SetupVoices(MODULE *mod) | |||
2972 | } | 2972 | } |
2973 | 2973 | ||
2974 | /* second effect pass */ | 2974 | /* second effect pass */ |
2975 | void pt_EffectsPass2(MODULE *mod) | 2975 | static void pt_EffectsPass2(MODULE *mod) |
2976 | { | 2976 | { |
2977 | SWORD channel; | 2977 | SWORD channel; |
2978 | MP_CONTROL *a; | 2978 | MP_CONTROL *a; |