* src/lib/evil_main.c:

Shutdown socket system in evil_shutdown().
	Update init/shutdown scheme.



SVN revision: 42952
This commit is contained in:
Vincent Torri 2009-10-08 05:01:50 +00:00
parent facd02ffdc
commit 9ad128d133
2 changed files with 15 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2009-10-08 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_main.c:
Shutdown socket system in evil_shutdown().
Update init/shutdown scheme.
2009-09-08 Vincent Torri <doursse at users dot sf dot net> 2009-09-08 Vincent Torri <doursse at users dot sf dot net>
* INSTALL: * INSTALL:

View File

@ -11,7 +11,7 @@
#include "evil_private.h" #include "evil_private.h"
static int _evil_init_count = 0; static int _evil_init_count = 0;
extern LONGLONG _evil_time_freq; extern LONGLONG _evil_time_freq;
extern LONGLONG _evil_time_count; extern LONGLONG _evil_time_count;
@ -25,16 +25,12 @@ evil_init()
LARGE_INTEGER count; LARGE_INTEGER count;
WORD second = 59; WORD second = 59;
if (_evil_init_count > 0) if (++_evil_init_count != 1)
{ return _evil_init_count;
_evil_init_count++;
return _evil_init_count;
}
if (!QueryPerformanceFrequency(&freq)) if (!QueryPerformanceFrequency(&freq))
{
return 0; return 0;
}
_evil_time_freq = freq.QuadPart; _evil_time_freq = freq.QuadPart;
/* be sure that second + 1 != 0 */ /* be sure that second + 1 != 0 */
@ -56,23 +52,22 @@ evil_init()
_evil_time_second = _evil_systemtime_to_time(st); _evil_time_second = _evil_systemtime_to_time(st);
if (_evil_time_second < 0) if (_evil_time_second < 0)
return 0; return 0;
_evil_time_count = count.QuadPart; _evil_time_count = count.QuadPart;
if(!evil_sockets_init()) if (!evil_sockets_init())
return 0; return 0;
_evil_init_count++;
return _evil_init_count; return _evil_init_count;
} }
int int
evil_shutdown() evil_shutdown()
{ {
_evil_init_count--; if (--_evil_init_count != 0)
if (_evil_init_count > 0) return _evil_init_count; return _evil_init_count;
if (_evil_init_count < 0) _evil_init_count = 0; evil_sockets_shutdown();
return _evil_init_count; return _evil_init_count;
} }