fix some declaration and write string warnings
Mike McCormack
mike at codeweavers.com
Thu Jun 16 01:02:32 CDT 2005
These are scattered round the place, but are following the same theme.
Mike
ChangeLog:
* fix some declaration and write string warnings
-------------- next part --------------
Index: dlls/crypt32/tests/encode.c
===================================================================
RCS file: /home/wine/wine/dlls/crypt32/tests/encode.c,v
retrieving revision 1.6
diff -u -p -r1.6 encode.c
--- dlls/crypt32/tests/encode.c 15 Jun 2005 10:21:32 -0000 1.6
+++ dlls/crypt32/tests/encode.c 16 Jun 2005 01:18:03 -0000
@@ -234,7 +234,7 @@ static void test_decodeInt(DWORD dwEncod
struct encodedFiletime
{
SYSTEMTIME sysTime;
- BYTE *encodedTime;
+ const BYTE *encodedTime;
};
static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType,
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.36
diff -u -p -r1.36 heap.c
--- dlls/ntdll/heap.c 6 Jun 2005 20:13:08 -0000 1.36
+++ dlls/ntdll/heap.c 16 Jun 2005 01:18:05 -0000
@@ -173,7 +173,7 @@ static inline void clear_block( void *pt
/***********************************************************************
* 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 );
Index: dlls/oleaut32/tests/typelib.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/typelib.c,v
retrieving revision 1.2
diff -u -p -r1.2 typelib.c
--- dlls/oleaut32/tests/typelib.c 5 Jun 2005 18:04:54 -0000 1.2
+++ dlls/oleaut32/tests/typelib.c 16 Jun 2005 01:18:08 -0000
@@ -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;
Index: dlls/winmm/tests/mixer.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/tests/mixer.c,v
retrieving revision 1.10
diff -u -p -r1.10 mixer.c
--- dlls/winmm/tests/mixer.c 13 Jun 2005 12:10:54 -0000 1.10
+++ dlls/winmm/tests/mixer.c 16 Jun 2005 01:18:09 -0000
@@ -343,7 +343,7 @@ static void mixer_test_controlA(HMIXER m
}
}
-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 m
}
}
-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;
Index: dlls/winmm/winealsa/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v
retrieving revision 1.87
diff -u -p -r1.87 audio.c
--- dlls/winmm/winealsa/audio.c 13 Jun 2005 18:56:00 -0000 1.87
+++ dlls/winmm/winealsa/audio.c 16 Jun 2005 01:18:10 -0000
@@ -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;
Index: libs/unicode/mbtowc.c
===================================================================
RCS file: /home/wine/wine/libs/unicode/mbtowc.c,v
retrieving revision 1.4
diff -u -p -r1.4 mbtowc.c
--- libs/unicode/mbtowc.c 20 Jan 2004 22:39:06 -0000 1.4
+++ libs/unicode/mbtowc.c 16 Jun 2005 01:18:11 -0000
@@ -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;
Index: programs/msiexec/msiexec.c
===================================================================
RCS file: /home/wine/wine/programs/msiexec/msiexec.c,v
retrieving revision 1.27
diff -u -p -r1.27 msiexec.c
--- programs/msiexec/msiexec.c 17 May 2005 14:33:36 -0000 1.27
+++ programs/msiexec/msiexec.c 16 Jun 2005 01:18:11 -0000
@@ -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 *
*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;
Index: programs/winetest/util.c
===================================================================
RCS file: /home/wine/wine/programs/winetest/util.c,v
retrieving revision 1.10
diff -u -p -r1.10 util.c
--- programs/winetest/util.c 18 Apr 2005 09:54:24 -0000 1.10
+++ programs/winetest/util.c 16 Jun 2005 01:18:12 -0000
@@ -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;
More information about the wine-patches
mailing list