From 3ea2ee8a768677cd8212650a81ee9cb97374b406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 13 Oct 2022 20:42:31 +0200 Subject: [PATCH] tod: Change namespace of internal functions to tod_* In this way we don't have the risk of them being exported because starting with `fpi_*`. --- examples/tod-inspector.c | 6 +++--- libfprint/fp-context.c | 6 +++--- libfprint/tod/tod-shared-loader.c | 6 +++--- libfprint/tod/tod-shared-loader.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/tod-inspector.c b/examples/tod-inspector.c index b121422b..4b64c044 100644 --- a/examples/tod-inspector.c +++ b/examples/tod-inspector.c @@ -113,9 +113,9 @@ main (void) g_autoptr(GArray) shared_drivers = NULL; guint i; - fpi_tod_shared_drivers_register (); + tod_shared_drivers_register (); - shared_drivers = fpi_tod_shared_drivers_get (); + shared_drivers = tod_shared_drivers_get (); g_print ("Found %u drivers\n", shared_drivers->len); for (i = 0; i < shared_drivers->len; i++) @@ -157,5 +157,5 @@ main (void) g_print ("------------\n"); } - fpi_tod_shared_drivers_unregister (); + tod_shared_drivers_unregister (); } diff --git a/libfprint/fp-context.c b/libfprint/fp-context.c index 9a4300e0..99b660ed 100644 --- a/libfprint/fp-context.c +++ b/libfprint/fp-context.c @@ -306,7 +306,7 @@ fp_context_finalize (GObject *object) g_object_run_dispose (G_OBJECT (priv->usb_ctx)); g_clear_object (&priv->usb_ctx); - fpi_tod_shared_drivers_unregister (); + tod_shared_drivers_unregister (); G_OBJECT_CLASS (fp_context_parent_class)->finalize (object); } @@ -371,8 +371,8 @@ fp_context_init (FpContext *self) priv->drivers = fpi_get_driver_types (); - fpi_tod_shared_drivers_register (); - shared_drivers = fpi_tod_shared_drivers_get (); + tod_shared_drivers_register (); + shared_drivers = tod_shared_drivers_get (); g_array_prepend_vals (priv->drivers, shared_drivers->data, shared_drivers->len); if (get_drivers_whitelist_env ()) diff --git a/libfprint/tod/tod-shared-loader.c b/libfprint/tod/tod-shared-loader.c index fc18b6df..72647552 100644 --- a/libfprint/tod/tod-shared-loader.c +++ b/libfprint/tod/tod-shared-loader.c @@ -49,7 +49,7 @@ get_tod_drivers_dir (void) } void -fpi_tod_shared_drivers_register (void) +tod_shared_drivers_register (void) { const char *dirname; const char *basename; @@ -143,7 +143,7 @@ fpi_tod_shared_drivers_register (void) } void -fpi_tod_shared_drivers_unregister (void) +tod_shared_drivers_unregister (void) { g_clear_pointer (&shared_drivers, g_array_unref); @@ -155,7 +155,7 @@ fpi_tod_shared_drivers_unregister (void) } GArray * -fpi_tod_shared_drivers_get (void) +tod_shared_drivers_get (void) { return g_array_ref (shared_drivers); } diff --git a/libfprint/tod/tod-shared-loader.h b/libfprint/tod/tod-shared-loader.h index 8ed2e811..cc3873d9 100644 --- a/libfprint/tod/tod-shared-loader.h +++ b/libfprint/tod/tod-shared-loader.h @@ -22,7 +22,7 @@ #include -void fpi_tod_shared_drivers_register (void); -void fpi_tod_shared_drivers_unregister (void); +void tod_shared_drivers_register (void); +void tod_shared_drivers_unregister (void); -GArray *fpi_tod_shared_drivers_get (void); +GArray *tod_shared_drivers_get (void);