diff options
Diffstat (limited to '')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/cipher.h | 2 | ||||
| -rw-r--r-- | include/http.h | 2 | ||||
| -rw-r--r-- | include/iobuf.h | 7 | ||||
| -rw-r--r-- | include/mpi.h | 4 | ||||
| -rw-r--r-- | include/types.h | 1 | ||||
| -rw-r--r-- | include/util.h | 2 |
7 files changed, 14 insertions, 8 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 7f7045738..c510d244c 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 16 14:10:02 CET 1999 Werner Koch <[email protected]> + + * types.h (STRLIST): Add field flags. + Wed Feb 10 17:15:39 CET 1999 Werner Koch <[email protected]> * cipher.h (CIPHER_ALGO_TWOFISH): Chnaged ID to 10 and renamed diff --git a/include/cipher.h b/include/cipher.h index 55a566264..8e7012fa3 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -144,7 +144,7 @@ void cipher_sync( CIPHER_HANDLE c ); int string_to_pubkey_algo( const char *string ); const char * pubkey_algo_to_string( int algo ); int check_pubkey_algo( int algo ); -int check_pubkey_algo2( int algo, unsigned usage ); +int check_pubkey_algo2( int algo, unsigned use ); int pubkey_get_npkey( int algo ); int pubkey_get_nskey( int algo ); int pubkey_get_nsig( int algo ); diff --git a/include/http.h b/include/http.h index d55213eb9..7e6d9d970 100644 --- a/include/http.h +++ b/include/http.h @@ -52,7 +52,7 @@ typedef enum { struct http_context { int initialized; unsigned int status_code; - int socket; + int sock; int in_data; IOBUF fp_read; IOBUF fp_write; diff --git a/include/iobuf.h b/include/iobuf.h index 92671005c..56607b723 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -36,8 +36,9 @@ typedef struct iobuf_struct *IOBUF; +/* fixme: we should hide most of this stuff */ struct iobuf_struct { - int usage; /* 1 input , 2 output, 3 temp */ + int use; /* 1 input , 2 output, 3 temp */ unsigned long nlimit; unsigned long nbytes; /* used together with nlimit */ unsigned long ntotal; /* total bytes read (position of stream) */ @@ -69,7 +70,7 @@ struct iobuf_struct { int iobuf_debug_mode; -IOBUF iobuf_alloc(int usage, size_t bufsize); +IOBUF iobuf_alloc(int use, size_t bufsize); IOBUF iobuf_temp(void); IOBUF iobuf_temp_with_content( const char *buffer, size_t length ); IOBUF iobuf_open( const char *fname ); @@ -136,6 +137,6 @@ int iobuf_in_block_mode( IOBUF a ); #define iobuf_get_temp_buffer(a) ( (a)->d.buf ) #define iobuf_get_temp_length(a) ( (a)->d.len ) -#define iobuf_is_temp(a) ( (a)->usage == 3 ) +#define iobuf_is_temp(a) ( (a)->use == 3 ) #endif /*G10_IOBUF_H*/ diff --git a/include/mpi.h b/include/mpi.h index 266b91554..ae32d1ba3 100644 --- a/include/mpi.h +++ b/include/mpi.h @@ -153,8 +153,8 @@ int mpi_cmp_ui( MPI u, ulong v ); int mpi_cmp( MPI u, MPI v ); /*-- mpi-scan.c --*/ -int mpi_getbyte( MPI a, unsigned index ); -void mpi_putbyte( MPI a, unsigned index, int value ); +int mpi_getbyte( MPI a, unsigned idx ); +void mpi_putbyte( MPI a, unsigned idx, int value ); unsigned mpi_trailing_zeros( MPI a ); /*-- mpi-bit.c --*/ diff --git a/include/types.h b/include/types.h index 4c5e57cc6..241e40529 100644 --- a/include/types.h +++ b/include/types.h @@ -102,6 +102,7 @@ typedef struct string_list { struct string_list *next; + unsigned int flags; char d[1]; } *STRLIST; diff --git a/include/util.h b/include/util.h index 6462ddeae..358cdc5f9 100644 --- a/include/util.h +++ b/include/util.h @@ -41,7 +41,7 @@ typedef struct { char *ret_str; } r; /* Return values */ struct { - int index; + int idx; int inarg; int stopped; const char *last; |