aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/curl_version_check.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-10-31 13:06:08 +0100
committerChristian Grothoff <christian@grothoff.org>2019-10-31 13:06:08 +0100
commit7389c3452884ad29faf5a2d6856aebd364ffae6b (patch)
tree71246e22c8513c0dcbf79b837cb9c084c29e434c /src/testcurl/curl_version_check.c
parente0a076284525eaf2ec4cb356a40cccc25e24f2b1 (diff)
downloadlibmicrohttpd-7389c3452884ad29faf5a2d6856aebd364ffae6b.tar.gz
libmicrohttpd-7389c3452884ad29faf5a2d6856aebd364ffae6b.zip
tighten formatting rules
Diffstat (limited to 'src/testcurl/curl_version_check.c')
-rw-r--r--src/testcurl/curl_version_check.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/testcurl/curl_version_check.c b/src/testcurl/curl_version_check.c
index d1134f42..445c85d7 100644
--- a/src/testcurl/curl_version_check.c
+++ b/src/testcurl/curl_version_check.c
@@ -50,6 +50,7 @@ parse_version_number (const char **s)
50 return atoi (num); 50 return atoi (num);
51} 51}
52 52
53
53const char * 54const char *
54parse_version_string (const char *s, int *major, int *minor, int *micro) 55parse_version_string (const char *s, int *major, int *minor, int *micro)
55{ 56{
@@ -67,12 +68,15 @@ parse_version_string (const char *s, int *major, int *minor, int *micro)
67 return s; 68 return s;
68} 69}
69 70
71
70#ifdef HTTPS_SUPPORT 72#ifdef HTTPS_SUPPORT
71int 73int
72curl_uses_nss_ssl () 74curl_uses_nss_ssl ()
73{ 75{
74 return (strstr (curl_version (), " NSS/") != NULL) ? 0 : -1; 76 return (strstr (curl_version (), " NSS/") != NULL) ? 0 : -1;
75} 77}
78
79
76#endif /* HTTPS_SUPPORT */ 80#endif /* HTTPS_SUPPORT */
77 81
78/* 82/*
@@ -99,8 +103,7 @@ curl_check_version (const char *req_version)
99 * this call relies on the cURL string to be of the exact following format : 103 * this call relies on the cURL string to be of the exact following format :
100 * 'libcurl/7.16.4 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/0.6.5' OR 104 * 'libcurl/7.16.4 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/0.6.5' OR
101 * 'libcurl/7.18.2 GnuTLS/2.4.0 zlib/1.2.3.3 libidn/0.6.5' 105 * 'libcurl/7.18.2 GnuTLS/2.4.0 zlib/1.2.3.3 libidn/0.6.5'
102 */ 106 */curl_ver = strchr (ver, '/');
103 curl_ver = strchr (ver, '/');
104 if (curl_ver == NULL) 107 if (curl_ver == NULL)
105 return -1; 108 return -1;
106 curl_ver++; 109 curl_ver++;
@@ -113,11 +116,11 @@ curl_check_version (const char *req_version)
113 116
114 /* Compare version numbers. */ 117 /* Compare version numbers. */
115 if (((loc_major > rq_major) 118 if (((loc_major > rq_major)
116 || ((loc_major == rq_major)&&(loc_minor > rq_minor)) 119 || ((loc_major == rq_major) && (loc_minor > rq_minor))
117 || ((loc_major == rq_major)&&(loc_minor == rq_minor) 120 || ((loc_major == rq_major) && (loc_minor == rq_minor)
118 &&(loc_micro > rq_micro)) || ((loc_major == rq_major) 121 && (loc_micro > rq_micro)) || ((loc_major == rq_major)
119 &&(loc_minor == rq_minor) 122 && (loc_minor == rq_minor)
120 &&(loc_micro == rq_micro) )) == 0) 123 && (loc_micro == rq_micro) )) == 0)
121 { 124 {
122 fprintf (stderr, 125 fprintf (stderr,
123 "Error: running curl test depends on local libcurl version > %s\n", 126 "Error: running curl test depends on local libcurl version > %s\n",
@@ -164,11 +167,11 @@ curl_check_version (const char *req_version)
164 return -1; 167 return -1;
165 168
166 if (((loc_major > rq_major) 169 if (((loc_major > rq_major)
167 || ((loc_major == rq_major)&&(loc_minor > rq_minor)) 170 || ((loc_major == rq_major) && (loc_minor > rq_minor))
168 || ((loc_major == rq_major)&&(loc_minor == rq_minor) 171 || ((loc_major == rq_major) && (loc_minor == rq_minor)
169 &&(loc_micro > rq_micro)) || ((loc_major == rq_major) 172 && (loc_micro > rq_micro)) || ((loc_major == rq_major)
170 &&(loc_minor == rq_minor) 173 && (loc_minor == rq_minor)
171 &&(loc_micro == rq_micro) )) == 0) 174 && (loc_micro == rq_micro) )) == 0)
172 { 175 {
173 fprintf (stderr, 176 fprintf (stderr,
174 "Error: running curl test depends on local libcurl SSL version > %s\n", 177 "Error: running curl test depends on local libcurl SSL version > %s\n",