diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-07-28 22:05:12 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-07-28 22:05:12 +0200 |
commit | 9eb7b4de6447f4821b2e47ce31a8243c85e5bc96 (patch) | |
tree | ca071f4b8c852e976c3159cc064d8f1aa2fe8306 | |
parent | 2949c070e61f14709840d278a39ff3637bc3ddee (diff) | |
download | libmicrohttpd-9eb7b4de6447f4821b2e47ce31a8243c85e5bc96.tar.gz libmicrohttpd-9eb7b4de6447f4821b2e47ce31a8243c85e5bc96.zip |
-fix typos
-rw-r--r-- | src/testcurl/test_digestauth2.c | 53 | ||||
-rw-r--r-- | src/testcurl/test_digestauth_concurrent.c | 53 | ||||
-rw-r--r-- | src/testcurl/test_digestauth_sha256.c | 2 | ||||
-rw-r--r-- | src/testcurl/test_digestauth_with_arguments.c | 2 |
4 files changed, 56 insertions, 54 deletions
diff --git a/src/testcurl/test_digestauth2.c b/src/testcurl/test_digestauth2.c index 0d6b844a..c00dd1b1 100644 --- a/src/testcurl/test_digestauth2.c +++ b/src/testcurl/test_digestauth2.c | |||
@@ -51,11 +51,11 @@ | |||
51 | #endif /* ! MHD_STATICSTR_LEN_ */ | 51 | #endif /* ! MHD_STATICSTR_LEN_ */ |
52 | 52 | ||
53 | #ifndef CURL_VERSION_BITS | 53 | #ifndef CURL_VERSION_BITS |
54 | #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) | 54 | #define CURL_VERSION_BITS(x,y,z) ((x) << 16 | (y) << 8 | (z)) |
55 | #endif /* ! CURL_VERSION_BITS */ | 55 | #endif /* ! CURL_VERSION_BITS */ |
56 | #ifndef CURL_AT_LEAST_VERSION | 56 | #ifndef CURL_AT_LEAST_VERSION |
57 | #define CURL_AT_LEAST_VERSION(x,y,z) \ | 57 | #define CURL_AT_LEAST_VERSION(x,y,z) \ |
58 | (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z)) | 58 | (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS (x, y, z)) |
59 | #endif /* ! CURL_AT_LEAST_VERSION */ | 59 | #endif /* ! CURL_AT_LEAST_VERSION */ |
60 | 60 | ||
61 | #ifndef _MHD_INSTRMACRO | 61 | #ifndef _MHD_INSTRMACRO |
@@ -69,47 +69,48 @@ | |||
69 | 69 | ||
70 | #if defined(HAVE___FUNC__) | 70 | #if defined(HAVE___FUNC__) |
71 | #define externalErrorExit(ignore) \ | 71 | #define externalErrorExit(ignore) \ |
72 | _externalErrorExit_func(NULL, __func__, __LINE__) | 72 | _externalErrorExit_func (NULL, __func__, __LINE__) |
73 | #define externalErrorExitDesc(errDesc) \ | 73 | #define externalErrorExitDesc(errDesc) \ |
74 | _externalErrorExit_func(errDesc, __func__, __LINE__) | 74 | _externalErrorExit_func (errDesc, __func__, __LINE__) |
75 | #define libcurlErrorExit(ignore) \ | 75 | #define libcurlErrorExit(ignore) \ |
76 | _libcurlErrorExit_func(NULL, __func__, __LINE__) | 76 | _libcurlErrorExit_func (NULL, __func__, __LINE__) |
77 | #define libcurlErrorExitDesc(errDesc) \ | 77 | #define libcurlErrorExitDesc(errDesc) \ |
78 | _libcurlErrorExit_func(errDesc, __func__, __LINE__) | 78 | _libcurlErrorExit_func (errDesc, __func__, __LINE__) |
79 | #define mhdErrorExit(ignore) \ | 79 | #define mhdErrorExit(ignore) \ |
80 | _mhdErrorExit_func(NULL, __func__, __LINE__) | 80 | _mhdErrorExit_func (NULL, __func__, __LINE__) |
81 | #define mhdErrorExitDesc(errDesc) \ | 81 | #define mhdErrorExitDesc(errDesc) \ |
82 | _mhdErrorExit_func(errDesc, __func__, __LINE__) | 82 | _mhdErrorExit_func (errDesc, __func__, __LINE__) |
83 | #define checkCURLE_OK(libcurlcall) \ | 83 | #define checkCURLE_OK(libcurlcall) \ |
84 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), \ | 84 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), \ |
85 | __func__, __LINE__) | 85 | __func__, __LINE__) |
86 | #elif defined(HAVE___FUNCTION__) | 86 | #elif defined(HAVE___FUNCTION__) |
87 | #define externalErrorExit(ignore) \ | 87 | #define externalErrorExit(ignore) \ |
88 | _externalErrorExit_func(NULL, __FUNCTION__, __LINE__) | 88 | _externalErrorExit_func (NULL, __FUNCTION__, __LINE__) |
89 | #define externalErrorExitDesc(errDesc) \ | 89 | #define externalErrorExitDesc(errDesc) \ |
90 | _externalErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 90 | _externalErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
91 | #define libcurlErrorExit(ignore) \ | 91 | #define libcurlErrorExit(ignore) \ |
92 | _libcurlErrorExit_func(NULL, __FUNCTION__, __LINE__) | 92 | _libcurlErrorExit_func (NULL, __FUNCTION__, __LINE__) |
93 | #define libcurlErrorExitDesc(errDesc) \ | 93 | #define libcurlErrorExitDesc(errDesc) \ |
94 | _libcurlErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 94 | _libcurlErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
95 | #define mhdErrorExit(ignore) \ | 95 | #define mhdErrorExit(ignore) \ |
96 | _mhdErrorExit_func(NULL, __FUNCTION__, __LINE__) | 96 | _mhdErrorExit_func (NULL, __FUNCTION__, __LINE__) |
97 | #define mhdErrorExitDesc(errDesc) \ | 97 | #define mhdErrorExitDesc(errDesc) \ |
98 | _mhdErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 98 | _mhdErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
99 | #define checkCURLE_OK(libcurlcall) \ | 99 | #define checkCURLE_OK(libcurlcall) \ |
100 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), \ | 100 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), \ |
101 | __FUNCTION__, __LINE__) | 101 | __FUNCTION__, __LINE__) |
102 | #else | 102 | #else |
103 | #define externalErrorExit(ignore) _externalErrorExit_func(NULL, NULL, __LINE__) | 103 | #define externalErrorExit(ignore) _externalErrorExit_func (NULL, NULL, __LINE__) |
104 | #define externalErrorExitDesc(errDesc) \ | 104 | #define externalErrorExitDesc(errDesc) \ |
105 | _externalErrorExit_func(errDesc, NULL, __LINE__) | 105 | _externalErrorExit_func (errDesc, NULL, __LINE__) |
106 | #define libcurlErrorExit(ignore) _libcurlErrorExit_func(NULL, NULL, __LINE__) | 106 | #define libcurlErrorExit(ignore) _libcurlErrorExit_func (NULL, NULL, __LINE__) |
107 | #define libcurlErrorExitDesc(errDesc) \ | 107 | #define libcurlErrorExitDesc(errDesc) \ |
108 | _libcurlErrorExit_func(errDesc, NULL, __LINE__) | 108 | _libcurlErrorExit_func (errDesc, NULL, __LINE__) |
109 | #define mhdErrorExit(ignore) _mhdErrorExit_func(NULL, NULL, __LINE__) | 109 | #define mhdErrorExit(ignore) _mhdErrorExit_func (NULL, NULL, __LINE__) |
110 | #define mhdErrorExitDesc(errDesc) _mhdErrorExit_func(errDesc, NULL, __LINE__) | 110 | #define mhdErrorExitDesc(errDesc) _mhdErrorExit_func (errDesc, NULL, __LINE__) |
111 | #define checkCURLE_OK(libcurlcall) \ | 111 | #define checkCURLE_OK(libcurlcall) \ |
112 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), NULL, __LINE__) | 112 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), NULL, \ |
113 | __LINE__) | ||
113 | #endif | 114 | #endif |
114 | 115 | ||
115 | 116 | ||
@@ -1082,7 +1083,7 @@ main (int argc, char *const *argv) | |||
1082 | (CURL_VERSION_BITS (7,62,0) <= curl_info->version_num) ) | 1083 | (CURL_VERSION_BITS (7,62,0) <= curl_info->version_num) ) |
1083 | { | 1084 | { |
1084 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" | 1085 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" |
1085 | "URI with GET argements for Digest Auth.\n"); | 1086 | "URI with GET arguments for Digest Auth.\n"); |
1086 | fprintf (stderr, "This test with libcurl %u.%u.%u cannot be performed.\n", | 1087 | fprintf (stderr, "This test with libcurl %u.%u.%u cannot be performed.\n", |
1087 | 0xFF & (curl_info->version_num >> 16), | 1088 | 0xFF & (curl_info->version_num >> 16), |
1088 | 0xFF & (curl_info->version_num >> 8), | 1089 | 0xFF & (curl_info->version_num >> 8), |
diff --git a/src/testcurl/test_digestauth_concurrent.c b/src/testcurl/test_digestauth_concurrent.c index c80bf382..6d4e591c 100644 --- a/src/testcurl/test_digestauth_concurrent.c +++ b/src/testcurl/test_digestauth_concurrent.c | |||
@@ -51,11 +51,11 @@ | |||
51 | #include "mhd_has_param.h" | 51 | #include "mhd_has_param.h" |
52 | 52 | ||
53 | #ifndef CURL_VERSION_BITS | 53 | #ifndef CURL_VERSION_BITS |
54 | #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) | 54 | #define CURL_VERSION_BITS(x,y,z) ((x) << 16 | (y) << 8 | (z)) |
55 | #endif /* ! CURL_VERSION_BITS */ | 55 | #endif /* ! CURL_VERSION_BITS */ |
56 | #ifndef CURL_AT_LEAST_VERSION | 56 | #ifndef CURL_AT_LEAST_VERSION |
57 | #define CURL_AT_LEAST_VERSION(x,y,z) \ | 57 | #define CURL_AT_LEAST_VERSION(x,y,z) \ |
58 | (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z)) | 58 | (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS (x, y, z)) |
59 | #endif /* ! CURL_AT_LEAST_VERSION */ | 59 | #endif /* ! CURL_AT_LEAST_VERSION */ |
60 | 60 | ||
61 | #ifndef _MHD_INSTRMACRO | 61 | #ifndef _MHD_INSTRMACRO |
@@ -69,47 +69,48 @@ | |||
69 | 69 | ||
70 | #if defined(HAVE___FUNC__) | 70 | #if defined(HAVE___FUNC__) |
71 | #define externalErrorExit(ignore) \ | 71 | #define externalErrorExit(ignore) \ |
72 | _externalErrorExit_func(NULL, __func__, __LINE__) | 72 | _externalErrorExit_func (NULL, __func__, __LINE__) |
73 | #define externalErrorExitDesc(errDesc) \ | 73 | #define externalErrorExitDesc(errDesc) \ |
74 | _externalErrorExit_func(errDesc, __func__, __LINE__) | 74 | _externalErrorExit_func (errDesc, __func__, __LINE__) |
75 | #define libcurlErrorExit(ignore) \ | 75 | #define libcurlErrorExit(ignore) \ |
76 | _libcurlErrorExit_func(NULL, __func__, __LINE__) | 76 | _libcurlErrorExit_func (NULL, __func__, __LINE__) |
77 | #define libcurlErrorExitDesc(errDesc) \ | 77 | #define libcurlErrorExitDesc(errDesc) \ |
78 | _libcurlErrorExit_func(errDesc, __func__, __LINE__) | 78 | _libcurlErrorExit_func (errDesc, __func__, __LINE__) |
79 | #define mhdErrorExit(ignore) \ | 79 | #define mhdErrorExit(ignore) \ |
80 | _mhdErrorExit_func(NULL, __func__, __LINE__) | 80 | _mhdErrorExit_func (NULL, __func__, __LINE__) |
81 | #define mhdErrorExitDesc(errDesc) \ | 81 | #define mhdErrorExitDesc(errDesc) \ |
82 | _mhdErrorExit_func(errDesc, __func__, __LINE__) | 82 | _mhdErrorExit_func (errDesc, __func__, __LINE__) |
83 | #define checkCURLE_OK(libcurlcall) \ | 83 | #define checkCURLE_OK(libcurlcall) \ |
84 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), \ | 84 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), \ |
85 | __func__, __LINE__) | 85 | __func__, __LINE__) |
86 | #elif defined(HAVE___FUNCTION__) | 86 | #elif defined(HAVE___FUNCTION__) |
87 | #define externalErrorExit(ignore) \ | 87 | #define externalErrorExit(ignore) \ |
88 | _externalErrorExit_func(NULL, __FUNCTION__, __LINE__) | 88 | _externalErrorExit_func (NULL, __FUNCTION__, __LINE__) |
89 | #define externalErrorExitDesc(errDesc) \ | 89 | #define externalErrorExitDesc(errDesc) \ |
90 | _externalErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 90 | _externalErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
91 | #define libcurlErrorExit(ignore) \ | 91 | #define libcurlErrorExit(ignore) \ |
92 | _libcurlErrorExit_func(NULL, __FUNCTION__, __LINE__) | 92 | _libcurlErrorExit_func (NULL, __FUNCTION__, __LINE__) |
93 | #define libcurlErrorExitDesc(errDesc) \ | 93 | #define libcurlErrorExitDesc(errDesc) \ |
94 | _libcurlErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 94 | _libcurlErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
95 | #define mhdErrorExit(ignore) \ | 95 | #define mhdErrorExit(ignore) \ |
96 | _mhdErrorExit_func(NULL, __FUNCTION__, __LINE__) | 96 | _mhdErrorExit_func (NULL, __FUNCTION__, __LINE__) |
97 | #define mhdErrorExitDesc(errDesc) \ | 97 | #define mhdErrorExitDesc(errDesc) \ |
98 | _mhdErrorExit_func(errDesc, __FUNCTION__, __LINE__) | 98 | _mhdErrorExit_func (errDesc, __FUNCTION__, __LINE__) |
99 | #define checkCURLE_OK(libcurlcall) \ | 99 | #define checkCURLE_OK(libcurlcall) \ |
100 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), \ | 100 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), \ |
101 | __FUNCTION__, __LINE__) | 101 | __FUNCTION__, __LINE__) |
102 | #else | 102 | #else |
103 | #define externalErrorExit(ignore) _externalErrorExit_func(NULL, NULL, __LINE__) | 103 | #define externalErrorExit(ignore) _externalErrorExit_func (NULL, NULL, __LINE__) |
104 | #define externalErrorExitDesc(errDesc) \ | 104 | #define externalErrorExitDesc(errDesc) \ |
105 | _externalErrorExit_func(errDesc, NULL, __LINE__) | 105 | _externalErrorExit_func (errDesc, NULL, __LINE__) |
106 | #define libcurlErrorExit(ignore) _libcurlErrorExit_func(NULL, NULL, __LINE__) | 106 | #define libcurlErrorExit(ignore) _libcurlErrorExit_func (NULL, NULL, __LINE__) |
107 | #define libcurlErrorExitDesc(errDesc) \ | 107 | #define libcurlErrorExitDesc(errDesc) \ |
108 | _libcurlErrorExit_func(errDesc, NULL, __LINE__) | 108 | _libcurlErrorExit_func (errDesc, NULL, __LINE__) |
109 | #define mhdErrorExit(ignore) _mhdErrorExit_func(NULL, NULL, __LINE__) | 109 | #define mhdErrorExit(ignore) _mhdErrorExit_func (NULL, NULL, __LINE__) |
110 | #define mhdErrorExitDesc(errDesc) _mhdErrorExit_func(errDesc, NULL, __LINE__) | 110 | #define mhdErrorExitDesc(errDesc) _mhdErrorExit_func (errDesc, NULL, __LINE__) |
111 | #define checkCURLE_OK(libcurlcall) \ | 111 | #define checkCURLE_OK(libcurlcall) \ |
112 | _checkCURLE_OK_func((libcurlcall), _MHD_STRMACRO(libcurlcall), NULL, __LINE__) | 112 | _checkCURLE_OK_func ((libcurlcall), _MHD_STRMACRO (libcurlcall), NULL, \ |
113 | __LINE__) | ||
113 | #endif | 114 | #endif |
114 | 115 | ||
115 | 116 | ||
@@ -650,7 +651,7 @@ main (int argc, char *const *argv) | |||
650 | if (1) | 651 | if (1) |
651 | { | 652 | { |
652 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" | 653 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" |
653 | "URI with GET argements for Digest Auth.\n"); | 654 | "URI with GET arguments for Digest Auth.\n"); |
654 | fprintf (stderr, "This test cannot be performed.\n"); | 655 | fprintf (stderr, "This test cannot be performed.\n"); |
655 | exit (77); | 656 | exit (77); |
656 | } | 657 | } |
diff --git a/src/testcurl/test_digestauth_sha256.c b/src/testcurl/test_digestauth_sha256.c index ffa1f4c7..093fe263 100644 --- a/src/testcurl/test_digestauth_sha256.c +++ b/src/testcurl/test_digestauth_sha256.c | |||
@@ -306,7 +306,7 @@ main (int argc, char *const *argv) | |||
306 | if (1) | 306 | if (1) |
307 | { | 307 | { |
308 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" | 308 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" |
309 | "URI with GET argements for Digest Auth.\n"); | 309 | "URI with GET arguments for Digest Auth.\n"); |
310 | fprintf (stderr, "This test cannot be performed.\n"); | 310 | fprintf (stderr, "This test cannot be performed.\n"); |
311 | exit (77); | 311 | exit (77); |
312 | } | 312 | } |
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c index a5a8fb10..aabf1b7e 100644 --- a/src/testcurl/test_digestauth_with_arguments.c +++ b/src/testcurl/test_digestauth_with_arguments.c | |||
@@ -283,7 +283,7 @@ main (int argc, char *const *argv) | |||
283 | if (1) | 283 | if (1) |
284 | { | 284 | { |
285 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" | 285 | fprintf (stderr, "libcurl version 7.62.x has bug in processing" |
286 | "URI with GET argements for Digest Auth.\n"); | 286 | "URI with GET arguments for Digest Auth.\n"); |
287 | fprintf (stderr, "This test cannot be performed.\n"); | 287 | fprintf (stderr, "This test cannot be performed.\n"); |
288 | exit (77); | 288 | exit (77); |
289 | } | 289 | } |