From 815e93e74514b0f699488f372d491cf84236cd99 Mon Sep 17 00:00:00 2001 From: beck <> Date: Tue, 15 Apr 2014 16:21:04 +0000 Subject: Part 1 of eliminating BIO_snprintf(). This fixes mechanical conversions where the return value is ignored changing to (void) snprintf. ok deraadt@ --- src/lib/libcrypto/bio/b_dump.c | 10 +++++----- src/lib/libcrypto/bio/b_sock.c | 4 ++-- src/lib/libcrypto/bio/bio_cb.c | 30 +++++++++++++++--------------- src/lib/libcrypto/bio/bss_conn.c | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/lib/libcrypto/bio') diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index c80ecc4295..492ee09275 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c @@ -107,7 +107,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), { buf[0]='\0'; /* start with empty string */ BUF_strlcpy(buf,str,sizeof buf); - BIO_snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width); + (void) snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width); BUF_strlcat(buf,tmp,sizeof buf); for(j=0;j=' ')&&(ch<='~'))?ch:'.'); #else - BIO_snprintf(tmp,sizeof tmp,"%c", + (void) snprintf(tmp,sizeof tmp,"%c", ((ch>=os_toascii[' '])&&(ch<=os_toascii['~'])) ? os_toebcdic[ch] : '.'); @@ -149,7 +149,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), #ifdef TRUNCATE if (trc > 0) { - BIO_snprintf(buf,sizeof buf,"%s%04x - \n",str, + (void) snprintf(buf,sizeof buf,"%s%04x - \n",str, len+trc); ret+=cb((void *)buf,strlen(buf),u); } diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 779acbaaf5..bd43307456 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c @@ -916,7 +916,7 @@ int BIO_accept(int sock, char **addr) goto end; } *addr = p; - BIO_snprintf(*addr,nl,"%s:%s",h,s); + (void) snprintf(*addr,nl,"%s:%s",h,s); goto end; } while(0); #endif @@ -932,7 +932,7 @@ int BIO_accept(int sock, char **addr) } *addr=p; } - BIO_snprintf(*addr,24,"%d.%d.%d.%d:%d", + (void) snprintf(*addr,24,"%d.%d.%d.%d:%d", (unsigned char)(l>>24L)&0xff, (unsigned char)(l>>16L)&0xff, (unsigned char)(l>> 8L)&0xff, diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 7334a254bf..78c8974ab4 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c @@ -75,60 +75,60 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, if (BIO_CB_RETURN & cmd) r=ret; - BIO_snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio); + (void) snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio); p= &(buf[14]); p_maxlen = sizeof buf - 14; switch (cmd) { case BIO_CB_FREE: - BIO_snprintf(p,p_maxlen,"Free - %s\n",bio->method->name); + (void) snprintf(p,p_maxlen,"Free - %s\n",bio->method->name); break; case BIO_CB_READ: if (bio->method->type & BIO_TYPE_DESCRIPTOR) - BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n", + (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n", bio->num,(unsigned long)argi, bio->method->name,bio->num); else - BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s\n", + (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s\n", bio->num,(unsigned long)argi, bio->method->name); break; case BIO_CB_WRITE: if (bio->method->type & BIO_TYPE_DESCRIPTOR) - BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n", + (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n", bio->num,(unsigned long)argi, bio->method->name,bio->num); else - BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s\n", + (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s\n", bio->num,(unsigned long)argi, bio->method->name); break; case BIO_CB_PUTS: - BIO_snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name); + (void) snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name); break; case BIO_CB_GETS: - BIO_snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name); + (void) snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name); break; case BIO_CB_CTRL: - BIO_snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name); + (void) snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name); break; case BIO_CB_RETURN|BIO_CB_READ: - BIO_snprintf(p,p_maxlen,"read return %ld\n",ret); + (void) snprintf(p,p_maxlen,"read return %ld\n",ret); break; case BIO_CB_RETURN|BIO_CB_WRITE: - BIO_snprintf(p,p_maxlen,"write return %ld\n",ret); + (void) snprintf(p,p_maxlen,"write return %ld\n",ret); break; case BIO_CB_RETURN|BIO_CB_GETS: - BIO_snprintf(p,p_maxlen,"gets return %ld\n",ret); + (void) snprintf(p,p_maxlen,"gets return %ld\n",ret); break; case BIO_CB_RETURN|BIO_CB_PUTS: - BIO_snprintf(p,p_maxlen,"puts return %ld\n",ret); + (void) snprintf(p,p_maxlen,"puts return %ld\n",ret); break; case BIO_CB_RETURN|BIO_CB_CTRL: - BIO_snprintf(p,p_maxlen,"ctrl return %ld\n",ret); + (void) snprintf(p,p_maxlen,"ctrl return %ld\n",ret); break; default: - BIO_snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd); + (void) snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd); break; } diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 42ddf1f4aa..5162e75c87 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c @@ -521,7 +521,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) char buf[16]; unsigned char *p = ptr; - BIO_snprintf(buf,sizeof buf,"%d.%d.%d.%d", + (void) snprintf(buf,sizeof buf,"%d.%d.%d.%d", p[0],p[1],p[2],p[3]); if (data->param_hostname != NULL) OPENSSL_free(data->param_hostname); @@ -532,7 +532,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) { char buf[DECIMAL_SIZE(int)+1]; - BIO_snprintf(buf,sizeof buf,"%d",*(int *)ptr); + (void) snprintf(buf,sizeof buf,"%d",*(int *)ptr); if (data->param_port != NULL) OPENSSL_free(data->param_port); data->param_port=BUF_strdup(buf); -- cgit v1.2.3-55-g6feb