Module: wine Branch: master Commit: 8f097d8c9d6c0e30e570900183458ad15f4c764c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f097d8c9d6c0e30e570900183...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 14 12:26:43 2007 +0100
msvcrt: _initterm doesn't return anything.
---
dlls/msvcrt/data.c | 5 +---- dlls/msvcrt/tests/data.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 2511970..994e19b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -339,10 +339,9 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * /********************************************************************* * _initterm (MSVCRT.@) */ -unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) +void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN* current = start; - unsigned int count=0;
TRACE("(%p,%p)\n",start,end); while (current<end) @@ -352,11 +351,9 @@ unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) TRACE("Call init function %p\n",*current); (**current)(); TRACE("returned\n"); - count++; } current++; } - return count; }
/********************************************************************* diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a137819..262909e 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -32,7 +32,7 @@ #include <errno.h>
typedef void (*_INITTERMFUN)(void); -static unsigned int (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end);
static int callbacked;
@@ -43,8 +43,7 @@ static void initcallback(void)
#define initterm_test(start, end, expected) \ callbacked = 0; \ - rc = p_initterm(start, end); \ - ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ + p_initterm(start, end); \ ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected);
static void test_initterm(void)