Alexandre Julliard : ntdll/tests: Make some variables static.
Alexandre Julliard
julliard at winehq.org
Fri Oct 1 11:38:40 CDT 2010
Module: wine
Branch: master
Commit: be94563670cf5fd4aa6530561287a7d7d96b1030
URL: http://source.winehq.org/git/wine.git/?a=commit;h=be94563670cf5fd4aa6530561287a7d7d96b1030
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Oct 1 13:37:03 2010 +0200
ntdll/tests: Make some variables static.
---
dlls/ntdll/tests/change.c | 12 ++++--------
dlls/ntdll/tests/directory.c | 2 +-
dlls/ntdll/tests/file.c | 6 +++---
dlls/ntdll/tests/time.c | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c
index ed7f22c..297af9e 100644
--- a/dlls/ntdll/tests/change.c
+++ b/dlls/ntdll/tests/change.c
@@ -27,13 +27,11 @@
#include <stdio.h>
#include "wine/test.h"
-typedef NTSTATUS (WINAPI *fnNtNotifyChangeDirectoryFile)(
+static NTSTATUS (WINAPI *pNtNotifyChangeDirectoryFile)(
HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,
PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN);
-fnNtNotifyChangeDirectoryFile pNtNotifyChangeDirectoryFile;
-typedef NTSTATUS (WINAPI *fnNtCancelIoFile)(HANDLE,PIO_STATUS_BLOCK);
-fnNtCancelIoFile pNtCancelIoFile;
+static NTSTATUS (WINAPI *pNtCancelIoFile)(HANDLE,PIO_STATUS_BLOCK);
static void test_ntncdf(void)
@@ -321,10 +319,8 @@ START_TEST(change)
return;
}
- pNtNotifyChangeDirectoryFile = (fnNtNotifyChangeDirectoryFile)
- GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile");
- pNtCancelIoFile = (fnNtCancelIoFile)
- GetProcAddress(hntdll, "NtCancelIoFile");
+ pNtNotifyChangeDirectoryFile = (void *)GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile");
+ pNtCancelIoFile = (void *)GetProcAddress(hntdll, "NtCancelIoFile");
if (!pNtNotifyChangeDirectoryFile || !pNtCancelIoFile)
{
diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c
index a77a4b4..bc4ad39 100644
--- a/dlls/ntdll/tests/directory.c
+++ b/dlls/ntdll/tests/directory.c
@@ -50,7 +50,7 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirection)( BOOLEAN enable );
static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG *old_value );
/* The attribute sets to test */
-struct testfile_s {
+static struct testfile_s {
int todo; /* set if it doesn't work on wine yet */
const DWORD attr; /* desired attribute */
const char *name; /* filename to use */
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index c1f1c48..99a608b 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -112,9 +112,9 @@ static HANDLE create_temp_file( ULONG flags )
#define CKEY_FIRST 0x1030341
#define CKEY_SECOND 0x132E46
-ULONG_PTR completionKey;
-IO_STATUS_BLOCK ioSb;
-ULONG_PTR completionValue;
+static ULONG_PTR completionKey;
+static IO_STATUS_BLOCK ioSb;
+static ULONG_PTR completionValue;
static ULONG get_pending_msgs(HANDLE h)
{
diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c
index 16530c4..ff80b84 100644
--- a/dlls/ntdll/tests/time.c
+++ b/dlls/ntdll/tests/time.c
@@ -39,7 +39,7 @@ static inline int IsLeapYear(int Year)
}
/* start time of the tests */
-TIME_FIELDS tftest = {1889,12,31,23,59,59,0,0};
+static TIME_FIELDS tftest = {1889,12,31,23,59,59,0,0};
static void test_pRtlTimeToTimeFields(void)
{
More information about the wine-cvs
mailing list