virtual: Make virtual-fixed internal API cleaner

Add proper inclusion guard to virtual-fixed.h and move the declarations
of the (un)initialization functions there.

diff --git a/p11-kit/util.c b/p11-kit/util.c
index 816952f4d226a6254103e834fe211f62485a439a..e51223ea3dd65297995ecc9592b2b7c174231fab 100644 (file)
--- a/p11-kit/util.c
+++ b/p11-kit/util.c
@@ -45,7 +45,7 @@
 #include "p11-kit.h"
 #include "private.h"
 #include "proxy.h"
-#include "virtual.h"
+#include "virtual-fixed.h"
 
 #include <assert.h>
 #include <stdarg.h>
@@ -252,7 +252,7 @@ void
 _p11_kit_init (void)
 {
        p11_library_init_once ();
-       p11_virtual_init_fixed ();
+       p11_virtual_fixed_init ();
 }
 
 #ifdef __GNUC__
@@ -262,7 +262,7 @@ void
 _p11_kit_fini (void)
 {
        p11_proxy_module_cleanup ();
-       p11_virtual_uninit_fixed ();
+       p11_virtual_fixed_uninit ();
        p11_library_uninit ();
 }
 
@@ -280,14 +280,14 @@ DllMain (HINSTANCE instance,
        switch (reason) {
        case DLL_PROCESS_ATTACH:
                p11_library_init ();
-               p11_virtual_init_fixed ();
+               p11_virtual_fixed_init ();
                break;
        case DLL_THREAD_DETACH:
                p11_library_thread_cleanup ();
                break;
        case DLL_PROCESS_DETACH:
                p11_proxy_module_cleanup ();
-               p11_virtual_uninit_fixed ();
+               p11_virtual_fixed_uninit ();
                p11_library_uninit ();
                break;
        default:

diff --git a/p11-kit/virtual-fixed.h b/p11-kit/virtual-fixed.h
index 1cb685da4e497d7569ac6d7a2a82a6206465240d..cc3b2c039660de62cddc846729f56e852ab198a6 100644 (file)
--- a/p11-kit/virtual-fixed.h
+++ b/p11-kit/virtual-fixed.h
@@ -32,6 +32,10 @@
  * Author: Daiki Ueno
  */
 
+#ifndef __P11_VIRTUAL_FIXED_H__
+#define __P11_VIRTUAL_FIXED_H__
+
+/* The maximum number of precompiled closures.  */
 #define P11_VIRTUAL_MAX_FIXED 64
 
 #define P11_VIRTUAL_FIXED_FUNCTIONS(fixed_index)       \
@@ -1133,3 +1137,8 @@ fixed ## fixed_index ## _C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list) \
        short_C_CancelFunction, \
        fixed ## fixed_index ## _C_WaitForSlotEvent \
 }
+
+void                    p11_virtual_fixed_init   (void);
+void                    p11_virtual_fixed_uninit (void);
+
+#endif /* __P11_VIRTUAL_FIXED_H__ */

diff --git a/p11-kit/virtual.c b/p11-kit/virtual.c
index a9eae564ec2e722c54de3da60e4c8cf2ca29b5f6..b066b4bb49a7f5538aa2269b149542a79a20f767 100644 (file)
--- a/p11-kit/virtual.c
+++ b/p11-kit/virtual.c
@@ -102,7 +102,7 @@ static void
                                                 (CK_FUNCTION_LIST_PTR module);
 
 void
-p11_virtual_init_fixed (void)
+p11_virtual_fixed_init (void)
 {
        p11_lock ();
        p11_mutex_init (&fixed_mutex);
@@ -111,7 +111,7 @@ p11_virtual_init_fixed (void)
 }
 
 void
-p11_virtual_uninit_fixed (void)
+p11_virtual_fixed_uninit (void)
 {
        p11_lock ();
        p11_mutex_uninit (&fixed_mutex);

diff --git a/p11-kit/virtual.h b/p11-kit/virtual.h
index 8083eb9241bfdfc2db2560f3319450aa1ed5d9f8..3124cc9cbd02913d069cc760ac55630f0410e449 100644 (file)
--- a/p11-kit/virtual.h
+++ b/p11-kit/virtual.h
@@ -63,8 +63,4 @@ bool                    p11_virtual_is_wrapper (CK_FUNCTION_LIST *module);
 
 void                    p11_virtual_unwrap     (CK_FUNCTION_LIST *module);
 
-void                    p11_virtual_init_fixed (void);
-void                    p11_virtual_uninit_fixed
-                                               (void);
-
 #endif /* __P11_VIRTUAL_H__ */