diff options
| author | Werner Koch <wk@gnupg.org> | 1998-10-16 18:00:17 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-10-16 18:00:17 +0200 |
| commit | e81e0970f7ab6c815f3396168d47fc6ab57fdf30 (patch) | |
| tree | 175aa8c360560b30cf500a91eb72b34e16bdedc4 /include | |
| parent | backup (diff) | |
| download | gnupg2-e81e0970f7ab6c815f3396168d47fc6ab57fdf30.tar.xz gnupg2-e81e0970f7ab6c815f3396168d47fc6ab57fdf30.zip | |
last local commit
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/cipher.h | 2 | ||||
| -rw-r--r-- | include/iobuf.h | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 627449c34..9274ee962 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 13 12:40:48 1998 Werner Koch (wk@isil.d.shuttle.de) + + * iobuf.h (iobuf_get): Now uses .nofast + (iobuf_get2): Removed. + Mon Sep 14 09:17:22 1998 Werner Koch (wk@(none)) * util.h (HAVE_ATEXIT): New. diff --git a/include/cipher.h b/include/cipher.h index dce7262c6..38050efa5 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -97,7 +97,7 @@ int g10c_debug_mode; int g10_opt_verbose; /*-- dynload.c --*/ -void register_cipher_extension( const char *fname ); +void register_cipher_extension( const char *mainpgm, const char *fname ); /*-- md.c --*/ int string_to_digest_algo( const char *string ); diff --git a/include/iobuf.h b/include/iobuf.h index c84254d73..f09d701fb 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -41,6 +41,8 @@ struct iobuf_struct { unsigned long nlimit; unsigned long nbytes; /* used together with nlimit */ unsigned long ntotal; /* total bytes read (position of stream) */ + int nofast; /* used by the iobuf_get() */ + void *directfp; struct { size_t size; /* allocated size */ size_t start; /* number of invalid bytes at the begin of the buffer */ @@ -70,6 +72,7 @@ int iobuf_debug_mode; IOBUF iobuf_alloc(int usage, size_t bufsize); IOBUF iobuf_temp(void); IOBUF iobuf_open( const char *fname ); +IOBUF iobuf_fopen( const char *fname, const char *mode ); IOBUF iobuf_create( const char *fname ); IOBUF iobuf_append( const char *fname ); IOBUF iobuf_openrw( const char *fname ); @@ -114,15 +117,10 @@ int iobuf_in_block_mode( IOBUF a ); * returned value to be in the range 0 ..255. */ #define iobuf_get(a) \ - ( ((a)->nlimit || (a)->d.start >= (a)->d.len )? \ + ( ((a)->nofast || (a)->d.start >= (a)->d.len )? \ iobuf_readbyte((a)) : ( (a)->nbytes++, (a)->d.buf[(a)->d.start++] ) ) #define iobuf_get_noeof(a) (iobuf_get((a))&0xff) -/* use this if you have ungetted stuff */ -#define iobuf_get2(a) \ - ( ( (a)->unget.buf || (a)->nlimit || (a)->d.start >= (a)->d.len )? \ - iobuf_readbyte((a)) : ( (a)->nbytes++, (a)->d.buf[(a)->d.start++] ) ) - /* write a byte to the iobuf and return true on write error * This macro does only write the low order byte */ |