summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorderaadt <>2014-10-05 15:21:48 +0000
committerderaadt <>2014-10-05 15:21:48 +0000
commit9207ab67b18f63516d68a92495a6bc3da5a98806 (patch)
tree639ee8021cd9826072d66d9cb5c8312acaa8db3f /src/lib
parent719b6382574a00fc4fb9b689469ee3b51ab4cc1e (diff)
downloadopenbsd-9207ab67b18f63516d68a92495a6bc3da5a98806.tar.gz
openbsd-9207ab67b18f63516d68a92495a6bc3da5a98806.tar.bz2
openbsd-9207ab67b18f63516d68a92495a6bc3da5a98806.zip
compile with c89 (code / decl ordering); from Joakim.Tjernlund@transmode.se
ok miod
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/err/err.c5
-rw-r--r--src/lib/libssl/src/crypto/err/err.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 0802249da4..75a1d0181e 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.c,v 1.39 2014/08/24 16:11:39 bcook Exp $ */ 1/* $OpenBSD: err.c,v 1.40 2014/10/05 15:21:48 deraadt Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1105,8 +1105,9 @@ ERR_add_error_vdata(int num, va_list args)
1105{ 1105{
1106 char format[129]; 1106 char format[129];
1107 char *errbuf; 1107 char *errbuf;
1108 format[0] = '\0';
1109 int i; 1108 int i;
1109
1110 format[0] = '\0';
1110 for (i = 0; i < num; i++) { 1111 for (i = 0; i < num; i++) {
1111 if (strlcat(format, "%s", sizeof(format)) >= sizeof(format)) { 1112 if (strlcat(format, "%s", sizeof(format)) >= sizeof(format)) {
1112 ERR_set_error_data("too many errors", ERR_TXT_STRING); 1113 ERR_set_error_data("too many errors", ERR_TXT_STRING);
diff --git a/src/lib/libssl/src/crypto/err/err.c b/src/lib/libssl/src/crypto/err/err.c
index 0802249da4..75a1d0181e 100644
--- a/src/lib/libssl/src/crypto/err/err.c
+++ b/src/lib/libssl/src/crypto/err/err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.c,v 1.39 2014/08/24 16:11:39 bcook Exp $ */ 1/* $OpenBSD: err.c,v 1.40 2014/10/05 15:21:48 deraadt Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1105,8 +1105,9 @@ ERR_add_error_vdata(int num, va_list args)
1105{ 1105{
1106 char format[129]; 1106 char format[129];
1107 char *errbuf; 1107 char *errbuf;
1108 format[0] = '\0';
1109 int i; 1108 int i;
1109
1110 format[0] = '\0';
1110 for (i = 0; i < num; i++) { 1111 for (i = 0; i < num; i++) {
1111 if (strlcat(format, "%s", sizeof(format)) >= sizeof(format)) { 1112 if (strlcat(format, "%s", sizeof(format)) >= sizeof(format)) {
1112 ERR_set_error_data("too many errors", ERR_TXT_STRING); 1113 ERR_set_error_data("too many errors", ERR_TXT_STRING);