Fix some -Wstrict-prototypes warnings.

This commit is contained in:
Stefan Huehner 2005-06-16 15:52:44 +00:00 committed by Alexandre Julliard
parent db982e2586
commit 712087700e
11 changed files with 46 additions and 46 deletions

View File

@ -38,7 +38,7 @@ static HTREEITEM hRoot, hChild;
static int pos = 0; static int pos = 0;
static char sequence[256]; static char sequence[256];
static void Clear() static void Clear(void)
{ {
pos = 0; pos = 0;
sequence[0] = '\0'; sequence[0] = '\0';
@ -67,7 +67,7 @@ static void IdentifyItem(HTREEITEM hItem)
AddItem('?'); AddItem('?');
} }
static void FillRoot() static void FillRoot(void)
{ {
TVINSERTSTRUCTA ins; TVINSERTSTRUCTA ins;
@ -92,7 +92,7 @@ static void FillRoot()
ok(!strcmp(sequence, "AB."), "Item creation"); ok(!strcmp(sequence, "AB."), "Item creation");
} }
static void DoTest1() static void DoTest1(void)
{ {
TreeView_SelectItem(hTree, NULL); TreeView_SelectItem(hTree, NULL);
Clear(); Clear();
@ -110,7 +110,7 @@ static void DoTest1()
ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test"); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test");
} }
static void DoTest2() static void DoTest2(void)
{ {
TreeView_SelectItem(hTree, NULL); TreeView_SelectItem(hTree, NULL);
Clear(); Clear();

View File

@ -238,7 +238,7 @@ static BOOL UPDOWN_GetArrowFromPoint (UPDOWN_INFO* infoPtr, RECT *rect, POINT pt
* UPDOWN_GetThousandSep * UPDOWN_GetThousandSep
* Returns the thousand sep. If an error occurs, it returns ','. * Returns the thousand sep. If an error occurs, it returns ','.
*/ */
static WCHAR UPDOWN_GetThousandSep() static WCHAR UPDOWN_GetThousandSep(void)
{ {
WCHAR sep[2]; WCHAR sep[2];

View File

@ -76,7 +76,7 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
return DefWindowProcW(hwnd, msg, wParam, lParam); return DefWindowProcW(hwnd, msg, wParam, lParam);
} }
static void register_serverwnd_class() static void register_serverwnd_class(void)
{ {
static WNDCLASSEXW wndclass = { static WNDCLASSEXW wndclass = {
sizeof(WNDCLASSEXW), sizeof(WNDCLASSEXW),

View File

@ -813,7 +813,7 @@ static void test_RtlAreAnyAccessesGranted(void)
} /* for */ } /* for */
} }
static void test_RtlComputeCrc32() static void test_RtlComputeCrc32(void)
{ {
DWORD crc = 0; DWORD crc = 0;
@ -837,7 +837,7 @@ static inline void RtlpMakeHandleAllocated(RTL_HANDLE * Handle)
*AllocatedBit = *AllocatedBit | 1; *AllocatedBit = *AllocatedBit | 1;
} }
static void test_HandleTables() static void test_HandleTables(void)
{ {
BOOLEAN result; BOOLEAN result;
NTSTATUS status; NTSTATUS status;

View File

@ -48,7 +48,7 @@ static ULONG (WINAPI *pRtlFindLongestRunClear)(PRTL_BITMAP,PULONG);
static BYTE buff[256]; static BYTE buff[256];
static RTL_BITMAP bm; static RTL_BITMAP bm;
static void InitFunctionPtrs() static void InitFunctionPtrs(void)
{ {
hntdll = LoadLibraryA("ntdll.dll"); hntdll = LoadLibraryA("ntdll.dll");
ok(hntdll != 0, "LoadLibrary failed\n"); ok(hntdll != 0, "LoadLibrary failed\n");
@ -103,7 +103,7 @@ static void test_RtlSetAllBits(void)
ok(buff[4] == 0, "set more than rounded size\n"); ok(buff[4] == 0, "set more than rounded size\n");
} }
static void test_RtlClearAllBits() static void test_RtlClearAllBits(void)
{ {
if (!pRtlClearAllBits) if (!pRtlClearAllBits)
return; return;
@ -116,7 +116,7 @@ static void test_RtlClearAllBits()
ok(buff[4] == 0xff, "cleared more than rounded size\n"); ok(buff[4] == 0xff, "cleared more than rounded size\n");
} }
static void test_RtlSetBits() static void test_RtlSetBits(void)
{ {
if (!pRtlSetBits) if (!pRtlSetBits)
return; return;
@ -144,7 +144,7 @@ static void test_RtlSetBits()
ok(buff[sizeof(buff)-1] == 0x80, "didn't set last bit\n"); ok(buff[sizeof(buff)-1] == 0x80, "didn't set last bit\n");
} }
static void test_RtlClearBits() static void test_RtlClearBits(void)
{ {
if (!pRtlClearBits) if (!pRtlClearBits)
return; return;
@ -172,7 +172,7 @@ static void test_RtlClearBits()
ok(buff[sizeof(buff)-1] == 0x7f, "didn't set last bit\n"); ok(buff[sizeof(buff)-1] == 0x7f, "didn't set last bit\n");
} }
static void test_RtlCheckBit() static void test_RtlCheckBit(void)
{ {
BOOLEAN bRet; BOOLEAN bRet;
@ -196,7 +196,7 @@ static void test_RtlCheckBit()
ok (!bRet, "found non set bit\n"); ok (!bRet, "found non set bit\n");
} }
static void test_RtlAreBitsSet() static void test_RtlAreBitsSet(void)
{ {
BOOLEAN bRet; BOOLEAN bRet;
@ -241,7 +241,7 @@ static void test_RtlAreBitsSet()
ok(bRet, "didn't find last bit\n"); ok(bRet, "didn't find last bit\n");
} }
static void test_RtlAreBitsClear() static void test_RtlAreBitsClear(void)
{ {
BOOLEAN bRet; BOOLEAN bRet;
@ -286,7 +286,7 @@ static void test_RtlAreBitsClear()
ok(bRet, "didn't find last bit\n"); ok(bRet, "didn't find last bit\n");
} }
static void test_RtlNumberOfSetBits() static void test_RtlNumberOfSetBits(void)
{ {
ULONG ulCount; ULONG ulCount;
@ -316,7 +316,7 @@ static void test_RtlNumberOfSetBits()
ok(ulCount == 8+1+33+1, "count wrong\n"); ok(ulCount == 8+1+33+1, "count wrong\n");
} }
static void test_RtlNumberOfClearBits() static void test_RtlNumberOfClearBits(void)
{ {
ULONG ulCount; ULONG ulCount;
@ -347,7 +347,7 @@ static void test_RtlNumberOfClearBits()
} }
/* Note: this tests RtlFindSetBits also */ /* Note: this tests RtlFindSetBits also */
static void test_RtlFindSetBitsAndClear() static void test_RtlFindSetBitsAndClear(void)
{ {
BOOLEAN bRet; BOOLEAN bRet;
ULONG ulPos; ULONG ulPos;
@ -379,7 +379,7 @@ static void test_RtlFindSetBitsAndClear()
} }
/* Note: this tests RtlFindClearBits also */ /* Note: this tests RtlFindClearBits also */
static void test_RtlFindClearBitsAndSet() static void test_RtlFindClearBitsAndSet(void)
{ {
BOOLEAN bRet; BOOLEAN bRet;
ULONG ulPos; ULONG ulPos;
@ -410,7 +410,7 @@ static void test_RtlFindClearBitsAndSet()
} }
} }
static void test_RtlFindMostSignificantBit() static void test_RtlFindMostSignificantBit(void)
{ {
int i; int i;
CCHAR cPos; CCHAR cPos;
@ -437,7 +437,7 @@ static void test_RtlFindMostSignificantBit()
ok (cPos == -1, "found bit when not set\n"); ok (cPos == -1, "found bit when not set\n");
} }
static void test_RtlFindLeastSignificantBit() static void test_RtlFindLeastSignificantBit(void)
{ {
int i; int i;
CCHAR cPos; CCHAR cPos;
@ -463,7 +463,7 @@ static void test_RtlFindLeastSignificantBit()
} }
/* Note: Also tests RtlFindLongestRunSet() */ /* Note: Also tests RtlFindLongestRunSet() */
static void test_RtlFindSetRuns() static void test_RtlFindSetRuns(void)
{ {
RTL_BITMAP_RUN runs[16]; RTL_BITMAP_RUN runs[16];
ULONG ulCount; ULONG ulCount;
@ -537,7 +537,7 @@ static void test_RtlFindSetRuns()
} }
/* Note: Also tests RtlFindLongestRunClear() */ /* Note: Also tests RtlFindLongestRunClear() */
static void test_RtlFindClearRuns() static void test_RtlFindClearRuns(void)
{ {
RTL_BITMAP_RUN runs[16]; RTL_BITMAP_RUN runs[16];
ULONG ulCount; ULONG ulCount;

View File

@ -58,7 +58,7 @@ static void clean_up_environment(void)
CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET);
} }
static void test_gen_random() static void test_gen_random(void)
{ {
BOOL result; BOOL result;
BYTE rnd1[16], rnd2[16]; BYTE rnd1[16], rnd2[16];

View File

@ -91,7 +91,7 @@ static void clean_up_environment(void)
CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET);
} }
static void test_prov() static void test_prov(void)
{ {
BOOL result; BOOL result;
DWORD dwLen, dwInc; DWORD dwLen, dwInc;
@ -105,7 +105,7 @@ static void test_prov()
ok(result && dwInc==8, "%08lx, %ld\n", GetLastError(), dwInc); ok(result && dwInc==8, "%08lx, %ld\n", GetLastError(), dwInc);
} }
static void test_gen_random() static void test_gen_random(void)
{ {
BOOL result; BOOL result;
BYTE rnd1[16], rnd2[16]; BYTE rnd1[16], rnd2[16];
@ -275,7 +275,7 @@ static void test_hashes(void)
ok(result, "%08lx\n", GetLastError()); ok(result, "%08lx\n", GetLastError());
} }
static void test_block_cipher_modes() static void test_block_cipher_modes(void)
{ {
static const BYTE plain[23] = { static const BYTE plain[23] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
@ -357,7 +357,7 @@ static void test_block_cipher_modes()
ok(!result && GetLastError() == NTE_BAD_ALGID, "%08lx\n", GetLastError()); ok(!result && GetLastError() == NTE_BAD_ALGID, "%08lx\n", GetLastError());
} }
static void test_3des112() static void test_3des112(void)
{ {
HCRYPTKEY hKey; HCRYPTKEY hKey;
BOOL result; BOOL result;
@ -385,7 +385,7 @@ static void test_3des112()
ok(result, "%08lx\n", GetLastError()); ok(result, "%08lx\n", GetLastError());
} }
static void test_des() static void test_des(void)
{ {
HCRYPTKEY hKey; HCRYPTKEY hKey;
BOOL result; BOOL result;
@ -421,7 +421,7 @@ static void test_des()
ok(result, "%08lx\n", GetLastError()); ok(result, "%08lx\n", GetLastError());
} }
static void test_3des() static void test_3des(void)
{ {
HCRYPTKEY hKey; HCRYPTKEY hKey;
BOOL result; BOOL result;
@ -450,7 +450,7 @@ static void test_3des()
ok(result, "%08lx\n", GetLastError()); ok(result, "%08lx\n", GetLastError());
} }
static void test_rc2() static void test_rc2(void)
{ {
static const BYTE rc2encrypted[16] = { static const BYTE rc2encrypted[16] = {
0x02, 0x34, 0x7d, 0xf6, 0x1d, 0xc5, 0x9b, 0x8b, 0x02, 0x34, 0x7d, 0xf6, 0x1d, 0xc5, 0x9b, 0x8b,
@ -538,7 +538,7 @@ static void test_rc2()
} }
} }
static void test_rc4() static void test_rc4(void)
{ {
static const BYTE rc4[16] = { static const BYTE rc4[16] = {
0x17, 0x0c, 0x44, 0x8e, 0xae, 0x90, 0xcd, 0xb0, 0x17, 0x0c, 0x44, 0x8e, 0xae, 0x90, 0xcd, 0xb0,
@ -609,7 +609,7 @@ static void test_rc4()
} }
} }
static void test_hmac() { static void test_hmac(void) {
HCRYPTKEY hKey; HCRYPTKEY hKey;
HCRYPTHASH hHash; HCRYPTHASH hHash;
BOOL result; BOOL result;
@ -652,7 +652,7 @@ static void test_hmac() {
ok(!result && GetLastError() == NTE_BAD_KEY, "%08lx\n", GetLastError()); ok(!result && GetLastError() == NTE_BAD_KEY, "%08lx\n", GetLastError());
} }
static void test_mac() { static void test_mac(void) {
HCRYPTKEY hKey; HCRYPTKEY hKey;
HCRYPTHASH hHash; HCRYPTHASH hHash;
BOOL result; BOOL result;
@ -699,7 +699,7 @@ static void test_mac() {
ok(result, "%08lx\n", GetLastError()); ok(result, "%08lx\n", GetLastError());
} }
static void test_import_private() static void test_import_private(void)
{ {
DWORD dwLen; DWORD dwLen;
HCRYPTKEY hKeyExchangeKey, hSessionKey; HCRYPTKEY hKeyExchangeKey, hSessionKey;
@ -837,7 +837,7 @@ static void test_import_private()
if (!result) return; if (!result) return;
} }
static void test_verify_signature() { static void test_verify_signature(void) {
HCRYPTHASH hHash; HCRYPTHASH hHash;
HCRYPTKEY hPubSignKey; HCRYPTKEY hPubSignKey;
BYTE abData[] = "Wine rocks!"; BYTE abData[] = "Wine rocks!";

View File

@ -98,7 +98,7 @@ static BOOL GetLine( HANDLE hFile, char *buf, size_t buflen )
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
* Returns FALSE if there was an error, or otherwise if all is ok. * Returns FALSE if there was an error, or otherwise if all is ok.
*/ */
static BOOL wininit() static BOOL wininit(void)
{ {
const char * const RENAME_FILE="wininit.ini"; const char * const RENAME_FILE="wininit.ini";
const char * const RENAME_FILE_TO="wininit.bak"; const char * const RENAME_FILE_TO="wininit.bak";
@ -188,7 +188,7 @@ static BOOL wininit()
return TRUE; return TRUE;
} }
static BOOL pendingRename() static BOOL pendingRename(void)
{ {
static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', static const WCHAR ValueName[] = {'P','e','n','d','i','n','g',
'F','i','l','e','R','e','n','a','m','e', 'F','i','l','e','R','e','n','a','m','e',

View File

@ -271,7 +271,7 @@ void load_drives()
/* some of this code appears to be broken by bugs in Wine: the label /* some of this code appears to be broken by bugs in Wine: the label
* setting code has no effect, for instance */ * setting code has no effect, for instance */
void apply_drive_changes() void apply_drive_changes(void)
{ {
int i; int i;
CHAR devicename[4]; CHAR devicename[4];

View File

@ -111,7 +111,7 @@ static BOOL is_drive_defined(char *path)
} }
/* returns Z + 1 if there are no more available letters */ /* returns Z + 1 if there are no more available letters */
static char allocate_letter() static char allocate_letter(void)
{ {
char letter; char letter;
@ -184,7 +184,7 @@ static void report_error(int code)
} }
} }
static void ensure_root_is_mapped() static void ensure_root_is_mapped(void)
{ {
int i; int i;
BOOL mapped = FALSE; BOOL mapped = FALSE;
@ -211,7 +211,7 @@ static void ensure_root_is_mapped()
} }
} }
static void ensure_home_is_mapped() static void ensure_home_is_mapped(void)
{ {
int i; int i;
BOOL mapped = FALSE; BOOL mapped = FALSE;
@ -239,7 +239,7 @@ static void ensure_home_is_mapped()
} }
} }
static void ensure_drive_c_is_mapped() static void ensure_drive_c_is_mapped(void)
{ {
struct stat buf; struct stat buf;
const char *configdir = wine_get_config_dir(); const char *configdir = wine_get_config_dir();

View File

@ -76,8 +76,8 @@ INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l
INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* Drive management */ /* Drive management */
void load_drives(); void load_drives(void);
int autodetect_drives(); int autodetect_drives(void);
struct drive struct drive
{ {
@ -95,7 +95,7 @@ struct drive
long drive_available_mask(char letter); long drive_available_mask(char letter);
BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type); BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type);
void delete_drive(struct drive *pDrive); void delete_drive(struct drive *pDrive);
void apply_drive_changes(); void apply_drive_changes(void);
extern struct drive drives[26]; /* one for each drive letter */ extern struct drive drives[26]; /* one for each drive letter */
BOOL gui_mode; BOOL gui_mode;