summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-04-26 13:07:16 +0000
committerjsing <>2014-04-26 13:07:16 +0000
commit8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf (patch)
tree0cc6f6070d8804d7eae434ba11beee02e5569855
parent881a5b100e88cfb566ac3dadda9aa58488a5aaf9 (diff)
downloadopenbsd-8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf.tar.gz
openbsd-8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf.tar.bz2
openbsd-8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf.zip
More KNF.
-rw-r--r--src/lib/libcrypto/buffer/buf_str.c5
-rw-r--r--src/lib/libcrypto/buffer/buffer.c11
-rw-r--r--src/lib/libssl/src/crypto/buffer/buf_str.c5
-rw-r--r--src/lib/libssl/src/crypto/buffer/buffer.c11
4 files changed, 20 insertions, 12 deletions
diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c
index 819155626a..33836d0af4 100644
--- a/src/lib/libcrypto/buffer/buf_str.c
+++ b/src/lib/libcrypto/buffer/buf_str.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: buf_str.c,v 1.7 2014/04/17 14:28:44 beck Exp $ */ 1/* $OpenBSD: buf_str.c,v 1.8 2014/04/26 13:07:16 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Bob Beck 3 * Copyright (c) 2014 Bob Beck
4 * 4 *
@@ -31,6 +31,7 @@ char *
31BUF_strdup(const char *str) 31BUF_strdup(const char *str)
32{ 32{
33 char *ret = NULL; 33 char *ret = NULL;
34
34 if (str != NULL) { 35 if (str != NULL) {
35 if (!(ret = strdup(str))) 36 if (!(ret = strdup(str)))
36 BUFerr(BUF_F_BUF_STRDUP, ERR_R_MALLOC_FAILURE); 37 BUFerr(BUF_F_BUF_STRDUP, ERR_R_MALLOC_FAILURE);
@@ -42,6 +43,7 @@ char *
42BUF_strndup(const char *str, size_t siz) 43BUF_strndup(const char *str, size_t siz)
43{ 44{
44 char *ret = NULL; 45 char *ret = NULL;
46
45 if (str != NULL) { 47 if (str != NULL) {
46 if (!(ret = strndup(str, siz))) 48 if (!(ret = strndup(str, siz)))
47 BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE); 49 BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE);
@@ -53,6 +55,7 @@ void *
53BUF_memdup(const void *data, size_t siz) 55BUF_memdup(const void *data, size_t siz)
54{ 56{
55 void *ret = NULL; 57 void *ret = NULL;
58
56 if (data != NULL) { 59 if (data != NULL) {
57 if (!(ret = malloc(siz))) 60 if (!(ret = malloc(siz)))
58 BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE); 61 BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
index a50c30a348..486d6fef14 100644
--- a/src/lib/libcrypto/buffer/buffer.c
+++ b/src/lib/libcrypto/buffer/buffer.c
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a)
88 return; 88 return;
89 89
90 if (a->data != NULL) { 90 if (a->data != NULL) {
91 memset(a->data, 0,(unsigned int)a->max); 91 memset(a->data, 0, (unsigned int)a->max);
92 free(a->data); 92 free(a->data);
93 } 93 }
94 free(a); 94 free(a);
@@ -105,7 +105,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len)
105 return (len); 105 return (len);
106 } 106 }
107 if (str->max >= len) { 107 if (str->max >= len) {
108 memset(&str->data[str->length], 0,len - str->length); 108 memset(&str->data[str->length], 0, len - str->length);
109 str->length = len; 109 str->length = len;
110 return (len); 110 return (len);
111 } 111 }
@@ -125,7 +125,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len)
125 } else { 125 } else {
126 str->data = ret; 126 str->data = ret;
127 str->max = n; 127 str->max = n;
128 memset(&str->data[str->length], 0,len - str->length); 128 memset(&str->data[str->length], 0, len - str->length);
129 str->length = len; 129 str->length = len;
130 } 130 }
131 return (len); 131 return (len);
@@ -138,12 +138,12 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
138 size_t n; 138 size_t n;
139 139
140 if (str->length >= len) { 140 if (str->length >= len) {
141 memset(&str->data[len], 0,str->length - len); 141 memset(&str->data[len], 0, str->length - len);
142 str->length = len; 142 str->length = len;
143 return (len); 143 return (len);
144 } 144 }
145 if (str->max >= len) { 145 if (str->max >= len) {
146 memset(&str->data[str->length], 0,len - str->length); 146 memset(&str->data[str->length], 0, len - str->length);
147 str->length = len; 147 str->length = len;
148 return (len); 148 return (len);
149 } 149 }
@@ -176,6 +176,7 @@ void
176BUF_reverse(unsigned char *out, const unsigned char *in, size_t size) 176BUF_reverse(unsigned char *out, const unsigned char *in, size_t size)
177{ 177{
178 size_t i; 178 size_t i;
179
179 if (in) { 180 if (in) {
180 out += size - 1; 181 out += size - 1;
181 for (i = 0; i < size; i++) 182 for (i = 0; i < size; i++)
diff --git a/src/lib/libssl/src/crypto/buffer/buf_str.c b/src/lib/libssl/src/crypto/buffer/buf_str.c
index 819155626a..33836d0af4 100644
--- a/src/lib/libssl/src/crypto/buffer/buf_str.c
+++ b/src/lib/libssl/src/crypto/buffer/buf_str.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: buf_str.c,v 1.7 2014/04/17 14:28:44 beck Exp $ */ 1/* $OpenBSD: buf_str.c,v 1.8 2014/04/26 13:07:16 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Bob Beck 3 * Copyright (c) 2014 Bob Beck
4 * 4 *
@@ -31,6 +31,7 @@ char *
31BUF_strdup(const char *str) 31BUF_strdup(const char *str)
32{ 32{
33 char *ret = NULL; 33 char *ret = NULL;
34
34 if (str != NULL) { 35 if (str != NULL) {
35 if (!(ret = strdup(str))) 36 if (!(ret = strdup(str)))
36 BUFerr(BUF_F_BUF_STRDUP, ERR_R_MALLOC_FAILURE); 37 BUFerr(BUF_F_BUF_STRDUP, ERR_R_MALLOC_FAILURE);
@@ -42,6 +43,7 @@ char *
42BUF_strndup(const char *str, size_t siz) 43BUF_strndup(const char *str, size_t siz)
43{ 44{
44 char *ret = NULL; 45 char *ret = NULL;
46
45 if (str != NULL) { 47 if (str != NULL) {
46 if (!(ret = strndup(str, siz))) 48 if (!(ret = strndup(str, siz)))
47 BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE); 49 BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE);
@@ -53,6 +55,7 @@ void *
53BUF_memdup(const void *data, size_t siz) 55BUF_memdup(const void *data, size_t siz)
54{ 56{
55 void *ret = NULL; 57 void *ret = NULL;
58
56 if (data != NULL) { 59 if (data != NULL) {
57 if (!(ret = malloc(siz))) 60 if (!(ret = malloc(siz)))
58 BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE); 61 BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/src/crypto/buffer/buffer.c b/src/lib/libssl/src/crypto/buffer/buffer.c
index a50c30a348..486d6fef14 100644
--- a/src/lib/libssl/src/crypto/buffer/buffer.c
+++ b/src/lib/libssl/src/crypto/buffer/buffer.c
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a)
88 return; 88 return;
89 89
90 if (a->data != NULL) { 90 if (a->data != NULL) {
91 memset(a->data, 0,(unsigned int)a->max); 91 memset(a->data, 0, (unsigned int)a->max);
92 free(a->data); 92 free(a->data);
93 } 93 }
94 free(a); 94 free(a);
@@ -105,7 +105,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len)
105 return (len); 105 return (len);
106 } 106 }
107 if (str->max >= len) { 107 if (str->max >= len) {
108 memset(&str->data[str->length], 0,len - str->length); 108 memset(&str->data[str->length], 0, len - str->length);
109 str->length = len; 109 str->length = len;
110 return (len); 110 return (len);
111 } 111 }
@@ -125,7 +125,7 @@ BUF_MEM_grow(BUF_MEM *str, size_t len)
125 } else { 125 } else {
126 str->data = ret; 126 str->data = ret;
127 str->max = n; 127 str->max = n;
128 memset(&str->data[str->length], 0,len - str->length); 128 memset(&str->data[str->length], 0, len - str->length);
129 str->length = len; 129 str->length = len;
130 } 130 }
131 return (len); 131 return (len);
@@ -138,12 +138,12 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
138 size_t n; 138 size_t n;
139 139
140 if (str->length >= len) { 140 if (str->length >= len) {
141 memset(&str->data[len], 0,str->length - len); 141 memset(&str->data[len], 0, str->length - len);
142 str->length = len; 142 str->length = len;
143 return (len); 143 return (len);
144 } 144 }
145 if (str->max >= len) { 145 if (str->max >= len) {
146 memset(&str->data[str->length], 0,len - str->length); 146 memset(&str->data[str->length], 0, len - str->length);
147 str->length = len; 147 str->length = len;
148 return (len); 148 return (len);
149 } 149 }
@@ -176,6 +176,7 @@ void
176BUF_reverse(unsigned char *out, const unsigned char *in, size_t size) 176BUF_reverse(unsigned char *out, const unsigned char *in, size_t size)
177{ 177{
178 size_t i; 178 size_t i;
179
179 if (in) { 180 if (in) {
180 out += size - 1; 181 out += size - 1;
181 for (i = 0; i < size; i++) 182 for (i = 0; i < size; i++)