moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

OS400: Update strings for ccsid-ifier

Browse Source 
Fixes build.

Closes #5132
This commit is contained in:
Calvin Buckley 2020-03-21 19:54:16 +01:00 committed by Daniel Stenberg
parent 3d1fcf6cd8
commit a08425444b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/OS400/ccsidcurl.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -1148,6 +1148,9 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...)
case CURLOPT_CUSTOMREQUEST:
case CURLOPT_DEFAULT_PROTOCOL:
case CURLOPT_DNS_SERVERS:
case CURLOPT_DNS_INTERFACE:
case CURLOPT_DNS_LOCAL_IP4:
case CURLOPT_DNS_LOCAL_IP6:
case CURLOPT_DOH_URL:
case CURLOPT_EGDSOCKET:
case CURLOPT_ENCODING:

10
packages/OS400/chkstrings.c
View File

@ -28,13 +28,13 @@
/* The following defines indicate the expected dupstring enum values
* in curl_easy_setopt_ccsid() in packages/OS400/ccsidcurl.c. If a
* mismatch is flagged during the build, it indicates that curl_easy_setopt_ccsid()
* may need updating to perform data EBCDIC to ASCII data conversion on
* may need updating to perform data EBCDIC to ASCII data conversion on
* the string.
* Once any applicable changes to curl_easy_setopt_ccsid() have been
* made, the EXPECTED_STRING_LASTZEROTERMINATED/EXPECTED_STRING_LAST
* values can be updated to match the latest enum values in urldata.h.
*/
#define EXPECTED_STRING_LASTZEROTERMINATED (STRING_TEMP_URL + 1)
#define EXPECTED_STRING_LASTZEROTERMINATED (STRING_DNS_LOCAL_IP6 + 1)
#define EXPECTED_STRING_LAST (STRING_COPYPOSTFIELDS + 1)
int main(int argc, char *argv[])
@ -43,13 +43,13 @@ int main(int argc, char *argv[])
if (STRING_LASTZEROTERMINATED != EXPECTED_STRING_LASTZEROTERMINATED)
{
fprintf(stderr,"STRING_LASTZEROTERMINATED(%d) is not expected value(%d).\n",
fprintf(stderr,"STRING_LASTZEROTERMINATED(%d) is not expected value(%d).\n",
STRING_LASTZEROTERMINATED, EXPECTED_STRING_LASTZEROTERMINATED);
rc += 1;
}
if (STRING_LAST != EXPECTED_STRING_LAST)
{
fprintf(stderr,"STRING_LAST(%d) is not expected value(%d).\n",
fprintf(stderr,"STRING_LAST(%d) is not expected value(%d).\n",
STRING_LAST, EXPECTED_STRING_LAST);
rc += 2;
}
@ -59,4 +59,4 @@ int main(int argc, char *argv[])
" may need updating if new strings are provided as input via the curl API.\n");
}
return rc;
}
}