correct interface definition

[strongswan.git] / src / libstrongswan / printf_hook.h

diff --git a/src/libstrongswan/printf_hook.h b/src/libstrongswan/printf_hook.h
index 14931bd..ec44294 100644 (file)
--- a/src/libstrongswan/printf_hook.h
+++ b/src/libstrongswan/printf_hook.h
@@ -30,39 +30,42 @@
  * We define all characters here to have them on a central place.
  */
 
  * We define all characters here to have them on a central place.
  */
 

-/** 2 arguments: enum_name_t *name, long value */
-#define PRINTF_ENUM                            'N'
-/** 1 argument: chunk_t *chunk; use #-modifier to print inline */
-#define PRINTF_CHUNK                   'B'

 /** 2 arguments: u_char *buffer, int size */
 #define PRINTF_BYTES                   'b'
 /** 2 arguments: u_char *buffer, int size */
 #define PRINTF_BYTES                   'b'

-/** 1 argument: int time; with #-modifier 2 arguments: int time, bool utc */
-#define PRINTF_TIME                            'T'
-/** 2 arguments: integer begin, int end */
-#define PRINTF_TIME_DELTA              'V'
-/** 1 argument: x509_t *cert; with #-modifier 2 arguments: x509_t *cert, bool utc */
-#define PRINTF_X509                            'Q'
-/** 1 argument: crl_t *crl; with #-modifier 2 arguments: crl_t *crl, bool utc */
-#define PRINTF_CRL                             'U'
-/** 1 argumnet: host_t *host; use #-modifier to include port number */
-#define PRINTF_HOST                            'H'
+/** 1 argument: chunk_t *chunk; use #-modifier to print inline */
+#define PRINTF_CHUNK                   'B'

 /** 1 argument: identification_t *id */
 #define PRINTF_IDENTIFICATION  'D'
 /** 1 argument: identification_t *id */
 #define PRINTF_IDENTIFICATION  'D'

-/** 1 argument: traffic_selector_t *ts */
-#define PRINTF_TRAFFIC_SELECTOR        'R'
-/** 1 argument: ike_sa_t *ike_sa */
-#define PRINTF_IKE_SA                  'K'
+/** 1 argumnet: host_t *host; use #-modifier to include port number */
+#define PRINTF_HOST                            'H'

 /** 1 argument: ike_sa_id_t *id */
 #define PRINTF_IKE_SA_ID               'J'
 /** 1 argument: ike_sa_id_t *id */
 #define PRINTF_IKE_SA_ID               'J'

-/** 1 argument: child_sa_t *child_sa */
-#define PRINTF_CHILD_SA                        'P'
+/** 1 argument: ike_sa_t *ike_sa */
+#define PRINTF_IKE_SA                  'K'

 /** 1 argument: message_t *message */
 #define PRINTF_MESSAGE                 'M'
 /** 1 argument: message_t *message */
 #define PRINTF_MESSAGE                 'M'

+/** 2 arguments: enum_name_t *name, long value */
+#define PRINTF_ENUM                            'N'
+/** 1 argument: child_sa_t *child_sa */
+#define PRINTF_CHILD_SA                        'P'
+/** 1 argument: traffic_selector_t *ts */
+#define PRINTF_TRAFFIC_SELECTOR        'R'
+/** 1 argument: time_t *time; with #-modifier 2 arguments: time_t *time, bool utc */
+#define PRINTF_TIME                            'T'
+/** 1 argument: x509_t *cert; with #-modifier 2 arguments: x509_t *cert, bool utc */
+#define PRINTF_X509                            'Q'
+/** 1 argument: crl_t *crl; with #-modifier 2 arguments: crl_t *crl, bool utc */
+#define PRINTF_CRL                             'U'
+/** 2 arguments: time_t *begin, time_t *end */
+#define PRINTF_TIME_DELTA              'V'
+/** 1 argument: ca_info_t *ca_info; with #-modifier 2 arguments: ca_info_t *ca_info, bool utc */
+#define PRINTF_CAINFO                  'W'

 
 /**
  * Generic arginfo handlers for printf() hooks
  */
 int arginfo_ptr(const struct printf_info *info, size_t n, int *argtypes);
 
 /**
  * Generic arginfo handlers for printf() hooks
  */
 int arginfo_ptr(const struct printf_info *info, size_t n, int *argtypes);

+int arginfo_ptr_ptr(const struct printf_info *info, size_t n, int *argtypes);

 int arginfo_ptr_int(const struct printf_info *info, size_t n, int *argtypes);
 int arginfo_int_int(const struct printf_info *info, size_t n, int *argtypes);
 int arginfo_ptr_alt_ptr_int(const struct printf_info *info, size_t n, int *argtypes);
 int arginfo_ptr_int(const struct printf_info *info, size_t n, int *argtypes);
 int arginfo_int_int(const struct printf_info *info, size_t n, int *argtypes);
 int arginfo_ptr_alt_ptr_int(const struct printf_info *info, size_t n, int *argtypes);