diff options
Diffstat (limited to '')
| -rw-r--r-- | include/iobuf.h | 1 | ||||
| -rw-r--r-- | include/util.h | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/include/iobuf.h b/include/iobuf.h index 348b9b32c..bc2f0a156 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -124,6 +124,7 @@ int iobuf_write_temp( IOBUF a, IOBUF temp ); size_t iobuf_temp_to_buffer( IOBUF a, byte *buffer, size_t buflen ); void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp ); +int iobuf_get_fd (IOBUF a); off_t iobuf_get_filelength( IOBUF a ); #define IOBUF_FILELENGTH_LIMIT 0xffffffff const char *iobuf_get_real_fname( IOBUF a ); diff --git a/include/util.h b/include/util.h index e8d79e8c2..458d13257 100644 --- a/include/util.h +++ b/include/util.h @@ -85,14 +85,6 @@ void g10_log_hexdump( const char *text, const char *buf, size_t len ); void g10_log_info( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); void g10_log_warning( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); void g10_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2))); - void g10_log_fatal_f( const char *fname, const char *fmt, ... ) - __attribute__ ((noreturn, format (printf,2,3))); - void g10_log_error_f( const char *fname, const char *fmt, ... ) - __attribute__ ((format (printf,2,3))); - void g10_log_info_f( const char *fname, const char *fmt, ... ) - __attribute__ ((format (printf,2,3))); - void g10_log_debug_f( const char *fname, const char *fmt, ... ) - __attribute__ ((format (printf,2,3))); #ifndef __riscos__ #define BUG() g10_log_bug0( __FILE__ , __LINE__, __FUNCTION__ ) #else @@ -106,10 +98,6 @@ void g10_log_hexdump( const char *text, const char *buf, size_t len ); void g10_log_info( const char *fmt, ... ); void g10_log_warning( const char *fmt, ... ); void g10_log_debug( const char *fmt, ... ); - void g10_log_fatal_f( const char *fname, const char *fmt, ... ); - void g10_log_error_f( const char *fname, const char *fmt, ... ); - void g10_log_info_f( const char *fname, const char *fmt, ... ); - void g10_log_debug_f( const char *fname, const char *fmt, ... ); #define BUG() g10_log_bug0( __FILE__ , __LINE__ ) #endif @@ -121,10 +109,6 @@ void g10_log_hexdump( const char *text, const char *buf, size_t len ); #define log_info g10_log_info #define log_warning g10_log_warning #define log_debug g10_log_debug -#define log_fatal_f g10_log_fatal_f -#define log_error_f g10_log_error_f -#define log_info_f g10_log_info_f -#define log_debug_f g10_log_debug_f /*-- errors.c --*/ |