[rt-commit] r198 - in /redwax-tool/trunk: ChangeLog redwax-tool.c redwax-tool.h

rt-commit at redwax.eu rt-commit at redwax.eu
Mon Feb 17 18:19:48 CET 2025


Author: minfrin at redwax.eu
Date: Mon Feb 17 18:19:46 2025
New Revision: 198

Log:
Remove stray semicolons at the end of macros.

Modified:
    redwax-tool/trunk/ChangeLog
    redwax-tool/trunk/redwax-tool.c
    redwax-tool/trunk/redwax-tool.h

Modified: redwax-tool/trunk/ChangeLog
==============================================================================
--- redwax-tool/trunk/ChangeLog	(original)
+++ redwax-tool/trunk/ChangeLog	Mon Feb 17 18:19:46 2025
@@ -1,5 +1,8 @@
 
 Changes with v0.9.8
+
+ *) Remove stray semicolons at the end of macros.
+    [Graham Leggett]
 
  *) PKCS11 pins were rejected if a PIN was the maximum
     possible pin length. If no pin is entered, we skip

Modified: redwax-tool/trunk/redwax-tool.c
==============================================================================
--- redwax-tool/trunk/redwax-tool.c	(original)
+++ redwax-tool/trunk/redwax-tool.c	Mon Feb 17 18:19:46 2025
@@ -73,177 +73,177 @@
 module core_module;
 
 APR_HOOK_STRUCT(
-        APR_HOOK_LINK(initialise);
-        APR_HOOK_LINK(set_dns_server);
-        APR_HOOK_LINK(set_dns_trust_anchor);
-        APR_HOOK_LINK(set_verify_param);
-        APR_HOOK_LINK(complete_verify_param);
-        APR_HOOK_LINK(set_verify_date);
-        APR_HOOK_LINK(set_verify_expiry);
-        APR_HOOK_LINK(complete_verify_expiry);
-        APR_HOOK_LINK(set_verify_dane);
-        APR_HOOK_LINK(complete_verify_dane);
-        APR_HOOK_LINK(set_purpose);
-        APR_HOOK_LINK(complete_purpose);
-        APR_HOOK_LINK(set_tlsa);
-        APR_HOOK_LINK(process_tlsa);
-        APR_HOOK_LINK(set_smimea);
-        APR_HOOK_LINK(process_smimea);
-        APR_HOOK_LINK(process_pem_in);
-        APR_HOOK_LINK(process_trust_pem_in);
-        APR_HOOK_LINK(complete_pkcs11_in);
-        APR_HOOK_LINK(process_pkcs11_in);
-        APR_HOOK_LINK(complete_pkcs11_module_in);
-        APR_HOOK_LINK(process_pkcs11_module_in);
-        APR_HOOK_LINK(process_pkcs12_in);
-        APR_HOOK_LINK(complete_keychain_in);
-        APR_HOOK_LINK(process_keychain_in);
-        APR_HOOK_LINK(complete_filter);
-        APR_HOOK_LINK(process_filter);
-        APR_HOOK_LINK(complete_nss_out);
-        APR_HOOK_LINK(process_nss_out);
-        APR_HOOK_LINK(complete_nss_token_out);
-        APR_HOOK_LINK(complete_der_out);
-        APR_HOOK_LINK(process_der_out);
-        APR_HOOK_LINK(complete_pem_out);
-        APR_HOOK_LINK(process_pem_out);
-        APR_HOOK_LINK(complete_pkcs12_out);
-        APR_HOOK_LINK(process_pkcs12_out);
-        APR_HOOK_LINK(complete_pkcs11_out);
-        APR_HOOK_LINK(process_pkcs11_out);
-        APR_HOOK_LINK(complete_pkcs11_module_out);
-        APR_HOOK_LINK(process_pkcs11_module_out);
-        APR_HOOK_LINK(process_metadata_out);
-        APR_HOOK_LINK(process_calendar_out);
-        APR_HOOK_LINK(process_reminder_out);
-        APR_HOOK_LINK(process_ssh_public_out);
-        APR_HOOK_LINK(complete_format_out);
-        APR_HOOK_LINK(process_jwks_out);
-        APR_HOOK_LINK(set_format_out);
-        APR_HOOK_LINK(complete_order_out);
-        APR_HOOK_LINK(set_order_out);
-        APR_HOOK_LINK(set_calendar_alarm);
-        APR_HOOK_LINK(search_chain);
-        APR_HOOK_LINK(search_key);
-        APR_HOOK_LINK(compare_certificate);
-        APR_HOOK_LINK(normalise_key);
-        APR_HOOK_LINK(normalise_certificate);
-        APR_HOOK_LINK(add_dns_metadata);
-        APR_HOOK_LINK(process_dns);
-        APR_HOOK_LINK(filter_poll);
+        APR_HOOK_LINK(initialise)
+        APR_HOOK_LINK(set_dns_server)
+        APR_HOOK_LINK(set_dns_trust_anchor)
+        APR_HOOK_LINK(set_verify_param)
+        APR_HOOK_LINK(complete_verify_param)
+        APR_HOOK_LINK(set_verify_date)
+        APR_HOOK_LINK(set_verify_expiry)
+        APR_HOOK_LINK(complete_verify_expiry)
+        APR_HOOK_LINK(set_verify_dane)
+        APR_HOOK_LINK(complete_verify_dane)
+        APR_HOOK_LINK(set_purpose)
+        APR_HOOK_LINK(complete_purpose)
+        APR_HOOK_LINK(set_tlsa)
+        APR_HOOK_LINK(process_tlsa)
+        APR_HOOK_LINK(set_smimea)
+        APR_HOOK_LINK(process_smimea)
+        APR_HOOK_LINK(process_pem_in)
+        APR_HOOK_LINK(process_trust_pem_in)
+        APR_HOOK_LINK(complete_pkcs11_in)
+        APR_HOOK_LINK(process_pkcs11_in)
+        APR_HOOK_LINK(complete_pkcs11_module_in)
+        APR_HOOK_LINK(process_pkcs11_module_in)
+        APR_HOOK_LINK(process_pkcs12_in)
+        APR_HOOK_LINK(complete_keychain_in)
+        APR_HOOK_LINK(process_keychain_in)
+        APR_HOOK_LINK(complete_filter)
+        APR_HOOK_LINK(process_filter)
+        APR_HOOK_LINK(complete_nss_out)
+        APR_HOOK_LINK(process_nss_out)
+        APR_HOOK_LINK(complete_nss_token_out)
+        APR_HOOK_LINK(complete_der_out)
+        APR_HOOK_LINK(process_der_out)
+        APR_HOOK_LINK(complete_pem_out)
+        APR_HOOK_LINK(process_pem_out)
+        APR_HOOK_LINK(complete_pkcs12_out)
+        APR_HOOK_LINK(process_pkcs12_out)
+        APR_HOOK_LINK(complete_pkcs11_out)
+        APR_HOOK_LINK(process_pkcs11_out)
+        APR_HOOK_LINK(complete_pkcs11_module_out)
+        APR_HOOK_LINK(process_pkcs11_module_out)
+        APR_HOOK_LINK(process_metadata_out)
+        APR_HOOK_LINK(process_calendar_out)
+        APR_HOOK_LINK(process_reminder_out)
+        APR_HOOK_LINK(process_ssh_public_out)
+        APR_HOOK_LINK(complete_format_out)
+        APR_HOOK_LINK(process_jwks_out)
+        APR_HOOK_LINK(set_format_out)
+        APR_HOOK_LINK(complete_order_out)
+        APR_HOOK_LINK(set_order_out)
+        APR_HOOK_LINK(set_calendar_alarm)
+        APR_HOOK_LINK(search_chain)
+        APR_HOOK_LINK(search_key)
+        APR_HOOK_LINK(compare_certificate)
+        APR_HOOK_LINK(normalise_key)
+        APR_HOOK_LINK(normalise_certificate)
+        APR_HOOK_LINK(add_dns_metadata)
+        APR_HOOK_LINK(process_dns)
+        APR_HOOK_LINK(filter_poll)
 );
 
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, initialise,
-        (redwax_tool_t * r), (r), OK, DECLINED);
+        (redwax_tool_t * r), (r), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_dns_server,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_dns_trust_anchor,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_verify_param,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, complete_verify_param,
-        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED);
+        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_verify_date,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_verify_expiry,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, complete_verify_expiry,
-        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED);
+        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_verify_dane,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, complete_verify_dane,
-        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED);
+        (redwax_tool_t * r, apr_hash_t *params), (r, params), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_purpose,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, complete_purpose,
-        (redwax_tool_t * r, apr_hash_t *purposes), (r, purposes), OK, DECLINED);
+        (redwax_tool_t * r, apr_hash_t *purposes), (r, purposes), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_tlsa,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_tlsa,
-        (redwax_tool_t * r, redwax_dns_t *dns), (r, dns), DECLINED);
+        (redwax_tool_t * r, redwax_dns_t *dns), (r, dns), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, set_smimea,
-        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_smimea,
-        (redwax_tool_t * r, redwax_dns_t *dns), (r, dns), DECLINED);
+        (redwax_tool_t * r, redwax_dns_t *dns), (r, dns), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pem_in,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_trust_pem_in,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs11_in,
-        (redwax_tool_t * r, const char *arg, apr_hash_t *secrets), (r, arg, secrets), DECLINED);
+        (redwax_tool_t * r, const char *arg, apr_hash_t *secrets), (r, arg, secrets), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_pkcs11_in,
-        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED);
+        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs11_module_in,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_pkcs11_module_in,
-        (redwax_tool_t * r, const char *mod, redwax_token_quoted_e quoted), (r, mod, quoted), DECLINED);
+        (redwax_tool_t * r, const char *mod, redwax_token_quoted_e quoted), (r, mod, quoted), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs12_in,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_keychain_in,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_keychain_in,
-        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED);
+        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, int, complete_filter,
-        (redwax_tool_t * r, apr_hash_t *filters), (r, filters), OK, DECLINED);
+        (redwax_tool_t * r, apr_hash_t *filters), (r, filters), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_filter,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_nss_out,
         (redwax_tool_t * r, const char *path, const char *token, apr_hash_t *secrets),
