From ca8557c0d7d11e6268d260ea2336e5449d70e474 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 7 Sep 2018 12:04:49 +0900 Subject: secmem: Exposed function should have consistent name. * src/gpg-error.def.in, src/gpg-error.h.in, src/gpg-error.vers: Rename to gpgrt_secmem_is_secure (was: gpgrt_private_is_secure). * src/gpgrt-int.h, src/secmem.c: Reneme for _gpgrt_private_is_secure. * src/visibility.c, src/visibility.h: Follow the rename. --- src/gpg-error.def.in | 2 +- src/gpg-error.h.in | 2 +- src/gpg-error.vers | 2 +- src/gpgrt-int.h | 2 +- src/secmem.c | 2 +- src/visibility.c | 4 ++-- src/visibility.h | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in index f4f3668..6aa3867 100644 --- a/src/gpg-error.def.in +++ b/src/gpg-error.def.in @@ -227,6 +227,6 @@ EXPORTS gpgrt_secmem_set_auto_expand @175 gpgrt_secmem_set_flags @176 gpgrt_secmem_get_flags @177 - gpgrt_private_is_secure @178 + gpgrt_secmem_is_secure @178 ;; end of file with public symbols for Windows. diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in index 46d4ea7..feceb95 100644 --- a/src/gpg-error.h.in +++ b/src/gpg-error.h.in @@ -1291,7 +1291,7 @@ void gpgrt_secmem_dump_stats (int extended); void gpgrt_secmem_set_auto_expand (unsigned int chunksize); void gpgrt_secmem_set_flags (unsigned flags); unsigned gpgrt_secmem_get_flags (void); -int gpgrt_private_is_secure (const void *p); +int gpgrt_secmem_is_secure (const void *p); #ifdef __cplusplus diff --git a/src/gpg-error.vers b/src/gpg-error.vers index 4e58300..fdb1d1b 100644 --- a/src/gpg-error.vers +++ b/src/gpg-error.vers @@ -199,7 +199,7 @@ GPG_ERROR_1.0 { gpgrt_secmem_set_auto_expand; gpgrt_secmem_set_flags; gpgrt_secmem_get_flags; - gpgrt_private_is_secure; + gpgrt_secmem_is_secure; local: *; diff --git a/src/gpgrt-int.h b/src/gpgrt-int.h index 2cc3a4c..fec9c49 100644 --- a/src/gpgrt-int.h +++ b/src/gpgrt-int.h @@ -754,7 +754,7 @@ void _gpgrt_secmem_dump_stats (int extended); void _gpgrt_secmem_set_auto_expand (unsigned int chunksize); void _gpgrt_secmem_set_flags (unsigned flags); unsigned _gpgrt_secmem_get_flags (void); -int _gpgrt_private_is_secure (const void *p); +int _gpgrt_secmem_is_secure (const void *p); /* * Internal platform abstraction functions (sysutils.c) diff --git a/src/secmem.c b/src/secmem.c index 7645093..108705f 100644 --- a/src/secmem.c +++ b/src/secmem.c @@ -793,7 +793,7 @@ _gpgrt_secmem_realloc (void *p, size_t newsize, int xhint) /* Return true if P points into the secure memory areas. */ int -_gpgrt_private_is_secure (const void *p) +_gpgrt_secmem_is_secure (const void *p) { pooldesc_t *pool; diff --git a/src/visibility.c b/src/visibility.c index e11dc98..8d396ea 100644 --- a/src/visibility.c +++ b/src/visibility.c @@ -1177,9 +1177,9 @@ gpgrt_secmem_get_flags (void) } int -gpgrt_private_is_secure (const void *p) +gpgrt_secmem_is_secure (const void *p) { - return _gpgrt_private_is_secure (p); + return _gpgrt_secmem_is_secure (p); } /* For consistency reasons we use function wrappers also for Windows diff --git a/src/visibility.h b/src/visibility.h index 47ade34..afbf9ad 100644 --- a/src/visibility.h +++ b/src/visibility.h @@ -218,7 +218,7 @@ MARK_VISIBLE (gpgrt_secmem_dump_stats); MARK_VISIBLE (gpgrt_secmem_set_auto_expand); MARK_VISIBLE (gpgrt_secmem_set_flags); MARK_VISIBLE (gpgrt_secmem_get_flags); -MARK_VISIBLE (gpgrt_private_is_secure); +MARK_VISIBLE (gpgrt_secmem_is_secure); #undef MARK_VISIBLE @@ -399,7 +399,7 @@ MARK_VISIBLE (gpgrt_private_is_secure); #define gpgrt_secmem_set_auto_expand _gpgrt_USE_UNDERSCORED_FUNCTION #define gpgrt_secmem_set_flags _gpgrt_USE_UNDERSCORED_FUNCTION #define gpgrt_secmem_get_flags _gpgrt_USE_UNDERSCORED_FUNCTION -#define gpgrt_private_is_secure _gpgrt_USE_UNDERSCORED_FUNCTION +#define gpgrt_secmem_is_secure _gpgrt_USE_UNDERSCORED_FUNCTION /* Windows specific functions. */ #define gpgrt_w32_reg_query_string _gpgrt_USE_UNDERSCORED_FUNCTION -- cgit v1.2.1