diff options
| author | Moritz Schulte <mo@g10code.com> | 2003-06-15 01:46:11 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2003-06-15 01:46:11 +0000 |
| commit | 679849bb29e13e01503440dc2c189c2301efdbaf (patch) | |
| tree | 563aaa80affc9952e7e3cff8c04efd06232c0c31 | |
| parent | efebdc7da80139ee851d903447a67abb201dd367 (diff) | |
| download | libgcrypt-679849bb29e13e01503440dc2c189c2301efdbaf.tar.gz | |
2003-06-15 Moritz Schulte <moritz@g10code.com>
* global.c (gcry_control): Fixed typo.
* misc.c (_gcry_fatal_error): Use gpg_strerror instead of
gcry_strerror.
* types.h (STRLIST): Removed type since it is not used.
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/global.c | 1 | ||||
| -rw-r--r-- | src/misc.c | 19 | ||||
| -rw-r--r-- | src/types.h | 7 |
4 files changed, 19 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index aee2f8a8..3df01d2d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2003-06-15 Moritz Schulte <moritz@g10code.com> + + * global.c (gcry_control): Fixed typo. + + * misc.c (_gcry_fatal_error): Use gpg_strerror instead of + gcry_strerror. + + * types.h (STRLIST): Removed type since it is not used. + 2003-06-11 Moritz Schulte <moritz@g10code.com> * global.c (global_init): Call: _gcry_cipher_init, _gcry_md_init, diff --git a/src/global.c b/src/global.c index 814c631d..f55c5dbc 100644 --- a/src/global.c +++ b/src/global.c @@ -158,6 +158,7 @@ gcry_control (enum gcry_ctl_cmds cmd, ...) va_start (arg_ptr, cmd); switch (cmd) { +#if 0 case GCRYCTL_NO_MEM_IS_FATAL: break; case GCRYCTL_SET_FATAL_FNC: @@ -71,21 +71,20 @@ write2stderr( const char *s ) * set his own handler becuase this function simply calls abort(). */ void -_gcry_fatal_error(int rc, const char *text ) +_gcry_fatal_error (int rc, const char *text) { - if( !text ) /* get a default text */ - text = gcry_strerror(rc); + if (! text) /* get a default text */ + text = gpg_strerror (rc); - if( fatal_error_handler ) - fatal_error_handler( fatal_error_handler_value, rc, text ); + if (fatal_error_handler) + fatal_error_handler (fatal_error_handler_value, rc, text); - write2stderr("\nFatal error: "); - write2stderr(text); - write2stderr("\n"); - abort(); + write2stderr("\nFatal error: "); + write2stderr(text); + write2stderr("\n"); + abort (); } - void gcry_set_log_handler( void (*logf)(void*,int, const char*, va_list ), void *opaque ) diff --git a/src/types.h b/src/types.h index ff052f94..c3a9d938 100644 --- a/src/types.h +++ b/src/types.h @@ -121,11 +121,4 @@ typedef union { double g; } PROPERLY_ALIGNED_TYPE; -typedef struct string_list { - struct string_list *next; - unsigned int flags; - char d[1]; -} *STRLIST; - - #endif /*GCRYPT_TYPES_H*/ |