msvcrt: _initterm doesn't return anything.

This commit is contained in:
Alexandre Julliard 2007-03-14 12:26:43 +01:00
parent e11ca0a7fd
commit 8f097d8c9d
2 changed files with 3 additions and 7 deletions

View File

@ -339,10 +339,9 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *
/********************************************************************* /*********************************************************************
* _initterm (MSVCRT.@) * _initterm (MSVCRT.@)
*/ */
unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end)
{ {
_INITTERMFUN* current = start; _INITTERMFUN* current = start;
unsigned int count=0;
TRACE("(%p,%p)\n",start,end); TRACE("(%p,%p)\n",start,end);
while (current<end) while (current<end)
@ -352,11 +351,9 @@ unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end)
TRACE("Call init function %p\n",*current); TRACE("Call init function %p\n",*current);
(**current)(); (**current)();
TRACE("returned\n"); TRACE("returned\n");
count++;
} }
current++; current++;
} }
return count;
} }
/********************************************************************* /*********************************************************************

View File

@ -32,7 +32,7 @@
#include <errno.h> #include <errno.h>
typedef void (*_INITTERMFUN)(void); typedef void (*_INITTERMFUN)(void);
static unsigned int (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end);
static int callbacked; static int callbacked;
@ -43,8 +43,7 @@ static void initcallback(void)
#define initterm_test(start, end, expected) \ #define initterm_test(start, end, expected) \
callbacked = 0; \ callbacked = 0; \
rc = p_initterm(start, end); \ p_initterm(start, end); \
ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \
ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected);
static void test_initterm(void) static void test_initterm(void)