giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libopensc: export the wrapper for the internal log function dedicated to minidriver 

http://www.opensc-project.org/pipermail/opensc-commits/2011-May/011049.html


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5430 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
vtarasov 2011-05-08 08:07:03 +00:00
parent 8e75d971cb
commit 1176c59370
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libopensc/log.c
View File

@ -42,6 +42,8 @@
#include "internal.h"
static void sc_do_log_va(sc_context_t *ctx, int level, const char *file, int line, const char *func, const char *format, va_list args);
void sc_do_log(sc_context_t *ctx, int level, const char *file, int line, const char *func, const char *format, ...)
{
va_list ap;
@ -51,7 +53,12 @@ void sc_do_log(sc_context_t *ctx, int level, const char *file, int line, const c
va_end(ap);
}
void sc_do_log_va(sc_context_t *ctx, int level, const char *file, int line, const char *func, const char *format, va_list args)
void sc_do_log_noframe(sc_context_t *ctx, int level, const char *format, va_list args)
{
sc_do_log_va(ctx, level, NULL, 0, NULL, format, args);
}
static void sc_do_log_va(sc_context_t *ctx, int level, const char *file, int line, const char *func, const char *format, va_list args)
{
char buf[1836], *p;
int r;

3
src/libopensc/log.h
View File

@ -54,8 +54,7 @@ enum {
void sc_do_log(struct sc_context *ctx, int level, const char *file, int line, const char *func,
const char *format, ...);
void sc_do_log_va(struct sc_context *ctx, int level, const char *file, int line, const char *func,
const char *format, va_list args);
void sc_do_log_noframe(sc_context_t *ctx, int level, const char *format, va_list args);
void _sc_debug(struct sc_context *ctx, int level, const char *format, ...);
void _sc_log(struct sc_context *ctx, const char *format, ...);

5
src/minidriver/minidriver.c
View File

@ -127,7 +127,7 @@ static void logprintf(PCARD_DATA pCardData, int level, const char* format, ...)
if(vs != NULL && vs->ctx != NULL)
{
#ifdef _MSC_VER
sc_do_log_va(vs->ctx, level, NULL, 0, NULL, format, arg);
sc_do_log_noframe(vs->ctx, level, format, arg);
#else
/* FIXME: trouble in vsprintf with %S arg under
mingw32
@ -2127,4 +2127,5 @@ BOOL APIENTRY DllMain( HMODULE hModule,
#ifdef _MANAGED
#pragma managed(pop)
#endif
#endif
#endif