diff options
author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/bio/bio_lib.c | |
parent | 2401debe83e8df930907a39065ebf9a54354f123 (diff) |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/bio/bio_lib.c')
-rw-r--r-- | crypto/bio/bio_lib.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index ea7f22a8ce..3f52ae953c 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -156,14 +156,12 @@ void BIO_set_flags(BIO *b, int flags) b->flags |= flags; } -long (*BIO_get_callback(const BIO *b))(struct bio_st *, int, const char *, - size_t, long, long) +long (*BIO_get_callback(const BIO *b))(struct bio_st *,int,const char *,int, long,long) { return b->callback; } -void BIO_set_callback(BIO *b, long (*cb)(struct bio_st *, int, const char *, - size_t, long, long)) +void BIO_set_callback(BIO *b, long (*cb)(struct bio_st *,int,const char *,int, long,long)) { b->callback = cb; } @@ -192,7 +190,7 @@ int BIO_method_type(const BIO *b) int BIO_read(BIO *b, void *out, int outl) { int i; - long (*cb)(BIO *, int, const char *, size_t, long, long); + long (*cb)(BIO *,int,const char *,int,long,long); if ((b == NULL) || (b->method == NULL) || (b->method->bread == NULL)) { @@ -221,10 +219,10 @@ int BIO_read(BIO *b, void *out, int outl) return(i); } -int BIO_write(BIO *b, const void *in, size_t inl) +int BIO_write(BIO *b, const void *in, int inl) { int i; - long (*cb)(BIO *,int,const char *,size_t,long,long); + long (*cb)(BIO *,int,const char *,int,long,long); if (b == NULL) return(0); @@ -237,7 +235,7 @@ int BIO_write(BIO *b, const void *in, size_t inl) } if ((cb != NULL) && - ((i=cb(b,BIO_CB_WRITE,in,inl,0L,1L)) <= 0)) + ((i=(int)cb(b,BIO_CB_WRITE,in,inl,0L,1L)) <= 0)) return(i); if (!b->init) @@ -259,7 +257,7 @@ int BIO_write(BIO *b, const void *in, size_t inl) int BIO_puts(BIO *b, const char *in) { int i; - long (*cb)(BIO *, int, const char *, size_t, long, long); + long (*cb)(BIO *,int,const char *,int,long,long); if ((b == NULL) || (b->method == NULL) || (b->method->bputs == NULL)) { @@ -292,7 +290,7 @@ int BIO_puts(BIO *b, const char *in) int BIO_gets(BIO *b, char *in, int inl) { int i; - long (*cb)(BIO *, int, const char *, size_t, long, long); + long (*cb)(BIO *,int,const char *,int,long,long); if ((b == NULL) || (b->method == NULL) || (b->method->bgets == NULL)) { @@ -353,7 +351,7 @@ char *BIO_ptr_ctrl(BIO *b, int cmd, long larg) long BIO_ctrl(BIO *b, int cmd, long larg, void *parg) { long ret; - long (*cb)(BIO *, int, const char *, size_t, long, long); + long (*cb)(BIO *,int,const char *,int,long,long); if (b == NULL) return(0); @@ -380,7 +378,7 @@ long BIO_ctrl(BIO *b, int cmd, long larg, void *parg) long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long)) { long ret; - long (*cb)(BIO *, int, const char *, size_t, long, long); + long (*cb)(BIO *,int,const char *,int,long,long); if (b == NULL) return(0); |