summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err
diff options
context:
space:
mode:
authorbeck <>2014-04-15 16:21:04 +0000
committerbeck <>2014-04-15 16:21:04 +0000
commit8de0117e810bf2887ba81b54345d86f49dd504a8 (patch)
tree8c2058c07d3cdac3caf00950e53159c1c251f257 /src/lib/libcrypto/err
parentfd934c882a62cc862a41725de129e7a623ce16a3 (diff)
downloadopenbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.tar.gz
openbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.tar.bz2
openbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.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/err')
-rw-r--r--src/lib/libcrypto/err/err.c8
-rw-r--r--src/lib/libcrypto/err/err_prn.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 0251248baf..ae9a209ad7 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -872,13 +872,13 @@ void ERR_error_string_n(unsigned long e, char *buf, size_t len)
872 rs=ERR_reason_error_string(e); 872 rs=ERR_reason_error_string(e);
873 873
874 if (ls == NULL) 874 if (ls == NULL)
875 BIO_snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l); 875 (void) snprintf(lsbuf, sizeof(lsbuf), "lib(%lu)", l);
876 if (fs == NULL) 876 if (fs == NULL)
877 BIO_snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f); 877 (void) snprintf(fsbuf, sizeof(fsbuf), "func(%lu)", f);
878 if (rs == NULL) 878 if (rs == NULL)
879 BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r); 879 (void) snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
880 880
881 BIO_snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf, 881 (void) snprintf(buf, len,"error:%08lX:%s:%s:%s", e, ls?ls:lsbuf,
882 fs?fs:fsbuf, rs?rs:rsbuf); 882 fs?fs:fsbuf, rs?rs:rsbuf);
883 if (strlen(buf) == len-1) 883 if (strlen(buf) == len-1)
884 { 884 {
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index a0168ac8ed..7374c0abe7 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -79,7 +79,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) 79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
80 { 80 {
81 ERR_error_string_n(l, buf, sizeof buf); 81 ERR_error_string_n(l, buf, sizeof buf);
82 BIO_snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf, 82 (void) snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf,
83 file, line, (flags & ERR_TXT_STRING) ? data : ""); 83 file, line, (flags & ERR_TXT_STRING) ? data : "");
84 if (cb(buf2, strlen(buf2), u) <= 0) 84 if (cb(buf2, strlen(buf2), u) <= 0)
85 break; /* abort outputting the error report */ 85 break; /* abort outputting the error report */