From c26ab37aca59da2fde7d96ab8528ac2b002a8192 Mon Sep 17 00:00:00 2001
From: Bertrik Sikken <bertrik@sikken.nl>
Date: Sun, 4 Mar 2012 20:13:43 +0100
Subject: mikmod plugin: make functions static when possible

Change-Id: Ic0102071318c55c19952029be6998ecf5f33eb98
---
 apps/plugins/mikmod/load_669.c | 10 +++++-----
 apps/plugins/mikmod/load_amf.c | 10 +++++-----
 apps/plugins/mikmod/load_dsm.c | 10 +++++-----
 apps/plugins/mikmod/load_far.c | 10 +++++-----
 apps/plugins/mikmod/load_gdm.c | 14 +++++++-------
 apps/plugins/mikmod/load_gt2.c | 12 ++++++------
 apps/plugins/mikmod/load_imf.c | 10 +++++-----
 apps/plugins/mikmod/load_it.c  | 10 +++++-----
 apps/plugins/mikmod/load_med.c | 10 +++++-----
 apps/plugins/mikmod/load_mtm.c | 10 +++++-----
 apps/plugins/mikmod/load_okt.c |  6 +++---
 apps/plugins/mikmod/load_s3m.c | 10 +++++-----
 apps/plugins/mikmod/load_stm.c |  8 ++++----
 apps/plugins/mikmod/load_ult.c | 10 +++++-----
 apps/plugins/mikmod/load_uni.c | 10 +++++-----
 apps/plugins/mikmod/load_xm.c  | 10 +++++-----
 apps/plugins/mikmod/mdreg.c    |  2 +-
 apps/plugins/mikmod/mdriver.c  |  2 +-
 apps/plugins/mikmod/mikmod.c   | 30 +++++++++++++++---------------
 apps/plugins/mikmod/mloader.c  |  4 ++--
 apps/plugins/mikmod/mlreg.c    |  2 +-
 apps/plugins/mikmod/mmerror.c  |  2 +-
 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[]={
 
 /*========== Loader code */
 
-int S69_Test(void)
+static int S69_Test(void)
 {
 	UBYTE buf[0x80];
 
@@ -122,7 +122,7 @@ int S69_Test(void)
 	return 1;
 }
 
-int S69_Init(void)
+static int S69_Init(void)
 {
 	if(!(s69pat=(S69NOTE *)MikMod_malloc(64*8*sizeof(S69NOTE)))) return 0;
 	if(!(mh=(S69HEADER *)MikMod_malloc(sizeof(S69HEADER)))) return 0;
@@ -130,7 +130,7 @@ int S69_Init(void)
 	return 1;
 }
 
-void S69_Cleanup(void)
+static void S69_Cleanup(void)
 {
 	MikMod_free(s69pat);
 	MikMod_free(mh);
@@ -245,7 +245,7 @@ static int S69_LoadPatterns(void)
 	return 1;
 }
 
-int S69_Load(int curious)
+static int S69_Load(int curious)
 {
 	int i;
 	SAMPLE *current;
@@ -343,7 +343,7 @@ int S69_Load(int curious)
 	return 1;
 }
 
-CHAR *S69_LoadTitle(void)
+static CHAR *S69_LoadTitle(void)
 {
 	CHAR s[36];
 
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;
 
 /*========== Loader code */
 
-int AMF_Test(void)
+static int AMF_Test(void)
 {
 	UBYTE id[3],ver;
 
@@ -100,7 +100,7 @@ int AMF_Test(void)
 	return 0;
 }
 
-int AMF_Init(void)
+static int AMF_Init(void)
 {
 	if(!(mh=(AMFHEADER*)MikMod_malloc(sizeof(AMFHEADER)))) return 0;
 	if(!(track=(AMFNOTE*)MikMod_calloc(64,sizeof(AMFNOTE)))) return 0;
@@ -108,7 +108,7 @@ int AMF_Init(void)
 	return 1;
 }
 
-void AMF_Cleanup(void)
+static void AMF_Cleanup(void)
 {
 	MikMod_free(mh);
 	MikMod_free(track);
@@ -330,7 +330,7 @@ static UBYTE* AMF_ConvertTrack(void)
 	return UniDup();
 }
 
-int AMF_Load(int curious)
+static int AMF_Load(int curious)
 {
 	int u,defaultpanning;
     unsigned int t,realtrackcnt,realsmpcnt;
@@ -545,7 +545,7 @@ int AMF_Load(int curious)
 	return 1;
 }
 
-CHAR *AMF_LoadTitle(void)
+static CHAR *AMF_LoadTitle(void)
 {
 	CHAR s[32];
 
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'};
 
 /*========== Loader code */
 
-int DSM_Test(void)
+static int DSM_Test(void)
 {
 	UBYTE id[12];
 
@@ -115,14 +115,14 @@ int DSM_Test(void)
 	return 0;
 }
 
-int DSM_Init(void)
+static int DSM_Init(void)
 {
 	if(!(dsmbuf=(DSMNOTE *)MikMod_malloc(DSM_MAXCHAN*64*sizeof(DSMNOTE)))) return 0;
 	if(!(mh=(DSMSONG *)MikMod_calloc(1,sizeof(DSMSONG)))) return 0;
 	return 1;
 }
 
-void DSM_Cleanup(void)
+static void DSM_Cleanup(void)
 {
 	MikMod_free(dsmbuf);
 	MikMod_free(mh);
@@ -231,7 +231,7 @@ static UBYTE *DSM_ConvertTrack(DSMNOTE *tr)
 	return UniDup();
 }
 
-int DSM_Load(int curious)
+static int DSM_Load(int curious)
 {
 	int t;
 	DSMINST s;
@@ -338,7 +338,7 @@ int DSM_Load(int curious)
 	return 1;
 }
 
-CHAR *DSM_LoadTitle(void)
+static CHAR *DSM_LoadTitle(void)
 {
 	CHAR s[28];
 
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};
 
 /*========== Loader code */
 
-int FAR_Test(void)
+static int FAR_Test(void)
 {
 	UBYTE id[47];
 
@@ -105,7 +105,7 @@ int FAR_Test(void)
 	return 1;
 }
 
-int FAR_Init(void)
+static int FAR_Init(void)
 {
 	if(!(mh1 = (FARHEADER1*)MikMod_malloc(sizeof(FARHEADER1)))) return 0;
 	if(!(mh2 = (FARHEADER2*)MikMod_malloc(sizeof(FARHEADER2)))) return 0;
@@ -114,7 +114,7 @@ int FAR_Init(void)
 	return 1;
 }
 
-void FAR_Cleanup(void)
+static void FAR_Cleanup(void)
 {
 	MikMod_free(mh1);
 	MikMod_free(mh2);
@@ -173,7 +173,7 @@ static UBYTE *FAR_ConvertTrack(FARNOTE* n,int rows)
 	return UniDup();
 }
 
-int FAR_Load(int curious)
+static int FAR_Load(int curious)
 {
 	int t,u,tracks=0;
 	SAMPLE *q;
@@ -321,7 +321,7 @@ int FAR_Load(int curious)
 	return 1;
 }
 
-CHAR *FAR_LoadTitle(void)
+static CHAR *FAR_LoadTitle(void)
 {
 	CHAR s[40];
 
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 */
 
 CHAR GDM_Version[]="General DigiMusic 1.xx";
 
-int GDM_Test(void)
+static int GDM_Test(void)
 {
 	/* test for gdm magic numbers */
 	UBYTE id[4];
@@ -134,7 +134,7 @@ int GDM_Test(void)
 	return 0;
 }
 
-int GDM_Init(void)
+static int GDM_Init(void)
 {
 	if (!(gdmbuf=(GDMNOTE*)MikMod_malloc(32*64*sizeof(GDMNOTE)))) return 0;
 	if (!(mh=(GDMHEADER*)MikMod_malloc(sizeof(GDMHEADER)))) return 0;
@@ -142,13 +142,13 @@ int GDM_Init(void)
 	return 1;
 }
 
-void GDM_Cleanup(void)
+static void GDM_Cleanup(void)
 {
 	MikMod_free(mh);
 	MikMod_free(gdmbuf);
 }
 
-int GDM_ReadPattern(void)
+static int GDM_ReadPattern(void)
 {
 	int pos,flag,ch,i,maxch;
 	GDMNOTE n;
@@ -200,7 +200,7 @@ int GDM_ReadPattern(void)
 	return 1;
 }
 
-UBYTE *GDM_ConvertTrack(GDMNOTE*tr)
+static UBYTE *GDM_ConvertTrack(GDMNOTE*tr)
 {
 	int t,i=0;
 	UBYTE note,ins,inf;
@@ -337,7 +337,7 @@ UBYTE *GDM_ConvertTrack(GDMNOTE*tr)
 	return UniDup();
 }
 
-int GDM_Load(int curious)
+static int GDM_Load(int curious)
 {
 	int i,x,u,track;
 	SAMPLE *q;
@@ -534,7 +534,7 @@ int GDM_Load(int curious)
 	return 1;
 }
 
-CHAR *GDM_LoadTitle(void)
+static CHAR *GDM_LoadTitle(void)
 {
 	CHAR s[32];
 
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
 	ENDC_CHUNK endc;
 } GT_CHUNK;
 
-GT_CHUNK *loadChunk(void)
+static GT_CHUNK *loadChunk(void)
 {	
 	GT_CHUNK *new_chunk = MikMod_malloc(sizeof(GT_CHUNK));
 
@@ -312,12 +312,12 @@ GT_CHUNK *loadChunk(void)
 	return NULL; // unknown chunk
 }
 
-int GT2_Init(void)
+static int GT2_Init(void)
 {
 	return 1;
 }
 
-int GT2_Test(void)
+static int GT2_Test(void)
 {
 	UBYTE magic[3];
 	_mm_fseek(modreader, 0, SEEK_SET);
@@ -329,7 +329,7 @@ int GT2_Test(void)
 	return 0;
 }
 
-int GT2_Load(int curious)
+static int GT2_Load(int curious)
 {
 	GT_CHUNK *tmp;
     (void)curious;
@@ -344,11 +344,11 @@ int GT2_Load(int curious)
 	return 0;
 }
 
-void GT2_Cleanup(void)
+static void GT2_Cleanup(void)
 {
 }
 
-CHAR *GT2_LoadTitle(void)
+static CHAR *GT2_LoadTitle(void)
 {
 	CHAR title[33];
 	_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;
 
 /*========== Loader code */
 
-int IMF_Test(void)
+static int IMF_Test(void)
 {
 	UBYTE id[4];
 
@@ -135,7 +135,7 @@ int IMF_Test(void)
 	return 0;
 }
 
-int IMF_Init(void)
+static int IMF_Init(void)
 {
 	if(!(imfpat=(IMFNOTE*)MikMod_malloc(32*256*sizeof(IMFNOTE)))) return 0;
 	if(!(mh=(IMFHEADER*)MikMod_malloc(sizeof(IMFHEADER)))) return 0;
@@ -143,7 +143,7 @@ int IMF_Init(void)
 	return 1;
 }
 
-void IMF_Cleanup(void)
+static void IMF_Cleanup(void)
 {
 	FreeLinear();
 
@@ -377,7 +377,7 @@ static UBYTE* IMF_ConvertTrack(IMFNOTE* tr,UWORD rows)
 	return UniDup();
 }
 
-int IMF_Load(int curious)
+static int IMF_Load(int curious)
 {
 #define IMF_SMPINCR 64
 	int t,u,track=0,oldnumsmp;
@@ -713,7 +713,7 @@ int IMF_Load(int curious)
 	return 1;
 }
 
-CHAR *IMF_LoadTitle(void)
+static CHAR *IMF_LoadTitle(void)
 {
 	CHAR s[31];
 
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};
 
 /*========== Loader code */
 
-int IT_Test(void)
+static int IT_Test(void)
 {
 	UBYTE id[4];
 
@@ -190,7 +190,7 @@ int IT_Test(void)
 	return 0;
 }
 
-int IT_Init(void)
+static int IT_Init(void)
 {
 	if(!(mh=(ITHEADER*)MikMod_malloc(sizeof(ITHEADER)))) return 0;
 	if(!(poslookup=(UBYTE*)MikMod_malloc(256*sizeof(UBYTE)))) return 0;
@@ -201,7 +201,7 @@ int IT_Init(void)
 	return 1;
 }
 
-void IT_Cleanup(void)
+static void IT_Cleanup(void)
 {
 	FreeLinear();
 
@@ -441,7 +441,7 @@ static void IT_LoadMidiConfiguration(MREADER* modreader)
 	}
 }
 
-int IT_Load(int curious)
+static int IT_Load(int curious)
 {
 	int t,u,lp;
 	INSTRUMENT *d;
@@ -985,7 +985,7 @@ int IT_Load(int curious)
 	return 1;
 }
 
-CHAR *IT_LoadTitle(void)
+static CHAR *IT_LoadTitle(void)
 {
 	CHAR s[26];
 
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)";
 
 /*========== Loader code */
 
-int MED_Test(void)
+static int MED_Test(void)
 {
 	UBYTE id[4];
 
@@ -170,7 +170,7 @@ int MED_Test(void)
 	return 0;
 }
 
-int MED_Init(void)
+static int MED_Init(void)
 {
 	if (!(me = (MEDEXP *)MikMod_malloc(sizeof(MEDEXP))))
 		return 0;
@@ -181,7 +181,7 @@ int MED_Init(void)
 	return 1;
 }
 
-void MED_Cleanup(void)
+static void MED_Cleanup(void)
 {
 	MikMod_free(me);
 	MikMod_free(mh);
@@ -426,7 +426,7 @@ static int LoadMMD1Patterns(void)
 	return 1;
 }
 
-int MED_Load(int curious)
+static int MED_Load(int curious)
 {
 	int t;
 	ULONG sa[64];
@@ -680,7 +680,7 @@ int MED_Load(int curious)
 	return 1;
 }
 
-CHAR *MED_LoadTitle(void)
+static CHAR *MED_LoadTitle(void)
 {
 	ULONG posit, namelen;
 	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";
 
 /*========== Loader code */
 
-int MTM_Test(void)
+static int MTM_Test(void)
 {
 	UBYTE id[3];
 
@@ -96,7 +96,7 @@ int MTM_Test(void)
 	return 0;
 }
 
-int MTM_Init(void)
+static int MTM_Init(void)
 {
 	if(!(mtmtrk=(MTMNOTE*)MikMod_calloc(64,sizeof(MTMNOTE)))) return 0;
 	if(!(mh=(MTMHEADER*)MikMod_malloc(sizeof(MTMHEADER)))) return 0;
@@ -104,7 +104,7 @@ int MTM_Init(void)
 	return 1;
 }
 
-void MTM_Cleanup(void)
+static void MTM_Cleanup(void)
 {
 	MikMod_free(mtmtrk);
 	MikMod_free(mh);
@@ -140,7 +140,7 @@ static UBYTE* MTM_Convert(void)
 	return UniDup();
 }
 
-int MTM_Load(int curious)
+static int MTM_Load(int curious)
 {
 	int t,u;
 	MTMSAMPLE s;
@@ -260,7 +260,7 @@ int MTM_Load(int curious)
 	return 1;
 }
 
-CHAR *MTM_LoadTitle(void)
+static CHAR *MTM_LoadTitle(void)
 {
 	CHAR s[20];
 
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;
 
 /*========== Loader code */
 
-int OKT_Test(void)
+static int OKT_Test(void)
 {
 	CHAR id[8];
 
@@ -322,7 +322,7 @@ static void OKT_doSBOD(int insnum)
 	of.samples[insnum].seekpos = _mm_ftell(modreader);
 }
 
-int OKT_Load(int curious)
+static int OKT_Load(int curious)
 {
 	UBYTE id[4];
 	ULONG len;
@@ -440,7 +440,7 @@ int OKT_Load(int curious)
 	return 1;
 }
 
-CHAR *OKT_LoadTitle(void)
+static CHAR *OKT_LoadTitle(void)
 {
 	return StrDup("");
 }
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};
 
 /*========== Loader code */
 
-int S3M_Test(void)
+static int S3M_Test(void)
 {
 	UBYTE id[4];
 
@@ -127,7 +127,7 @@ int S3M_Test(void)
 	return 0;
 }
 
-int S3M_Init(void)
+static int S3M_Init(void)
 {
 	if(!(s3mbuf=(S3MNOTE*)MikMod_malloc(32*64*sizeof(S3MNOTE)))) return 0;
 	if(!(mh=(S3MHEADER*)MikMod_malloc(sizeof(S3MHEADER)))) return 0;
@@ -137,7 +137,7 @@ int S3M_Init(void)
 	return 1;
 }
 
-void S3M_Cleanup(void)
+static void S3M_Cleanup(void)
 {
 	MikMod_free(s3mbuf);
 	MikMod_free(paraptr);
@@ -250,7 +250,7 @@ static UBYTE* S3M_ConvertTrack(S3MNOTE* tr)
 	return UniDup();
 }
 
-int S3M_Load(int curious)
+static int S3M_Load(int curious)
 {
 	int t,u,track = 0;
 	SAMPLE *q;
@@ -444,7 +444,7 @@ int S3M_Load(int curious)
 	return 1;
 }
 
-CHAR *S3M_LoadTitle(void)
+static CHAR *S3M_LoadTitle(void)
 {
 	CHAR s[28];
 
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] = {
 
 /*========== Loader code */
 
-int STM_Test(void)
+static int STM_Test(void)
 {
 	UBYTE str[44];
 	int t;
@@ -118,7 +118,7 @@ int STM_Test(void)
 	return 0;
 }
 
-int STM_Init(void)
+static int STM_Init(void)
 {
 	if(!(mh=(STMHEADER*)MikMod_malloc(sizeof(STMHEADER)))) return 0;
 	if(!(stmbuf=(STMNOTE*)MikMod_calloc(64U*4,sizeof(STMNOTE)))) return 0;
@@ -250,7 +250,7 @@ static int STM_LoadPatterns(void)
 	return 1;
 }
 
-int STM_Load(int curious)
+static int STM_Load(int curious)
 {
 	int t; 
 	ULONG MikMod_ISA; /* We must generate our own ISA, it's not stored in stm */
@@ -349,7 +349,7 @@ int STM_Load(int curious)
 	return 1;
 }
 
-CHAR *STM_LoadTitle(void)
+static CHAR *STM_LoadTitle(void)
 {
 	CHAR s[20];
 
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;
 
 /*========== Loader code */
 
-int ULT_Test(void)
+static int ULT_Test(void)
 {
 	CHAR id[16];
 
@@ -96,12 +96,12 @@ int ULT_Test(void)
 	return 1;
 }
 
-int ULT_Init(void)
+static int ULT_Init(void)
 {
 	return 1;
 }
 
-void ULT_Cleanup(void)
+static void ULT_Cleanup(void)
 {
 }
 
@@ -124,7 +124,7 @@ static UBYTE ReadUltEvent(ULTEVENT* event)
 	return rep;
 }
 
-int ULT_Load(int curious)
+static int ULT_Load(int curious)
 {
 	int t,u,tracks=0;
 	SAMPLE *q;
@@ -313,7 +313,7 @@ int ULT_Load(int curious)
 	return 1;
 }
 
-CHAR *ULT_LoadTitle(void)
+static CHAR *ULT_LoadTitle(void)
 {
 	CHAR s[32];
 
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)
 	return s;
 }
 
-int UNI_Test(void)
+static int UNI_Test(void)
 {
 	char id[6];
 
@@ -125,12 +125,12 @@ int UNI_Test(void)
 	return 0;
 }
 
-int UNI_Init(void)
+static int UNI_Init(void)
 {
 	return 1;
 }
 
-void UNI_Cleanup(void)
+static void UNI_Cleanup(void)
 {
 	MikMod_free(wh);
 	s=NULL;
@@ -498,7 +498,7 @@ static int loadsmp5(void)
 	return 1;
 }
 
-int UNI_Load(int curious)
+static int UNI_Load(int curious)
 {
 	int t;
 	char *modtype,*oldtype=NULL;
@@ -689,7 +689,7 @@ int UNI_Load(int curious)
 	return 1;
 }
 
-CHAR *UNI_LoadTitle(void)
+static CHAR *UNI_LoadTitle(void)
 {
 	UBYTE ver;
 	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;
 
 /*========== Loader code */
 
-int XM_Test(void)
+static int XM_Test(void)
 {
 	UBYTE id[38];
 
@@ -146,13 +146,13 @@ int XM_Test(void)
 	return 0;
 }
 
-int XM_Init(void)
+static int XM_Init(void)
 {
 	if(!(mh=(XMHEADER *)MikMod_malloc(sizeof(XMHEADER)))) return 0;
 	return 1;
 }
 
-void XM_Cleanup(void)
+static void XM_Cleanup(void)
 {
 	MikMod_free(mh);
 }
@@ -657,7 +657,7 @@ static int LoadInstruments(void)
 	return 1;
 }
 
-int XM_Load(int curious)
+static int XM_Load(int curious)
 {
 	INSTRUMENT *d;
 	SAMPLE *q;
@@ -804,7 +804,7 @@ int XM_Load(int curious)
 	return 1;
 }
 
-CHAR *XM_LoadTitle(void)
+static CHAR *XM_LoadTitle(void)
 {
 	CHAR s[21];
 
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 @@
 
 #include "mikmod_internals.h"
 
-void _mm_registeralldrivers(void)
+static void _mm_registeralldrivers(void)
 {
 #if 0
 
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)
    criticals).
 
    Returns the voice that the sound is being played on.                       */
-SBYTE Sample_Play_internal(SAMPLE *s,ULONG start,UBYTE flags)
+static SBYTE Sample_Play_internal(SAMPLE *s,ULONG start,UBYTE flags)
 {
 	int orig=sfxpool;/* for cases where all channels are critical */
 	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)
 }
 */
 
-bool mod_ext(const char ext[])
+static bool mod_ext(const char ext[])
 {
     if(!ext)
         return false;
@@ -181,7 +181,7 @@ bool mod_ext(const char ext[])
 }
 
 /*Read directory contents for scrolling. */
-void get_mod_list(void)
+static void get_mod_list(void)
 {
     struct tree_context *tree = rb->tree_get_context();
     struct entry *dircache = rb->tree_get_entries(tree);
@@ -211,7 +211,7 @@ void get_mod_list(void)
     }
 }
 
-int change_filename(int direct)
+static int change_filename(int direct)
 {
     bool file_erased = (file_pt[curfile] == NULL);
     direction = direct;
@@ -268,7 +268,7 @@ static inline void synthbuf(void)
     VC_WriteBytes(outptr, BUF_SIZE);
 }
 
-void get_more(const void** start, size_t* size)
+static void get_more(const void** start, size_t* size)
 {
 #ifndef SYNC
     if (lastswap != swap)
@@ -289,7 +289,7 @@ void get_more(const void** start, size_t* size)
 #endif
 }
 
-void showinfo(void)
+static void showinfo(void)
 {
     char statustext[LINE_LENGTH];
 
@@ -347,7 +347,7 @@ void showinfo(void)
     rb->lcd_update();
 }
 
-void showsamples(void)
+static void showsamples(void)
 {
     int i;
     char statustext[LINE_LENGTH];
@@ -366,7 +366,7 @@ void showsamples(void)
     screenupdated = true;
 }
 
-void showinstruments(void)
+static void showinstruments(void)
 {
     int i;
     char statustext[LINE_LENGTH];
@@ -385,7 +385,7 @@ void showinstruments(void)
     screenupdated = true;
 }
 
-void showcomments(void)
+static void showcomments(void)
 {
     int i, j=0, k=0, l;
     char statustext[LINE_LENGTH];
@@ -424,7 +424,7 @@ void showcomments(void)
     screenupdated = true;
 }
 
-void changedisplay(void)
+static void changedisplay(void)
 {
     display = (display+1) % 4;
 
@@ -493,7 +493,7 @@ static struct configdata config[] =
     { TYPE_BOOL, 0, 1, { .bool_p = &settings.boost }, "CPU Boost", NULL},
 };
 
-void applysettings(void)
+static void applysettings(void)
 {
     md_pansep = settings.pansep;
     md_reverb = settings.reverb;
@@ -521,7 +521,7 @@ void applysettings(void)
 /**
   Shows the settings menu
  */
-int settings_menu(void)
+static int settings_menu(void)
 {
     int selection = 0;
 
@@ -581,7 +581,7 @@ int settings_menu(void)
 /**
   Show the main menu
  */
-int main_menu(void)
+static int main_menu(void)
 {
     int selection = 0;
     int result;
@@ -614,7 +614,7 @@ int main_menu(void)
 
 #ifdef USETHREADS
 /* double buffering thread */
-void thread(void)
+static void thread(void)
 {
     struct queue_event ev;
 
@@ -630,13 +630,13 @@ void thread(void)
 }
 #endif
 
-void mm_errorhandler(void)
+static void mm_errorhandler(void)
 {
     rb->splashf(HZ, "%s", MikMod_strerror(MikMod_errno));
     quit = true;
 }
 
-int playfile(char* filename)
+static int playfile(char* filename)
 {
     int vol = 0;
     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)
 	return (mf=MikMod_malloc(sizeof(MODULE)));
 }
 
-void Player_Free_internal(MODULE *mf)
+static void Player_Free_internal(MODULE *mf)
 {
 	if(mf) {
 		Player_Exit_internal(mf);
@@ -443,7 +443,7 @@ MIKMODAPI CHAR* Player_LoadTitle(CHAR* filename)
 }
 
 /* Loads a module given an reader */
-MODULE* Player_LoadGeneric_internal(MREADER *reader,int maxchan,int curious)
+static MODULE* Player_LoadGeneric_internal(MREADER *reader,int maxchan,int curious)
 {
 	int t;
 	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 @@
 
 #include "mikmod_internals.h"
 
-void MikMod_RegisterAllLoaders_internal(void)
+static void MikMod_RegisterAllLoaders_internal(void)
 {
 	_mm_registerloader(&load_669);
 	_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;
 MIKMODAPI int  _mm_errno = 0;
 MIKMODAPI int _mm_critical = 0;
 
-MikMod_handler_t _mm_registererrorhandler(MikMod_handler_t proc)
+static MikMod_handler_t _mm_registererrorhandler(MikMod_handler_t proc)
 {
 	MikMod_handler_t oldproc=_mm_errorhandler;
 
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)
 	}
 }
 
-void pt_UpdateVoices(MODULE *mod, int max_volume)
+static void pt_UpdateVoices(MODULE *mod, int max_volume)
 {
 	SWORD envpan,envvol,envpit,channel;
 	UWORD playperiod;
@@ -2661,7 +2661,7 @@ void pt_UpdateVoices(MODULE *mod, int max_volume)
 }
 
 /* Handles new notes or instruments */
-void pt_Notes(MODULE *mod)
+static void pt_Notes(MODULE *mod)
 {
 	SWORD channel;
 	MP_CONTROL *a;
@@ -2799,7 +2799,7 @@ void pt_Notes(MODULE *mod)
 }
 
 /* Handles effects */
-void pt_EffectsPass1(MODULE *mod)
+static void pt_EffectsPass1(MODULE *mod)
 {
 	SWORD channel;
 	MP_CONTROL *a;
@@ -2850,7 +2850,7 @@ void pt_EffectsPass1(MODULE *mod)
 }
 
 /* NNA management */
-void pt_NNA(MODULE *mod)
+static void pt_NNA(MODULE *mod)
 {
 	SWORD channel;
 	MP_CONTROL *a;
@@ -2931,7 +2931,7 @@ void pt_NNA(MODULE *mod)
 }
 
 /* Setup module and NNA voices */
-void pt_SetupVoices(MODULE *mod)
+static void pt_SetupVoices(MODULE *mod)
 {
 	SWORD channel;
 	MP_CONTROL *a;
@@ -2972,7 +2972,7 @@ void pt_SetupVoices(MODULE *mod)
 }
 
 /* second effect pass */
-void pt_EffectsPass2(MODULE *mod)
+static void pt_EffectsPass2(MODULE *mod)
 {
 	SWORD channel;
 	MP_CONTROL *a;
-- 
cgit v1.2.3