moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

ccsidcurl: fix the compile errors 

Looks like the declaration of cpp shoule be const char ** and return
null if convert_version_info_string fails.

Fixes #7134
Closes #7135
This commit is contained in:
jonrumsey 2021-05-26 17:03:32 +01:00 committed by Daniel Stenberg
parent 3976dd67a2
commit 9655474548
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/OS400/ccsidcurl.c
View File

@ -396,7 +396,7 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
int nproto; int nproto;
curl_version_info_data *id; curl_version_info_data *id;
int i; int i;
const char *cpp; const char **cpp;
static const size_t charfields[] = { static const size_t charfields[] = {
offsetof(curl_version_info_data, version), offsetof(curl_version_info_data, version),
offsetof(curl_version_info_data, host), offsetof(curl_version_info_data, host),
@ -485,8 +485,8 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
for(i = 0; i < sizeof(charfields) / sizeof(charfields[0]); i++) { for(i = 0; i < sizeof(charfields) / sizeof(charfields[0]); i++) {
cpp = (const char **) ((char *) p + charfields[i]); cpp = (const char **) ((char *) p + charfields[i]);
if(*cpp) if (*cpp && convert_version_info_string(cpp, &cp, &n, ccsid))
if(convert_version_info_string(cpp, &cp, &n, ccsid)) return (curl_version_info_data *) NULL;
} }
return id; return id;