[1/2] msvcrt/tests: Rename a variable.
Alexander Scott-Johns
alexander.scott.johns at googlemail.com
Wed Jun 16 17:58:37 CDT 2010
-------------- next part --------------
From 15b295adb82c3f6c01f8562e4dac9a5fa455f855 Mon Sep 17 00:00:00 2001
From: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date: Wed, 16 Jun 2010 22:34:06 +0100
Subject: msvcrt/tests: Rename a variable.
---
dlls/msvcrt/tests/misc.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 68f47f8..82dda5d 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -23,7 +23,7 @@
#include "msvcrt.h"
static int (__cdecl *prand_s)(unsigned int *);
-static int (__cdecl *memcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t);
+static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t);
static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*);
static void init(void)
@@ -31,7 +31,7 @@ static void init(void)
HMODULE hmod = GetModuleHandleA("msvcrt.dll");
prand_s = (void *)GetProcAddress(hmod, "rand_s");
- memcpy_s = (void*)GetProcAddress(hmod, "memcpy_s");
+ pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s");
pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT");
}
@@ -61,46 +61,46 @@ static void test_memcpy_s(void)
static char dest[32];
int ret;
- if(!memcpy_s)
+ if(!pmemcpy_s)
{
- win_skip("memcpy_s in not available\n");
+ win_skip("memcpy_s is not available\n");
return;
}
errno = 0xdeadbeef;
- ret = memcpy_s(NULL, 0, NULL, 0);
+ ret = pmemcpy_s(NULL, 0, NULL, 0);
ok(ret == 0, "ret = %x\n", ret);
ok(errno == 0xdeadbeef, "errno = %x\n", errno);
errno = 0xdeadbeef;
dest[0] = 'x';
- ret = memcpy_s(dest, 10, NULL, 0);
+ ret = pmemcpy_s(dest, 10, NULL, 0);
ok(ret == 0, "ret = %x\n", ret);
ok(errno == 0xdeadbeef, "errno = %x\n", errno);
ok(dest[0] == 'x', "dest[0] != \'x\'\n");
errno = 0xdeadbeef;
- ret = memcpy_s(NULL, 10, data, 10);
+ ret = pmemcpy_s(NULL, 10, data, 10);
ok(ret == EINVAL, "ret = %x\n", ret);
ok(errno == EINVAL, "errno = %x\n", errno);
errno = 0xdeadbeef;
dest[7] = 'x';
- ret = memcpy_s(dest, 10, data, 5);
+ ret = pmemcpy_s(dest, 10, data, 5);
ok(ret == 0, "ret = %x\n", ret);
ok(errno == 0xdeadbeef, "errno = %x\n", errno);
ok(memcmp(dest, data, 10), "All data copied\n");
ok(!memcmp(dest, data, 5), "First five bytes are different\n");
errno = 0xdeadbeef;
- ret = memcpy_s(data, 10, data, 10);
+ ret = pmemcpy_s(data, 10, data, 10);
ok(ret == 0, "ret = %x\n", ret);
ok(errno == 0xdeadbeef, "errno = %x\n", errno);
ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n");
errno = 0xdeadbeef;
dest[0] = 'x';
- ret = memcpy_s(dest, 5, data, 10);
+ ret = pmemcpy_s(dest, 5, data, 10);
ok(ret == ERANGE, "ret = %x\n", ret);
ok(errno == ERANGE, "errno = %x\n", errno);
ok(dest[0] == '\0', "dest[0] != \'\\0\'\n");
--
1.6.0.4
More information about the wine-patches
mailing list