diff options
| author | Werner Koch <wk@gnupg.org> | 2017-06-21 09:29:09 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-06-21 09:39:21 +0200 |
| commit | 27148e60ba15b0cb73b47a75c688fcb48a1a3444 (patch) | |
| tree | 1b181fdee8ee1f7fc024b340951e8af9a8fc32f2 /src/g10lib.h | |
| parent | c2319464b03e61aaf34ef6d5f4b59b0c0483a373 (diff) | |
| download | libgcrypt-27148e60ba15b0cb73b47a75c688fcb48a1a3444.tar.gz | |
api: New function gcry_get_config.
* src/misc.c (_gcry_log_info_with_dummy_fp): Remove.
* src/global.c (print_config): New arg WHAT. Remove arg FNC and use
gpgrt_fprintf directly.
(_gcry_get_config): New.
(_gcry_vcontrol) <GCRYCTL_PRINT_CONFIG>: Use _gcry_get_config instead
of print_config.
* src/gcrypt.h.in (gcry_get_config): New.
* src/libgcrypt.def, src/libgcrypt.vers: Add new function.
* src/visibility.c (gcry_get_config): New.
* src/visibility.h: Mark new function.
* tests/version.c (test_get_config): New.
(main): Call new test.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/g10lib.h')
| -rw-r--r-- | src/g10lib.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/g10lib.h b/src/g10lib.h index ec8aab56..961b5154 100644 --- a/src/g10lib.h +++ b/src/g10lib.h @@ -109,6 +109,8 @@ void _gcry_pre_syscall (void); void _gcry_post_syscall (void); int _gcry_get_debug_flag (unsigned int mask); +char *_gcry_get_config (int mode, const char *what); + /* Malloc functions and common wrapper macros. */ void *_gcry_malloc (size_t n) _GCRY_GCC_ATTR_MALLOC; void *_gcry_calloc (size_t n, size_t m) _GCRY_GCC_ATTR_MALLOC; @@ -163,8 +165,6 @@ void _gcry_log_bug( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2); void _gcry_log_fatal( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2); void _gcry_log_error( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2); void _gcry_log_info( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2); -int _gcry_log_info_with_dummy_fp (FILE *fp, const char *fmt, ... ) - JNLIB_GCC_A_PRINTF(2,3); void _gcry_log_debug( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2); void _gcry_log_printf ( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2); void _gcry_log_printhex (const char *text, const void *buffer, size_t length); @@ -174,6 +174,7 @@ void _gcry_log_printsxp (const char *text, gcry_sexp_t sexp); void _gcry_set_log_verbosity( int level ); int _gcry_log_verbosity( int level ); + #ifdef JNLIB_GCC_M_FUNCTION #define BUG() _gcry_bug( __FILE__ , __LINE__, __FUNCTION__ ) #define gcry_assert(expr) (LIKELY(expr)? (void)0 \ |