summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/o_str.c
diff options
context:
space:
mode:
authorjsing <>2014-04-15 13:42:55 +0000
committerjsing <>2014-04-15 13:42:55 +0000
commit69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94 (patch)
treef085d85cb06e6b6e1a1b1d52cced54d9f7d7e5f2 /src/lib/libcrypto/o_str.c
parentc7fdfc89ee30180bf262c4b146c1b6e1030083d6 (diff)
downloadopenbsd-69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94.tar.gz
openbsd-69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94.tar.bz2
openbsd-69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94.zip
First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using tr and md5.
Diffstat (limited to 'src/lib/libcrypto/o_str.c')
-rw-r--r--src/lib/libcrypto/o_str.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/src/lib/libcrypto/o_str.c b/src/lib/libcrypto/o_str.c
index 56104a6c34..c3ab1f8093 100644
--- a/src/lib/libcrypto/o_str.c
+++ b/src/lib/libcrypto/o_str.c
@@ -66,17 +66,18 @@
66# include <strings.h> 66# include <strings.h>
67#endif 67#endif
68 68
69int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n) 69int
70 { 70OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
71{
71#if defined(OPENSSL_IMPLEMENTS_strncasecmp) 72#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
72 while (*str1 && *str2 && n) 73 while (*str1 && *str2 && n) {
73 {
74 int res = toupper(*str1) - toupper(*str2); 74 int res = toupper(*str1) - toupper(*str2);
75 if (res) return res < 0 ? -1 : 1; 75 if (res)
76 return res < 0 ? -1 : 1;
76 str1++; 77 str1++;
77 str2++; 78 str2++;
78 n--; 79 n--;
79 } 80 }
80 if (n == 0) 81 if (n == 0)
81 return 0; 82 return 0;
82 if (*str1) 83 if (*str1)
@@ -90,22 +91,25 @@ int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
90 * defined as well. */ 91 * defined as well. */
91 return strncasecmp(str1, str2, n); 92 return strncasecmp(str1, str2, n);
92#endif 93#endif
93 } 94}
94int OPENSSL_strcasecmp(const char *str1, const char *str2) 95
95 { 96int
97OPENSSL_strcasecmp(const char *str1, const char *str2)
98{
96#if defined(OPENSSL_IMPLEMENTS_strncasecmp) 99#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
97 return OPENSSL_strncasecmp(str1, str2, (size_t)-1); 100 return OPENSSL_strncasecmp(str1, str2, (size_t) - 1);
98#else 101#else
99 return strcasecmp(str1, str2); 102 return strcasecmp(str1, str2);
100#endif 103#endif
101 } 104}
102 105
103int OPENSSL_memcmp(const void *v1,const void *v2,size_t n) 106int
104 { 107OPENSSL_memcmp(const void *v1, const void *v2, size_t n)
105 const unsigned char *c1=v1,*c2=v2; 108{
106 int ret=0; 109 const unsigned char *c1 = v1, *c2 = v2;
110 int ret = 0;
107 111
108 while(n && (ret=*c1-*c2)==0) n--,c1++,c2++; 112 while (n && (ret = *c1 - *c2) == 0) n--, c1++, c2++;
109 113
110 return ret; 114 return ret;
111 } 115}