-                (r, path, token, secrets), DECLINED);
+                (r, path, token, secrets), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_nss_token_out,
-        (redwax_tool_t * r, apr_hash_t *tokens), (r, tokens), DECLINED);
+        (redwax_tool_t * r, apr_hash_t *tokens), (r, tokens), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_der_out,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pem_out,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs12_out,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs11_out,
-        (redwax_tool_t * r, const char *arg, apr_hash_t *secrets), (r, arg, secrets), DECLINED);
+        (redwax_tool_t * r, const char *arg, apr_hash_t *secrets), (r, arg, secrets), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_pkcs11_out,
-        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED);
+        (redwax_tool_t * r, const char *url, apr_hash_t *urls), (r, url, urls), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_pkcs11_module_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_pkcs11_module_out,
-        (redwax_tool_t * r, const char *mod, redwax_token_quoted_e quoted), (r, mod, quoted), DECLINED);
+        (redwax_tool_t * r, const char *mod, redwax_token_quoted_e quoted), (r, mod, quoted), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_metadata_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_calendar_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_reminder_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_ssh_public_out,
-        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED);
+        (redwax_tool_t * r, const char *arg, const char *secret), (r, arg, secret), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, set_format_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_format_out,
-        (redwax_tool_t * r, apr_hash_t *formats), (r, formats), DECLINED);
+        (redwax_tool_t * r, apr_hash_t *formats), (r, formats), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, set_order_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, complete_order_out,
-        (redwax_tool_t * r, apr_hash_t *orders), (r, orders), DECLINED);
+        (redwax_tool_t * r, apr_hash_t *orders), (r, orders), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, set_calendar_alarm,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_jwks_out,
-        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED);
+        (redwax_tool_t * r, const char *arg), (r, arg), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, apr_status_t, search_chain,
         (redwax_tool_t * r, const redwax_certificate_t *cert,
-                const redwax_certificate_t **current), (r, cert, current), DECLINED);
+                const redwax_certificate_t **current), (r, cert, current), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, apr_status_t, search_key,
-        (redwax_tool_t * r, const redwax_certificate_t *cert), (r, cert), DECLINED);
+        (redwax_tool_t * r, const redwax_certificate_t *cert), (r, cert), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, apr_status_t, compare_certificate,
         (redwax_tool_t * r, const redwax_certificate_t *c1,
-                const redwax_certificate_t *c2), (r, c1, c2), DECLINED);
+                const redwax_certificate_t *c2), (r, c1, c2), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, apr_status_t, normalise_key,
-        (redwax_tool_t * r, redwax_key_t *key, int index), (r, key, index), DECLINED);
+        (redwax_tool_t * r, redwax_key_t *key, int index), (r, key, index), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, apr_status_t, normalise_certificate,
-        (redwax_tool_t * r, redwax_certificate_t *cert, int index), (r, cert, index), DECLINED);
+        (redwax_tool_t * r, redwax_certificate_t *cert, int index), (r, cert, index), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, apr_status_t, add_dns_metadata,
-        (redwax_tool_t *r, redwax_metadata_t *m, const redwax_certificate_t *cert), (r, m, cert), OK, DECLINED);
+        (redwax_tool_t *r, redwax_metadata_t *m, const redwax_certificate_t *cert), (r, m, cert), OK, DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(rt, REDWAX, int, process_dns,
-        (redwax_tool_t * r, redwax_dns_t *dns, redwax_rdata_t *rdata), (r, dns, rdata), DECLINED);
+        (redwax_tool_t * r, redwax_dns_t *dns, redwax_rdata_t *rdata), (r, dns, rdata), DECLINED)
 APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(rt, REDWAX, apr_status_t, filter_poll,
-        (redwax_tool_t *r), (r), OK, DECLINED);
+        (redwax_tool_t *r), (r), OK, DECLINED)
 
 #define REDWAX_TOOL_COMPLINE "COMP_LINE"
 #define REDWAX_TOOL_COMMANDLINE "COMMAND_LINE"

