fix some -Wmissing-declarations warnings

Stefan Huehner stefan at huehner.org
Mon Jul 4 06:01:00 CDT 2005


Hi,

next patch to fix -Wmissing-declarations warnings by making functions
static, which aren't used outside its declaring source file.

ChangeLog:
- fix some more -Wmissing-declarations warnings

Regards,
Stefan
-------------- next part --------------
Index: dlls/advapi32/crypt.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/crypt.c,v
retrieving revision 1.66
diff -u -p -r1.66 crypt.c
--- dlls/advapi32/crypt.c	17 Jun 2005 20:56:02 -0000	1.66
+++ dlls/advapi32/crypt.c	4 Jul 2005 10:52:08 -0000
@@ -174,7 +174,7 @@ static BOOL CALLBACK CRYPT_ReturnhWnd(HW
 	if ( !(provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)) ) goto error
 #define CRYPT_GetProvFuncOpt(name) \
 	provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)
-PCRYPTPROV CRYPT_LoadProvider(PSTR pImage)
+static PCRYPTPROV CRYPT_LoadProvider(PSTR pImage)
 {
 	PCRYPTPROV provider;
 	DWORD errorcode = ERROR_NOT_ENOUGH_MEMORY;
-------------- next part --------------
Index: dlls/cabinet/fdi.c
===================================================================
RCS file: /home/wine/wine/dlls/cabinet/fdi.c,v
retrieving revision 1.18
diff -u -p -r1.18 fdi.c
--- dlls/cabinet/fdi.c	6 Dec 2004 16:09:37 -0000	1.18
+++ dlls/cabinet/fdi.c	4 Jul 2005 10:52:25 -0000
@@ -243,7 +243,7 @@ HFDI __cdecl FDICreate(
  *
  * returns the file pointer position of a file handle.
  */
-long FDI_getoffset(HFDI hfdi, INT_PTR hf)
+static long FDI_getoffset(HFDI hfdi, INT_PTR hf)
 {
   return PFDI_SEEK(hfdi, hf, 0L, SEEK_CUR);
 }
@@ -254,7 +254,7 @@ long FDI_getoffset(HFDI hfdi, INT_PTR hf
  * we can't use _msize; the user might not be using malloc, so we require
  * an explicit specification of the previous size.  inefficient.
  */
-void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize)
+static void *FDI_realloc(HFDI hfdi, void *mem, size_t prevsize, size_t newsize)
 {
   void *rslt = NULL;
   char *irslt, *imem;
@@ -273,7 +273,7 @@ void *FDI_realloc(HFDI hfdi, void *mem, 
  *
  * allocate and read an arbitrarily long string from the cabinet
  */
-char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize)
+static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize)
 {
   size_t len=256,
          oldlen = 0,
@@ -326,7 +326,7 @@ char *FDI_read_string(HFDI hfdi, INT_PTR
  * process the cabinet header in the style of FDIIsCabinet, but
  * without the sanity checks (and bug)
  */
-BOOL FDI_read_entries(
+static BOOL FDI_read_entries(
         HFDI             hfdi,
         INT_PTR          hf,
         PFDICABINETINFO  pfdici,
@@ -632,7 +632,7 @@ BOOL __cdecl FDIIsCabinet(
  *
  * Initialize a model which decodes symbols from [s] to [s]+[n]-1
  */
-void QTMfdi_initmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) {
+static void QTMfdi_initmodel(struct QTMmodel *m, struct QTMmodelsym *sym, int n, int s) {
   int i;
   m->shiftsleft = 4;
   m->entries    = n;
@@ -649,7 +649,7 @@ void QTMfdi_initmodel(struct QTMmodel *m
 /******************************************************************
  * QTMfdi_init (internal)
  */
-int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) {
+static int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) {
   unsigned int wndsize = 1 << window;
   int msz = window * 2, i;
   cab_ULONG j;
@@ -701,7 +701,7 @@ int QTMfdi_init(int window, int level, f
 /************************************************************
  * LZXfdi_init (internal)
  */
-int LZXfdi_init(int window, fdi_decomp_state *decomp_state) {
+static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) {
   cab_ULONG wndsize = 1 << window;
   int i, j, posn_slots;
 
@@ -755,7 +755,7 @@ int LZXfdi_init(int window, fdi_decomp_s
 /****************************************************
  * NONEfdi_decomp(internal)
  */
-int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
+static int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
 {
   if (inlen != outlen) return DECR_ILLEGALDATA;
   memcpy(CAB(outbuf), CAB(inbuf), (size_t) inlen);
@@ -765,7 +765,7 @@ int NONEfdi_decomp(int inlen, int outlen
 /********************************************************
  * Ziphuft_free (internal)
  */
-void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t)
+static void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t)
 {
   register struct Ziphuft *p, *q;
 
@@ -782,7 +782,7 @@ void fdi_Ziphuft_free(HFDI hfdi, struct 
 /*********************************************************
  * fdi_Ziphuft_build (internal)
  */
-cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e,
+static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e,
 struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state)
 {
   cab_ULONG a;                   	/* counter for codes of length k */
@@ -1045,7 +1045,7 @@ cab_LONG fdi_Zipinflate_codes(struct Zip
 /***********************************************************
  * Zipinflate_stored (internal)
  */
-cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state)
+static cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state)
 /* "decompress" an inflated type 0 (stored) block. */
 {
   cab_ULONG n;           /* number of bytes in block */
@@ -1089,7 +1089,7 @@ cab_LONG fdi_Zipinflate_stored(fdi_decom
 /******************************************************
  * fdi_Zipinflate_fixed (internal)
  */
-cab_LONG fdi_Zipinflate_fixed(fdi_decomp_state *decomp_state)
+static cab_LONG fdi_Zipinflate_fixed(fdi_decomp_state *decomp_state)
 {
   struct Ziphuft *fixed_tl;
   struct Ziphuft *fixed_td;
@@ -1135,7 +1135,7 @@ cab_LONG fdi_Zipinflate_fixed(fdi_decomp
 /**************************************************************
  * fdi_Zipinflate_dynamic (internal)
  */
-cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
+static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state)
  /* decompress an inflated type 2 (dynamic Huffman codes) block. */
 {
   cab_LONG i;          	/* temporary variables */
@@ -1270,7 +1270,7 @@ cab_LONG fdi_Zipinflate_dynamic(fdi_deco
 /*****************************************************
  * fdi_Zipinflate_block (internal)
  */
-cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state) /* e == last block flag */
+static cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state) /* e == last block flag */
 { /* decompress an inflated block */
   cab_ULONG t;           	/* block type */
   register cab_ULONG b;     /* bit buffer */
@@ -1308,7 +1308,7 @@ cab_LONG fdi_Zipinflate_block(cab_LONG *
 /****************************************************
  * ZIPfdi_decomp(internal)
  */
-int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
+static int ZIPfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
 {
   cab_LONG e;               /* last block flag */
 
@@ -1336,7 +1336,7 @@ int ZIPfdi_decomp(int inlen, int outlen,
 /*******************************************************************
  * QTMfdi_decomp(internal)
  */
-int QTMfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
+static int QTMfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state)
 {
   cab_UBYTE *inpos  = CAB(inbuf);
   cab_UBYTE *window = QTM(window);
@@ -1462,7 +1462,7 @@ int QTMfdi_decomp(int inlen, int outlen,
 /************************************************************
  * fdi_lzx_read_lens (internal)
  */
-int fdi_lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb,
+static int fdi_lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, struct lzx_bits *lb,
                   fdi_decomp_state *decomp_state) {
   cab_ULONG i,j, x,y;
   int z;
@@ -1509,7 +1509,7 @@ int fdi_lzx_read_lens(cab_UBYTE *lens, c
 /*******************************************************
  * LZXfdi_decomp(internal)
  */
-int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) {
+static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) {
   cab_UBYTE *inpos  = CAB(inbuf);
   cab_UBYTE *endinp = inpos + inlen;
   cab_UBYTE *window = LZX(window);
@@ -1841,7 +1841,7 @@ int LZXfdi_decomp(int inlen, int outlen,
  * is also where we jump to additional cabinets in the case of split
  * cab's, and provide (some of) the NEXT_CABINET notification semantics.
  */
-int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state,
+static int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state,
   char *pszCabPath, PFNFDINOTIFY pfnfdin, void *pvUser)
 {
   cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset);
-------------- next part --------------
Index: dlls/dinput/joystick_linux.c
===================================================================
RCS file: /home/wine/wine/dlls/dinput/joystick_linux.c,v
retrieving revision 1.29
diff -u -p -r1.29 joystick_linux.c
--- dlls/dinput/joystick_linux.c	14 Jun 2005 12:34:33 -0000	1.29
+++ dlls/dinput/joystick_linux.c	4 Jul 2005 10:52:59 -0000
@@ -385,7 +385,7 @@ static HRESULT setup_dinput_options(Joys
     return DI_OK;
 }
 
-void calculate_ids(JoystickImpl* device)
+static void calculate_ids(JoystickImpl* device)
 {
     int i;
     int axis = 0;
@@ -830,7 +830,7 @@ static HRESULT WINAPI JoystickAImpl_Unac
     return DI_NOEFFECT;
 }
 
-LONG map_axis(JoystickImpl * This, short val, short index)
+static LONG map_axis(JoystickImpl * This, short val, short index)
 {
     double    fval = val;
     double    fmin = This->props[index].lMin;
@@ -848,7 +848,7 @@ LONG map_axis(JoystickImpl * This, short
 }
 
 /* convert wine format offset to user format object index */
-int offset_to_object(JoystickImpl *This, int offset)
+static int offset_to_object(JoystickImpl *This, int offset)
 {
     int i;
 
@@ -1093,7 +1093,7 @@ static HRESULT WINAPI JoystickAImpl_GetD
     return hr;
 }
 
-int find_property(JoystickImpl * This, LPCDIPROPHEADER ph)
+static int find_property(JoystickImpl * This, LPCDIPROPHEADER ph)
 {
     int i;
     if (ph->dwHow == DIPH_BYOFFSET) {
-------------- next part --------------
Index: dlls/iphlpapi/tests/iphlpapi.c
===================================================================
RCS file: /home/wine/wine/dlls/iphlpapi/tests/iphlpapi.c,v
retrieving revision 1.6
diff -u -p -r1.6 iphlpapi.c
--- dlls/iphlpapi/tests/iphlpapi.c	20 Jun 2005 15:35:54 -0000	1.6
+++ dlls/iphlpapi/tests/iphlpapi.c	4 Jul 2005 10:53:16 -0000
@@ -146,7 +146,7 @@ static void freeIPHlpApi(void)
 still-to-be-tested 98-only functions:
 GetUniDirectionalAdapterInfo
 */
-void testWin98OnlyFunctions(void)
+static void testWin98OnlyFunctions(void)
 {
 }
 
-------------- next part --------------
Index: dlls/msvcrt/tests/headers.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/tests/headers.c,v
retrieving revision 1.7
diff -u -p -r1.7 headers.c
--- dlls/msvcrt/tests/headers.c	20 Jun 2005 15:35:54 -0000	1.7
+++ dlls/msvcrt/tests/headers.c	4 Jul 2005 10:53:30 -0000
@@ -294,7 +294,7 @@ static void test_structs(void)
 }
 
 /************* Checking defines ***************/
-void test_defines(void)
+static void test_defines(void)
 {
     CHECK_DEF("WEOF", WEOF, MSVCRT_WEOF);
     CHECK_DEF("EOF", EOF, MSVCRT_EOF);
-------------- next part --------------
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.156
diff -u -p -r1.156 typelib.c
--- dlls/oleaut32/typelib.c	29 Jun 2005 20:15:00 -0000	1.156
+++ dlls/oleaut32/typelib.c	4 Jul 2005 10:53:42 -0000
@@ -1072,14 +1072,14 @@ static void dump_TypeDesc(TYPEDESC *pTD,
     }
 }
 
-void dump_ELEMDESC(ELEMDESC *edesc) {
+static void dump_ELEMDESC(ELEMDESC *edesc) {
   char buf[200];
   dump_TypeDesc(&edesc->tdesc,buf);
   MESSAGE("\t\ttdesc.vartype %d (%s)\n",edesc->tdesc.vt,buf);
   MESSAGE("\t\tu.parmadesc.flags %x\n",edesc->u.paramdesc.wParamFlags);
   MESSAGE("\t\tu.parmadesc.lpex %p\n",edesc->u.paramdesc.pparamdescex);
 }
-void dump_FUNCDESC(FUNCDESC *funcdesc) {
+static void dump_FUNCDESC(FUNCDESC *funcdesc) {
   int i;
   MESSAGE("memid is %08lx\n",funcdesc->memid);
   for (i=0;i<funcdesc->cParams;i++) {
@@ -1118,7 +1118,7 @@ void dump_FUNCDESC(FUNCDESC *funcdesc) {
   dump_ELEMDESC(&funcdesc->elemdescFunc);
 }
 
-void dump_IDLDESC(IDLDESC *idl) {
+static void dump_IDLDESC(IDLDESC *idl) {
   MESSAGE("\t\twIdlflags: %d\n",idl->wIDLFlags);
 }
 
@@ -1135,7 +1135,7 @@ static const char * typekind_desc[] =
 	"TKIND_MAX"
 };
 
-void dump_TYPEATTR(TYPEATTR *tattr) {
+static void dump_TYPEATTR(TYPEATTR *tattr) {
   char buf[200];
   MESSAGE("\tguid: %s\n",debugstr_guid(&tattr->guid));
   MESSAGE("\tlcid: %ld\n",tattr->lcid);
@@ -1307,7 +1307,7 @@ static void dump_TypeInfo(ITypeInfoImpl 
     dump_TLBImplType(pty->impltypelist);
 }
 
-void dump_VARDESC(VARDESC *v)
+static void dump_VARDESC(VARDESC *v)
 {
     MESSAGE("memid %ld\n",v->memid);
     MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema));
@@ -1399,7 +1399,7 @@ static void free_deep_typedesc(TYPEDESC 
  *  Functions for reading MSFT typelibs (those created by CreateTypeLib2)
  */
 /* read function */
-DWORD MSFT_Read(void *buffer,  DWORD count, TLBContext *pcx, long where )
+static DWORD MSFT_Read(void *buffer,  DWORD count, TLBContext *pcx, long where )
 {
     TRACE_(typelib)("pos=0x%08x len=0x%08lx 0x%08x 0x%08x 0x%08lx\n",
        pcx->pos, count, pcx->oStart, pcx->length, where);
@@ -1456,7 +1456,7 @@ static void MSFT_ReadGuid( GUID *pGuid, 
     TRACE_(typelib)("%s\n", debugstr_guid(pGuid));
 }
 
-BSTR MSFT_ReadName( TLBContext *pcx, int offset)
+static BSTR MSFT_ReadName( TLBContext *pcx, int offset)
 {
     char * name;
     MSFT_NameIntro niName;
@@ -1491,7 +1491,7 @@ BSTR MSFT_ReadName( TLBContext *pcx, int
     return bstrName;
 }
 
-BSTR MSFT_ReadString( TLBContext *pcx, int offset)
+static BSTR MSFT_ReadString( TLBContext *pcx, int offset)
 {
     char * string;
     INT16 length;
@@ -2043,7 +2043,7 @@ static void MSFT_DoImplTypes(TLBContext 
 /*
  * process a typeinfo record
  */
-ITypeInfoImpl * MSFT_DoTypeInfo(
+static ITypeInfoImpl * MSFT_DoTypeInfo(
     TLBContext *pcx,
     int count,
     ITypeLibImpl * pLibInfo)
-------------- next part --------------
Index: dlls/setupapi/virtcopy.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/virtcopy.c,v
retrieving revision 1.21
diff -u -p -r1.21 virtcopy.c
--- dlls/setupapi/virtcopy.c	23 May 2005 10:00:27 -0000	1.21
+++ dlls/setupapi/virtcopy.c	4 Jul 2005 10:53:55 -0000
@@ -218,7 +218,7 @@ static LPVIRTNODE *pvnlist = NULL;
 static DWORD vn_num = 0;
 static DWORD vn_last = 0;
 
-RETERR16 VCP_VirtnodeCreate(LPVCPFILESPEC vfsSrc, LPVCPFILESPEC vfsDst, WORD fl, LPARAM lParam, LPEXPANDVTBL lpExpandVtbl)
+static RETERR16 VCP_VirtnodeCreate(LPVCPFILESPEC vfsSrc, LPVCPFILESPEC vfsDst, WORD fl, LPARAM lParam, LPEXPANDVTBL lpExpandVtbl)
 {
     HANDLE heap;
     LPVIRTNODE lpvn;
@@ -266,7 +266,7 @@ RETERR16 VCP_VirtnodeCreate(LPVCPFILESPE
     return OK;
 }
 
-BOOL VCP_VirtnodeDelete(LPVIRTNODE lpvnDel)
+static BOOL VCP_VirtnodeDelete(LPVIRTNODE lpvnDel)
 {
     DWORD n;
     RETERR16 cbres;
@@ -408,7 +408,7 @@ RETERR16 WINAPI VcpQueueRename16(
 /***********************************************************************
  *		VcpEnumFiles (SETUPX.@)
  */
-INT16 WINAPI VcpEnumFiles(VCPENUMPROC vep, LPARAM lParamRef)
+static INT16 WINAPI VcpEnumFiles(VCPENUMPROC vep, LPARAM lParamRef)
 {
     WORD n;
 
@@ -452,7 +452,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lp
     return buffer;
 }
 
-RETERR16 VCP_CheckPaths(void)
+static RETERR16 VCP_CheckPaths(void)
 {
     DWORD n;
     LPVIRTNODE lpvn;
@@ -470,7 +470,7 @@ RETERR16 VCP_CheckPaths(void)
     return OK;
 }
 
-RETERR16 VCP_CopyFiles(void)
+static RETERR16 VCP_CopyFiles(void)
 {
     char fn_src[MAX_PATH], fn_dst[MAX_PATH];
     RETERR16 res = OK, cbres;
@@ -559,7 +559,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCS
     return OK;
 }
 
-RETERR16 VCP_RenameFiles(void)
+static RETERR16 VCP_RenameFiles(void)
 {
     char fn_src[MAX_PATH], fn_dst[MAX_PATH];
     RETERR16 res = OK, cbres;
@@ -616,7 +616,7 @@ static INT_PTR CALLBACK VCP_UI_FileCopyD
     return retval;
 }
 
-BOOL VCP_UI_GetDialogTemplate(LPCVOID *template32)
+static BOOL VCP_UI_GetDialogTemplate(LPCVOID *template32)
 {
     HRSRC hResInfo;
     HGLOBAL hDlgTmpl32;
@@ -646,7 +646,7 @@ VCP_UI_FileCopyWndProc (HWND hwnd, UINT 
     return 0;
 }
 
-void VCP_UI_RegisterProgressClass(void)
+static void VCP_UI_RegisterProgressClass(void)
 {
     static BOOL registered = FALSE;
     WNDCLASSA wndClass;
@@ -667,7 +667,7 @@ void VCP_UI_RegisterProgressClass(void)
     RegisterClassA (&wndClass);
 }
 
-RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2)
+static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2)
 {
     LPCSTR file1, file2;
     file1 = vsmGetStringRawName16(vn1->vfsSrc.vhstrFileName);
@@ -675,7 +675,7 @@ RETERR16 VCP_UI_NodeCompare(LPVIRTNODE v
     return (RETERR16)strcmp(file1, file2);
 }
 
-RETERR16 VCP_UI_CopyStart(void)
+static RETERR16 VCP_UI_CopyStart(void)
 {
     LPCVOID template32;
     char buf[256]; /* plenty */
-------------- next part --------------
Index: dlls/winaspi/aspi.c
===================================================================
RCS file: /home/wine/wine/dlls/winaspi/aspi.c,v
retrieving revision 1.21
diff -u -p -r1.21 aspi.c
--- dlls/winaspi/aspi.c	13 Dec 2004 21:19:01 -0000	1.21
+++ dlls/winaspi/aspi.c	4 Jul 2005 10:54:09 -0000
@@ -562,7 +562,7 @@ SCSI_MapHCtoController()
 }
 #endif
 
-int SCSI_Linux_CheckDevices(void)
+static int SCSI_Linux_CheckDevices(void)
 {
     DIR *devdir;
     struct dirent *dent = NULL;
-------------- next part --------------
Index: dlls/winedos/soundblaster.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/soundblaster.c,v
retrieving revision 1.5
diff -u -p -r1.5 soundblaster.c
--- dlls/winedos/soundblaster.c	17 Jun 2005 10:11:37 -0000	1.5
+++ dlls/winedos/soundblaster.c	4 Jul 2005 10:54:24 -0000
@@ -121,7 +121,7 @@ static DWORD CALLBACK SB_Poll( void *dum
     return 0;
 }
 
-BOOL SB_Init(void)
+static BOOL SB_Init(void)
 {
     HRESULT result;
 
@@ -191,7 +191,7 @@ BOOL SB_Init(void)
     return 1;
 }
 
-void SB_Reset(void)
+static void SB_Reset(void)
 {
     int i;
 
@@ -225,7 +225,7 @@ void SB_Reset(void)
 }
 
 /* Find a standard sampling rate for DirectSound */
-int SB_StdSampleRate(int SampleRate)
+static int SB_StdSampleRate(int SampleRate)
 {
   if (SampleRate>((44100+48000)/2)) return 48000;
   if (SampleRate>((32000+44100)/2)) return 44100;
Index: dlls/winedos/vga.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/vga.c,v
retrieving revision 1.49
diff -u -p -r1.49 vga.c
--- dlls/winedos/vga.c	10 May 2005 16:01:38 -0000	1.49
+++ dlls/winedos/vga.c	4 Jul 2005 10:54:24 -0000
@@ -345,14 +345,14 @@ static BOOL VGA_IsTimerRunning(void)
     return VGA_timer_thread ? TRUE : FALSE;
 }
 
-HANDLE VGA_AlphaConsole(void)
+static HANDLE VGA_AlphaConsole(void)
 {
     /* this assumes that no Win32 redirection has taken place, but then again,
      * only 16-bit apps are likely to use this part of Wine... */
     return GetStdHandle(STD_OUTPUT_HANDLE);
 }
 
-char*VGA_AlphaBuffer(void)
+static char*VGA_AlphaBuffer(void)
 {
     return (char *)0xb8000;
 }
@@ -526,7 +526,7 @@ int VGA_GetMode(unsigned*Height,unsigned
     return 0;
 }
 
-void VGA_Exit(void)
+static void VGA_Exit(void)
 {
     if (lpddraw) MZ_RunInThread(VGA_DoExit, 0);
 }
@@ -687,7 +687,7 @@ void VGA_ShowMouse( BOOL show )
 
 /* prepare the text mode video memory copy that is used to only
  * update the video memory line that did get updated. */
-void VGA_PrepareVideoMemCopy(unsigned Xres, unsigned Yres)
+static void VGA_PrepareVideoMemCopy(unsigned Xres, unsigned Yres)
 {
     char *p, *p2;
     unsigned int i;
-------------- next part --------------
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.185
diff -u -p -r1.185 socket.c
--- dlls/winsock/socket.c	27 Jun 2005 09:53:47 -0000	1.185
+++ dlls/winsock/socket.c	4 Jul 2005 10:54:37 -0000
@@ -815,7 +815,7 @@ static const struct sockaddr* ws_sockadd
 }
 
 /* Allocates a Unix sockaddr structure to receive the data */
-inline struct sockaddr* ws_sockaddr_alloc(const struct WS_sockaddr* wsaddr, int* wsaddrlen, int* uaddrlen)
+static inline struct sockaddr* ws_sockaddr_alloc(const struct WS_sockaddr* wsaddr, int* wsaddrlen, int* uaddrlen)
 {
     if (wsaddr==NULL)
     {
@@ -899,7 +899,7 @@ static int ws_sockaddr_u2ws(const struct
 /* to be called to free the memory allocated by ws_sockaddr_ws2u or
  * ws_sockaddr_alloc
  */
-inline void ws_sockaddr_free(const struct sockaddr* uaddr, const struct WS_sockaddr* wsaddr)
+static inline void ws_sockaddr_free(const struct sockaddr* uaddr, const struct WS_sockaddr* wsaddr)
 {
     if (uaddr!=(const struct sockaddr*)wsaddr)
         HeapFree(GetProcessHeap(), 0, (void *)uaddr);


More information about the wine-patches mailing list