From a5b2f088dc98d6b858492575464788f2f7d4ce2f Mon Sep 17 00:00:00 2001 From: Thorsten Engel Date: Thu, 12 May 2005 14:36:43 +0000 Subject: [PATCH] rewrote to use ReadConsole/WriteConsole instead of cwprinf and cwgets on win32 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2024 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/winapi.c | 12 +----------- bacula/src/lib/winapi.h | 5 ----- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/bacula/src/lib/winapi.c b/bacula/src/lib/winapi.c index 9a5f6532cf..b7bf9d613e 100644 --- a/bacula/src/lib/winapi.c +++ b/bacula/src/lib/winapi.c @@ -50,9 +50,6 @@ t_wunlink p_wunlink = NULL; t_wmkdir p_wmkdir = NULL; t_wopen p_wopen = NULL; -t_cgetws p_cgetws = NULL; -t_cwprintf p_cwprintf = NULL; - t_GetFileAttributesA p_GetFileAttributesA = NULL; t_GetFileAttributesW p_GetFileAttributesW = NULL; @@ -149,14 +146,7 @@ InitWinAPIWrapper() /* wopen */ p_wopen = (t_wopen) GetProcAddress(hLib, "_wopen"); - - /* cgetws */ - p_cgetws = (t_cgetws) - GetProcAddress (hLib, "_cgetws"); - /* cwprintf */ - p_cwprintf = (t_cwprintf) - GetProcAddress (hLib, "_cwprintf"); - + FreeLibrary(hLib); } diff --git a/bacula/src/lib/winapi.h b/bacula/src/lib/winapi.h index b57dbb6802..de5ebf5507 100644 --- a/bacula/src/lib/winapi.h +++ b/bacula/src/lib/winapi.h @@ -66,15 +66,10 @@ typedef int (__cdecl * t_wunlink) (const wchar_t *); typedef int (__cdecl * t_wmkdir) (const wchar_t *); typedef int (__cdecl * t_wopen) (const wchar_t *, int, ...); -typedef wchar_t* (__cdecl *t_cgetws) (wchar_t *); -typedef int (__cdecl *t_cwprintf) (const wchar_t *, ...); - extern t_wunlink p_wunlink; extern t_wmkdir p_wmkdir; extern t_wopen p_wopen; -extern t_cgetws p_cgetws; -extern t_cwprintf p_cwprintf; /* In KERNEL32.DLL */ typedef BOOL (WINAPI * t_GetFileAttributesExA)(LPCSTR, GET_FILEEX_INFO_LEVELS, LPVOID); -- 2.39.5