summaryrefslogtreecommitdiffstats
path: root/src/shared/pkcs11-util.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-05-21 14:10:26 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-06-12 15:21:15 +0200
commit5c672e90a659033815b104b2da128037b26a31ef (patch)
treeb3fdf5013bd5753077deada35eb76f762077081c /src/shared/pkcs11-util.h
parentrepart: Use CRYPT_ACTIVATE_PRIVATE (diff)
downloadsystemd-5c672e90a659033815b104b2da128037b26a31ef.tar.xz
systemd-5c672e90a659033815b104b2da128037b26a31ef.zip
basic/dlfcn-util: deobfuscate macro definitions
When looking at how dlopen for various libs is implemented, I found that the macros hide too much. I find it much easier to see what is going on if 'extern' and '= NULL' are written explicitly. After all, we don't hide those for other definitions, e.g. our style guide says that static variables should be initialized with '= NULL'. With that change, it's much more obvious what is a variable declaration and what is a variable initialization.
Diffstat (limited to 'src/shared/pkcs11-util.h')
-rw-r--r--src/shared/pkcs11-util.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/shared/pkcs11-util.h b/src/shared/pkcs11-util.h
index 23ab823c40..30b9ac6864 100644
--- a/src/shared/pkcs11-util.h
+++ b/src/shared/pkcs11-util.h
@@ -20,22 +20,22 @@
bool pkcs11_uri_valid(const char *uri);
#if HAVE_P11KIT
-DLSYM_PROTOTYPE(p11_kit_module_get_name);
-DLSYM_PROTOTYPE(p11_kit_modules_finalize_and_release);
-DLSYM_PROTOTYPE(p11_kit_modules_load_and_initialize);
-DLSYM_PROTOTYPE(p11_kit_strerror);
-DLSYM_PROTOTYPE(p11_kit_uri_format);
-DLSYM_PROTOTYPE(p11_kit_uri_free);
-DLSYM_PROTOTYPE(p11_kit_uri_get_attributes);
-DLSYM_PROTOTYPE(p11_kit_uri_get_attribute);
-DLSYM_PROTOTYPE(p11_kit_uri_set_attribute);
-DLSYM_PROTOTYPE(p11_kit_uri_get_module_info);
-DLSYM_PROTOTYPE(p11_kit_uri_get_slot_info);
-DLSYM_PROTOTYPE(p11_kit_uri_get_token_info);
-DLSYM_PROTOTYPE(p11_kit_uri_match_token_info);
-DLSYM_PROTOTYPE(p11_kit_uri_message);
-DLSYM_PROTOTYPE(p11_kit_uri_new);
-DLSYM_PROTOTYPE(p11_kit_uri_parse);
+extern DLSYM_PROTOTYPE(p11_kit_module_get_name);
+extern DLSYM_PROTOTYPE(p11_kit_modules_finalize_and_release);
+extern DLSYM_PROTOTYPE(p11_kit_modules_load_and_initialize);
+extern DLSYM_PROTOTYPE(p11_kit_strerror);
+extern DLSYM_PROTOTYPE(p11_kit_uri_format);
+extern DLSYM_PROTOTYPE(p11_kit_uri_free);
+extern DLSYM_PROTOTYPE(p11_kit_uri_get_attributes);
+extern DLSYM_PROTOTYPE(p11_kit_uri_get_attribute);
+extern DLSYM_PROTOTYPE(p11_kit_uri_set_attribute);
+extern DLSYM_PROTOTYPE(p11_kit_uri_get_module_info);
+extern DLSYM_PROTOTYPE(p11_kit_uri_get_slot_info);
+extern DLSYM_PROTOTYPE(p11_kit_uri_get_token_info);
+extern DLSYM_PROTOTYPE(p11_kit_uri_match_token_info);
+extern DLSYM_PROTOTYPE(p11_kit_uri_message);
+extern DLSYM_PROTOTYPE(p11_kit_uri_new);
+extern DLSYM_PROTOTYPE(p11_kit_uri_parse);
int uri_from_string(const char *p, P11KitUri **ret);