Modified: redwax-tool/trunk/redwax-tool.h
==============================================================================
--- redwax-tool/trunk/redwax-tool.h	(original)
+++ redwax-tool/trunk/redwax-tool.h	Mon Feb 17 18:19:46 2025
@@ -513,7 +513,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, initialise,
-        (redwax_tool_t *r));
+        (redwax_tool_t *r))
 
 /**
  * Hook to process incoming certificates / intermediates / keys.
@@ -521,7 +521,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pem_in,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to process incoming trusted certificates.
@@ -529,7 +529,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_trust_pem_in,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to complete PKCS11 URL in.
@@ -537,7 +537,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_pkcs11_in,
-        (redwax_tool_t *r, const char *url, apr_hash_t *urls));
+        (redwax_tool_t *r, const char *url, apr_hash_t *urls))
 
 /**
  * Hook to write incoming PKCS11 URL.
@@ -545,7 +545,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs11_in,
-        (redwax_tool_t *r, const char *arg, apr_hash_t *secrets));
+        (redwax_tool_t *r, const char *arg, apr_hash_t *secrets))
 
 /**
  * Hook to complete the module for the incoming PKCS11 URL.
@@ -553,7 +553,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_pkcs11_module_in,
-        (redwax_tool_t *r, const char *mod, redwax_token_quoted_e quoted));
+        (redwax_tool_t *r, const char *mod, redwax_token_quoted_e quoted))
 
 /**
  * Hook to specify the module for the incoming PKCS11 URL.
@@ -561,7 +561,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs11_module_in,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete keychain in.
@@ -569,7 +569,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_keychain_in,
-        (redwax_tool_t *r, const char *url, apr_hash_t *urls));
+        (redwax_tool_t *r, const char *url, apr_hash_t *urls))
 
 /**
  * Hook to write incoming keychain entries.
@@ -577,7 +577,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_keychain_in,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete incoming certificates / intermediates / keys
@@ -587,7 +587,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_filter,
-        (redwax_tool_t *r, apr_hash_t *filters));
+        (redwax_tool_t *r, apr_hash_t *filters))
 
 /**
  * Hook to process incoming certificates / intermediates / keys
@@ -597,7 +597,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_filter,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to write outgoing NSS database.
@@ -606,7 +606,7 @@
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_nss_out,
         (redwax_tool_t *r, const char *path, const char *token,
-                apr_hash_t *secrets));
+                apr_hash_t *secrets))
 
 /**
  * Hook to complete outgoing NSS token.
@@ -614,7 +614,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_nss_token_out,
-        (redwax_tool_t *r, apr_hash_t *tokens));
+        (redwax_tool_t *r, apr_hash_t *tokens))
 
 /**
  * Hook to write outgoing certificates / intermediates / keys.
@@ -622,7 +622,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_der_out,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to write outgoing certificates / intermediates / keys.
@@ -630,7 +630,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pem_out,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to write outgoing pkcs12 file.
@@ -638,7 +638,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs12_out,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to complete PKCS11 URL out.
@@ -646,7 +646,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_pkcs11_out,
-        (redwax_tool_t *r, const char *url, apr_hash_t *urls));
+        (redwax_tool_t *r, const char *url, apr_hash_t *urls))
 
 /**
  * Hook to write outgoing PKCS11 URL.
@@ -654,7 +654,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs11_out,
-        (redwax_tool_t *r, const char *arg, apr_hash_t *secrets));
+        (redwax_tool_t *r, const char *arg, apr_hash_t *secrets))
 
 /**
  * Hook to complete the module for the PKCS11 URL.
@@ -662,7 +662,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_pkcs11_module_out,
-        (redwax_tool_t *r, const char *mod, redwax_token_quoted_e quoted));
+        (redwax_tool_t *r, const char *mod, redwax_token_quoted_e quoted))
 
 /**
  * Hook to specify the module for the outgoing PKCS11 URL.
@@ -670,7 +670,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs11_module_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to write outgoing PKCS12 file.
@@ -678,7 +678,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_pkcs12_in,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to handle the output of metadata.
@@ -686,7 +686,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_metadata_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to handle the output of calendar data.
@@ -694,7 +694,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_calendar_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to handle the output of calendar (reminder) data.
@@ -702,7 +702,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_reminder_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to write SSH public keys.
@@ -710,7 +710,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_ssh_public_out,
-        (redwax_tool_t *r, const char *arg, const char *secret));
+        (redwax_tool_t *r, const char *arg, const char *secret))
 
 /**
  * Hook to complete the metadata format.
@@ -718,7 +718,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_format_out,
-        (redwax_tool_t *r, apr_hash_t *formats));
+        (redwax_tool_t *r, apr_hash_t *formats))
 
 /**
  * Hook to set the metadata format.
@@ -726,7 +726,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_format_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete the output order.
@@ -734,7 +734,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_order_out,
-        (redwax_tool_t *r, apr_hash_t *orders));
+        (redwax_tool_t *r, apr_hash_t *orders))
 
 /**
  * Hook to set the output order.
@@ -742,7 +742,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_order_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the calendar alarm.
@@ -750,7 +750,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_calendar_alarm,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to handle the output of JWK sets.
@@ -758,7 +758,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_jwks_out,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete verification parameters.
@@ -766,7 +766,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_verify_param,
-        (redwax_tool_t *r, apr_hash_t *params));
+        (redwax_tool_t *r, apr_hash_t *params))
 
 /**
  * Hook to set the verification parameters.
@@ -774,7 +774,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_verify_param,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the verification date.
@@ -782,7 +782,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_verify_date,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete the verification expiry.
@@ -790,7 +790,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_verify_expiry,
-        (redwax_tool_t *r, apr_hash_t *purposes));
+        (redwax_tool_t *r, apr_hash_t *purposes))
 
 /**
  * Hook to set the verification expiry.
@@ -798,7 +798,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_verify_expiry,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete verification dane.
@@ -806,7 +806,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_verify_dane,
-        (redwax_tool_t *r, apr_hash_t *purposes));
+        (redwax_tool_t *r, apr_hash_t *purposes))
 
 /**
  * Hook to set the verification dane policy.
@@ -814,7 +814,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_verify_dane,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to complete purposes.
@@ -822,7 +822,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, complete_purpose,
-        (redwax_tool_t *r, apr_hash_t *purposes));
+        (redwax_tool_t *r, apr_hash_t *purposes))
 
 /**
  * Hook to set the purposes.
@@ -830,7 +830,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_purpose,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the tlsa.
@@ -838,7 +838,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_tlsa,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the smimea.
@@ -846,7 +846,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_smimea,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the DNS server address.
@@ -854,7 +854,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_dns_server,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to set the DNS trust anchor.
@@ -862,7 +862,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, set_dns_trust_anchor,
-        (redwax_tool_t *r, const char *arg));
+        (redwax_tool_t *r, const char *arg))
 
 /**
  * Hook to search for intermediate and root certificates.
@@ -871,7 +871,7 @@
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, search_chain,
         (redwax_tool_t *r, const redwax_certificate_t *cert,
-                const redwax_certificate_t **current));
+                const redwax_certificate_t **current))
 
 /**
  * Hook to search for the key corresponding to a certificate.
@@ -879,7 +879,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, search_key,
-        (redwax_tool_t *r, const redwax_certificate_t *cert));
+        (redwax_tool_t *r, const redwax_certificate_t *cert))
 
 /**
  * Hook to compare two certificates.
@@ -898,7 +898,7 @@
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, int, compare_certificate,
         (redwax_tool_t *r, const redwax_certificate_t *c1,
-                const redwax_certificate_t *c2));
+                const redwax_certificate_t *c2))
 
 /**
  * Hook to normalise a key.
@@ -906,7 +906,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, normalise_key,
-        (redwax_tool_t *r, redwax_key_t *key, int index));
+        (redwax_tool_t *r, redwax_key_t *key, int index))
 
 /**
  * Hook to normalise a certificate.
@@ -914,7 +914,7 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, normalise_certificate,
-        (redwax_tool_t *r, redwax_certificate_t *cert, int index));
+        (redwax_tool_t *r, redwax_certificate_t *cert, int index))
 
 /**
  * Hook to add DNS entries to metadata.
@@ -924,7 +924,7 @@
  * @param cert The certificate.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, add_dns_metadata,
-        (redwax_tool_t *r, redwax_metadata_t *m, const redwax_certificate_t *cert));
+        (redwax_tool_t *r, redwax_metadata_t *m, const redwax_certificate_t *cert))
 
 /**
  * Hook to process DNS results.
@@ -934,7 +934,7 @@
  * @param rdata The dns record.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_dns,
-        (redwax_tool_t *r, redwax_dns_t *dns, redwax_rdata_t *rdata));
+        (redwax_tool_t *r, redwax_dns_t *dns, redwax_rdata_t *rdata))
 
 /**
  * Hook to process TLSA results.
@@ -943,7 +943,7 @@
  * @param dns The dns result.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_tlsa,
-        (redwax_tool_t *r, redwax_dns_t *dns));
+        (redwax_tool_t *r, redwax_dns_t *dns))
 
 /**
  * Hook to process SMIMEA results.
@@ -952,7 +952,7 @@
  * @param dns The dns result.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, process_smimea,
-        (redwax_tool_t *r, redwax_dns_t *dns));
+        (redwax_tool_t *r, redwax_dns_t *dns))
 
 /**
  * Hook to run the pre-filter poll.
@@ -962,6 +962,6 @@
  * @param r The redwax-tool context.
  */
 APR_DECLARE_EXTERNAL_HOOK(rt, REDWAX, apr_status_t, filter_poll,
-        (redwax_tool_t *r));
+        (redwax_tool_t *r))
 
 #endif



More information about the rt-commit mailing list