From 65ad7da1f79b4c70260a791a5f89241e93897965 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Thu, 16 Jun 2005 10:45:25 +0000
Subject: [PATCH] Fix some declaration and write string warnings.

---
 dlls/crypt32/tests/encode.c   | 2 +-
 dlls/ntdll/heap.c             | 4 ++--
 dlls/oleaut32/tests/typelib.c | 2 +-
 dlls/winmm/tests/mixer.c      | 8 ++++----
 dlls/winmm/winealsa/audio.c   | 2 +-
 libs/unicode/mbtowc.c         | 2 +-
 programs/msiexec/msiexec.c    | 4 ++--
 programs/winetest/util.c      | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index 519d0fdbb77..c9e1c7797fe 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -234,7 +234,7 @@ static void test_decodeInt(DWORD dwEncoding)
 struct encodedFiletime
 {
     SYSTEMTIME sysTime;
-    BYTE *encodedTime;
+    const BYTE *encodedTime;
 };
 
 static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType,
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 3c26597d798..d9f3b9a1723 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -173,7 +173,7 @@ static inline void clear_block( void *ptr, size_t size )
 /***********************************************************************
  *           HEAP_Dump
  */
-void HEAP_Dump( HEAP *heap )
+static void HEAP_Dump( HEAP *heap )
 {
     int i;
     SUBHEAP *subheap;
@@ -244,7 +244,7 @@ void HEAP_Dump( HEAP *heap )
 }
 
 
-void HEAP_DumpEntry( LPPROCESS_HEAP_ENTRY entry )
+static void HEAP_DumpEntry( LPPROCESS_HEAP_ENTRY entry )
 {
     WORD rem_flags;
     TRACE( "Dumping entry %p\n", entry );
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index f2d58a78cd2..5e48ece3ae8 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -27,7 +27,7 @@
 #include "winbase.h"
 #include "oleauto.h"
 
-void ref_count_test(LPCWSTR type_lib)
+static void ref_count_test(LPCWSTR type_lib)
 {
     ITypeLib *iface;
     ITypeInfo *iti1, *iti2;
diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c
index 7a74210eda2..70902130f57 100644
--- a/dlls/winmm/tests/mixer.c
+++ b/dlls/winmm/tests/mixer.c
@@ -343,7 +343,7 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control)
     }
 }
 
-void mixer_test_deviceA(int device)
+static void mixer_test_deviceA(int device)
 {
     MIXERCAPSA capsA;
     HMIXER mix;
@@ -720,7 +720,7 @@ static void mixer_test_controlW(HMIXER mix, LPMIXERCONTROLW control)
     }
 }
 
-void mixer_test_deviceW(int device)
+static void mixer_test_deviceW(int device)
 {
     MIXERCAPSW capsW;
     HMIXER mix;
@@ -952,7 +952,7 @@ void mixer_test_deviceW(int device)
     }
 }
 
-void mixer_testsA()
+static void mixer_testsA(void)
 {
     MIXERCAPSA capsA;
     HMIXER mix;
@@ -978,7 +978,7 @@ void mixer_testsA()
         mixer_test_deviceA(d);
 }
 
-void mixer_testsW()
+static void mixer_testsW(void)
 {
     MIXERCAPSW capsW;
     HMIXER mix;
diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c
index c3f405c2ac6..fc447e408aa 100644
--- a/dlls/winmm/winealsa/audio.c
+++ b/dlls/winmm/winealsa/audio.c
@@ -705,7 +705,7 @@ if (err<0) { \
 }
 
 /* return a string duplicated on the win32 process heap, free with HeapFree */
-static char* ALSA_strdup(char *s) {
+static char* ALSA_strdup(const char *s) {
     char *result = HeapAlloc(GetProcessHeap(), 0, strlen(s)+1);
     strcpy(result, s);
     return result;
diff --git a/libs/unicode/mbtowc.c b/libs/unicode/mbtowc.c
index dd3c9242d37..c9465f77b05 100644
--- a/libs/unicode/mbtowc.c
+++ b/libs/unicode/mbtowc.c
@@ -23,7 +23,7 @@
 #include "wine/unicode.h"
 
 /* get the decomposition of a Unicode char */
-int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
+static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
 {
     extern const WCHAR unicode_decompose_table[];
     const WCHAR *ptr = unicode_decompose_table;
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index f20f29b3f12..05c29be549c 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -386,7 +386,7 @@ static int chomp( WCHAR *str )
 	return count;
 }
 
-void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
+static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
 {
 	WCHAR **argv, *p = msi_strdup(cmdline);
 	int i, n;
@@ -404,7 +404,7 @@ void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
 	*pargv = argv;
 }
 
-BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
+static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
 {
 	LONG r;
 	HKEY hkey = 0, hkeyArgs = 0;
diff --git a/programs/winetest/util.c b/programs/winetest/util.c
index 8392dec8001..72a7c654a2e 100644
--- a/programs/winetest/util.c
+++ b/programs/winetest/util.c
@@ -40,7 +40,7 @@ void *xrealloc (void *op, size_t len)
     return p;
 }
 
-char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap)
+static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap)
 {
     size_t size = 1000;
     char *p, *q;