diff options
| author | beck <> | 2014-04-15 16:21:04 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-15 16:21:04 +0000 |
| commit | 815e93e74514b0f699488f372d491cf84236cd99 (patch) | |
| tree | 8c2058c07d3cdac3caf00950e53159c1c251f257 /src/lib/libcrypto/conf | |
| parent | 6faa9226dd4494c01448085044adc07001ba4ca0 (diff) | |
| download | openbsd-815e93e74514b0f699488f372d491cf84236cd99.tar.gz openbsd-815e93e74514b0f699488f372d491cf84236cd99.tar.bz2 openbsd-815e93e74514b0f699488f372d491cf84236cd99.zip | |
Part 1 of eliminating BIO_snprintf(). This fixes mechanical conversions
where the return value is ignored changing to (void) snprintf.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/conf')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/conf/conf_mod.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index cf951320af..15e5613e36 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c | |||
| @@ -439,7 +439,7 @@ err: | |||
| 439 | if (buff != NULL) BUF_MEM_free(buff); | 439 | if (buff != NULL) BUF_MEM_free(buff); |
| 440 | if (section != NULL) OPENSSL_free(section); | 440 | if (section != NULL) OPENSSL_free(section); |
| 441 | if (line != NULL) *line=eline; | 441 | if (line != NULL) *line=eline; |
| 442 | BIO_snprintf(btmp,sizeof btmp,"%ld",eline); | 442 | (void) snprintf(btmp,sizeof btmp,"%ld",eline); |
| 443 | ERR_add_error_data(2,"line ",btmp); | 443 | ERR_add_error_data(2,"line ",btmp); |
| 444 | if ((h != conf->data) && (conf->data != NULL)) | 444 | if ((h != conf->data) && (conf->data != NULL)) |
| 445 | { | 445 | { |
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index df1642a0a5..994294f655 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c | |||
| @@ -233,7 +233,7 @@ static int module_run(const CONF *cnf, char *name, char *value, | |||
| 233 | { | 233 | { |
| 234 | char rcode[DECIMAL_SIZE(ret)+1]; | 234 | char rcode[DECIMAL_SIZE(ret)+1]; |
| 235 | CONFerr(CONF_F_MODULE_RUN, CONF_R_MODULE_INITIALIZATION_ERROR); | 235 | CONFerr(CONF_F_MODULE_RUN, CONF_R_MODULE_INITIALIZATION_ERROR); |
| 236 | BIO_snprintf(rcode, sizeof rcode, "%-8d", ret); | 236 | (void) snprintf(rcode, sizeof rcode, "%-8d", ret); |
| 237 | ERR_add_error_data(6, "module=", name, ", value=", value, ", retcode=", rcode); | 237 | ERR_add_error_data(6, "module=", name, ", value=", value, ", retcode=", rcode); |
| 238 | } | 238 | } |
| 239 | } | 239 | } |
