diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 9 | ||||
| -rw-r--r-- | include/errors.h | 2 | ||||
| -rw-r--r-- | include/iobuf.h | 3 | ||||
| -rw-r--r-- | include/util.h | 3 |
4 files changed, 15 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 0df9e6836..b59c6393c 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,12 @@ +Mon Jul 6 10:41:55 1998 Werner Koch ([email protected]) + + * cipher.h (PUBKEY_USAGE_): New. + +Mon Jul 6 09:49:51 1998 Werner Koch ([email protected]) + + * iobuf.h (iobuf_set_error): New. + (iobuf_error): New. + Sat Jun 13 17:31:32 1998 Werner Koch ([email protected]) * g10lib.h: New as interface for the g10lib. diff --git a/include/errors.h b/include/errors.h index f2ec2073b..1633478c1 100644 --- a/include/errors.h +++ b/include/errors.h @@ -34,7 +34,7 @@ #define G10ERR_CIPHER_ALGO 12 /* Unknown cipher algorithm */ #define G10ERR_KEYRING_OPEN 13 #define G10ERR_INVALID_PACKET 14 -#define G10ERR_BAD_RING 15 +#define G10ERR_INVALID_ARMOR 15 #define G10ERR_NO_USER_ID 16 #define G10ERR_NO_SECKEY 17 /* secret key not available */ #define G10ERR_WRONG_SECKEY 18 /* wrong seckey used */ diff --git a/include/iobuf.h b/include/iobuf.h index 7fd4f7bd1..c84254d73 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -48,6 +48,7 @@ struct iobuf_struct { byte *buf; } d; int filter_eof; + int error; int (*filter)( void *opaque, int control, IOBUF chain, byte *buf, size_t *len); void *filter_ov; /* value for opaque */ @@ -81,6 +82,8 @@ int iobuf_pop_filter( IOBUF a, int (*f)(void *opaque, int control, IOBUF chain, byte *buf, size_t *len), void *ov ); int iobuf_flush(IOBUF a); void iobuf_clear_eof(IOBUF a); +#define iobuf_set_error(a) do { (a)->error = 1; } while(0) +#define iobuf_error(a) ((a)->error) void iobuf_set_limit( IOBUF a, unsigned long nlimit ); diff --git a/include/util.h b/include/util.h index 24fea1260..032f0adfb 100644 --- a/include/util.h +++ b/include/util.h @@ -126,7 +126,8 @@ int answer_is_yes( const char *s ); /*-- strgutil.c --*/ void free_strlist( STRLIST sl ); #define FREE_STRLIST(a) do { free_strlist((a)); (a) = NULL ; } while(0) -void add_to_strlist( STRLIST *list, const char *string ); +STRLIST add_to_strlist( STRLIST *list, const char *string ); +STRLIST append_to_strlist( STRLIST *list, const char *string ); STRLIST strlist_prev( STRLIST head, STRLIST node ); STRLIST strlist_last( STRLIST node ); int memicmp( const char *a, const char *b, size_t n ); |