diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-10-24 09:47:03 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-10-24 09:47:03 +0200 |
| commit | 138c046a5ff1b0e532896b4d640c0cba6ead4027 (patch) | |
| tree | 2b2b848f2dfe47a80f2f9e46ca94e96ff88c9570 /p11-kit/proxy.c | |
| parent | 5507dc4946f0a68cece5ec9e7096e0f9b8c55984 (diff) | |
More fixes for non-static function names
* See previous commit
* Initialize library before debug statements
Diffstat (limited to 'p11-kit/proxy.c')
| -rw-r--r-- | p11-kit/proxy.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/p11-kit/proxy.c b/p11-kit/proxy.c index d6e5006..882924e 100644 --- a/p11-kit/proxy.c +++ b/p11-kit/proxy.c @@ -204,7 +204,7 @@ proxy_C_Finalize (CK_VOID_PTR reserved) { CK_RV rv; - debug ("in"); + _p11_debug ("in"); /* WARNING: This function must be reentrant */ @@ -227,7 +227,7 @@ proxy_C_Finalize (CK_VOID_PTR reserved) _p11_unlock (); } - debug ("out: %lu", rv); + _p11_debug ("out: %lu", rv); return rv; } @@ -309,9 +309,11 @@ proxy_C_Initialize (CK_VOID_PTR init_args) { CK_RV rv; + _p11_library_init_once (); + /* WARNING: This function must be reentrant */ - debug ("in"); + _p11_debug ("in"); _p11_lock (); @@ -324,12 +326,12 @@ proxy_C_Initialize (CK_VOID_PTR init_args) _p11_unlock (); - debug ("here"); + _p11_debug ("here"); if (rv != CKR_OK) proxy_C_Finalize (NULL); - debug ("out: %lu", rv); + _p11_debug ("out: %lu", rv); return rv; } @@ -338,6 +340,8 @@ proxy_C_GetInfo (CK_INFO_PTR info) { CK_RV rv = CKR_OK; + _p11_library_init_once (); + if (info == NULL) return CKR_ARGUMENTS_BAD; |