Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / bio / bio.h

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 1f870909a5ee25e77cddf69641051b25d5645279..0915c8885d57c09d6d4ce56d1e8740ab6eba8429 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -231,12 +231,8 @@ typedef struct bio_method_st
 typedef struct bio_st
        {
        BIO_METHOD *method;
-#ifndef NOPROTO
        /* bio, mode, argp, argi, argl, ret */
        long (*callback)(struct bio_st *,int,const char *,int, long,long);
-#else
-       long (*callback)();
-#endif
        char *cb_arg; /* first argument for the callback */
 
        int init;
@@ -445,7 +441,6 @@ int BIO_read_filename(BIO *b,const char *name);
 #define NO_FP_API
 #endif
 
-#ifndef NOPROTO
 
 /* These two aren't currently implemented */
 /* int BIO_get_ex_num(BIO *bio); */
@@ -470,33 +465,6 @@ BIO *BIO_new_fp(FILE *stream, int close_flag);
 #    define BIO_new_file_internal      BIO_new_file
 #    define BIO_new_fp_internal                BIO_s_file
 #  endif /* FP_API */
-#else
-
-/* These two aren't currently implemented */
-/*int BIO_get_ex_num();*/
-/*void BIO_set_ex_free_func();*/
-int BIO_set_ex_data();
-char *BIO_get_ex_data();
-int BIO_get_ex_new_index();
-
-#  if defined(WIN16) && defined(_WINDLL)
-BIO_METHOD *BIO_s_file_internal();
-BIO *BIO_new_file_internal();
-BIO *BIO_new_fp_internal();
-#    define BIO_s_file BIO_s_file_internal
-#    define BIO_new_file       BIO_new_file_internal
-#    define BIO_new_fp BIO_new_fp_internal
-#  else /* FP_API */
-BIO_METHOD *BIO_s_file();
-BIO *BIO_new_file();
-BIO *BIO_new_fp();
-#    define BIO_s_file_internal                BIO_s_file
-#    define BIO_new_file_internal      BIO_new_file
-#    define BIO_new_fp_internal                BIO_s_file
-#  endif /* FP_API */
-#endif
-
-#ifndef NOPROTO
 BIO *  BIO_new(BIO_METHOD *type);
 int    BIO_set(BIO *a,BIO_METHOD *type);
 int    BIO_free(BIO *a);
@@ -564,78 +532,8 @@ void BIO_copy_next_retry(BIO *b);
 
 long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
 
-#else
-
-BIO *  BIO_new();
-int    BIO_set();
-int    BIO_free();
-int    BIO_read();
-int    BIO_gets();
-int    BIO_write();
-int    BIO_puts();
-char * BIO_ptr_ctrl();
-long   BIO_ctrl();
-long   BIO_int_ctrl();
-BIO *  BIO_push();
-BIO *  BIO_pop();
-void   BIO_free_all();
-BIO *  BIO_find_type();
-BIO *  BIO_get_retry_BIO();
-int    BIO_get_retry_reason();
-BIO *  BIO_dup_chain();
-
-#ifndef WIN16
-long BIO_debug_callback();
-#else
-long _far _loadds BIO_debug_callback();
-#endif
-
-BIO_METHOD *BIO_s_mem();
-BIO_METHOD *BIO_s_socket();
-BIO_METHOD *BIO_s_connect();
-BIO_METHOD *BIO_s_accept();
-BIO_METHOD *BIO_s_fd();
-BIO_METHOD *BIO_s_log();
-BIO_METHOD *BIO_s_null();
-BIO_METHOD *BIO_f_null();
-BIO_METHOD *BIO_f_buffer();
-BIO_METHOD *BIO_f_nbio_test();
-/* BIO_METHOD *BIO_f_ber(); */
-
-int BIO_sock_should_retry();
-int BIO_sock_non_fatal_error();
-int BIO_fd_should_retry();
-int BIO_fd_non_fatal_error();
-int BIO_dump();
-
-struct hostent *BIO_gethostbyname();
-int BIO_sock_error();
-int BIO_socket_ioctl();
-int BIO_socket_nbio();
-int BIO_get_port();
-int BIO_get_host_ip();
-int BIO_get_accept_socket();
-int BIO_accept();
-int BIO_sock_init();
-void BIO_sock_cleanup();
-int BIO_set_tcp_ndelay();
-
-void ERR_load_BIO_strings();
-
-BIO *BIO_new_socket();
-BIO *BIO_new_fd();
-BIO *BIO_new_connect();
-BIO *BIO_new_accept();
-
-void BIO_copy_next_retry();
-
-long BIO_ghbn_ctrl();
-
-#endif
-
 /* Tim Hudson's portable varargs stuff */
 
-#ifndef NOPROTO
 #define VAR_ANSI       /* select ANSI version by default */
 #endif
 
@@ -655,34 +553,7 @@ long BIO_ghbn_ctrl();
 #define VAR_ARG(args,type,arg) arg=va_arg(args,type)
 #define VAR_END(args)          va_end(args);
 
-#else
-
-/* K&R version of a "portable" macro set for variable length args */
-#ifndef __VARARGS_H__
-#include <varargs.h>
-#endif
-
-#define VAR_PLIST(arg1type,arg1)       va_alist
-#define VAR_PLIST2(arg1type,arg1,arg2type,arg2) va_alist
-#define VAR_ALIST              va_dcl
-#define VAR_BDEFN(args,arg1type,arg1)  va_list args; arg1type arg1
-#define VAR_BDEFN2(args,arg1type,arg1,arg2type,arg2)    va_list args; \
-       arg1type arg1; arg2type arg2
-#define VAR_INIT(args,arg1type,arg1)   va_start(args); \
-       arg1=va_arg(args,arg1type);
-#define VAR_INIT2(args,arg1type,arg1,arg2type,arg2) va_start(args); \
-       arg1=va_arg(args,arg1type);     arg2=va_arg(args,arg2type);
-#define VAR_ARG(args,type,arg)         arg=va_arg(args,type)
-#define VAR_END(args)                  va_end(args);
-
-#endif
-
-#ifndef NOPROTO
 int BIO_printf( VAR_PLIST( BIO *, bio ) );
-#else
-int BIO_printf();
-#endif
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.