diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 22 | ||||
| -rw-r--r-- | packages/OS400/os400sys.c | 19 | ||||
| -rw-r--r-- | packages/vms/config_h.com | 13 |
3 files changed, 16 insertions, 38 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index fd3b5f073..4b462a273 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -620,12 +620,7 @@ curl_easy_getinfo_ccsid(CURL *curl, CURLINFO info, ...) va_list arg; void *paramp; CURLcode ret; - unsigned int ccsid; - char * * cpp; struct Curl_easy * data; - struct curl_slist * * slp; - struct curl_certinfo * cipf; - struct curl_certinfo * cipt; /* WARNING: unlike curl_easy_getinfo(), the strings returned by this procedure have to be free'ed. */ @@ -635,7 +630,13 @@ curl_easy_getinfo_ccsid(CURL *curl, CURLINFO info, ...) paramp = va_arg(arg, void *); ret = Curl_getinfo(data, info, paramp); - if(ret == CURLE_OK) + if(ret == CURLE_OK) { + unsigned int ccsid; + char **cpp; + struct curl_slist **slp; + struct curl_certinfo *cipf; + struct curl_certinfo *cipt; + switch((int) info & CURLINFO_TYPEMASK) { case CURLINFO_STRING: @@ -706,6 +707,7 @@ curl_easy_getinfo_ccsid(CURL *curl, CURLINFO info, ...) break; } } + } va_end(arg); return ret; @@ -1312,12 +1314,9 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...) case CURLOPT_ERRORBUFFER: /* This is an output buffer. */ default: - { - long val = va_arg(arg, long); - result = curl_easy_setopt(curl, tag, val); + result = Curl_vsetopt(curl, tag, arg); break; } - } va_end(arg); return result; @@ -1355,13 +1354,12 @@ curl_pushheader_byname_ccsid(struct curl_pushheaders *h, const char *header, { char *d = (char *) NULL; - char *s; if(header) { header = dynconvert(ASCII_CCSID, header, -1, ccsidin); if(header) { - s = curl_pushheader_byname(h, header); + char *s = curl_pushheader_byname(h, header); free((char *) header); if(s) diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c index 309ff4d94..85dd20e40 100644 --- a/packages/OS400/os400sys.c +++ b/packages/OS400/os400sys.c @@ -268,13 +268,9 @@ Curl_getnameinfo_a(const struct sockaddr * sa, curl_socklen_t salen, int flags) { - char * enodename; - char * eservname; + char *enodename = NULL; + char *eservname = NULL; int status; - int i; - - enodename = (char *) NULL; - eservname = (char *) NULL; if(nodename && nodenamelen) { enodename = malloc(nodenamelen); @@ -294,6 +290,7 @@ Curl_getnameinfo_a(const struct sockaddr * sa, curl_socklen_t salen, eservname, servnamelen, flags); if(!status) { + int i; if(enodename) { i = QadrtConvertE2A(nodename, enodename, nodenamelen - 1, strlen(enodename)); @@ -766,16 +763,13 @@ static int Curl_gss_convert_in_place(OM_uint32 * minor_status, gss_buffer_t buf) { - unsigned int i; - char * t; + unsigned int i = buf->length; /* Convert `buf' in place, from EBCDIC to ASCII. If error, release the buffer and return -1. Else return 0. */ - i = buf->length; - if(i) { - t = malloc(i); + char *t = malloc(i); if(!t) { gss_release_buffer(minor_status, buf); @@ -865,7 +859,6 @@ Curl_gss_init_sec_context_a(OM_uint32 * minor_status, { int rc; - unsigned int i; gss_buffer_desc in; gss_buffer_t inp; @@ -874,7 +867,7 @@ Curl_gss_init_sec_context_a(OM_uint32 * minor_status, if(inp) { if(inp->length && inp->value) { - i = inp->length; + unsigned int i = inp->length; in.value = malloc(i + 1); if(!in.value) { diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index 0f1fa0f62..967eb40de 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -825,19 +825,6 @@ $ endif $ goto cfgh_in_loop1 $ endif $! -$ if key2 .eqs. "HAVE_SSL_GET_SHUTDOWN" -$ then -$ if f$search("''ssl_header_dir'ssl.h") .nes. "" -$ then -$ write tf "#ifndef ''key2'" -$ write tf "#define ''key2' 1" -$ write tf "#endif" -$ else -$ write tf "/* #undef ''key2' */" -$ endif -$ goto cfgh_in_loop1 -$ endif -$! $ if key2b .eqs. "RAND" .and. key2c .nes. "" .and. key2d .eqs. "" $ then $ if (key2c .eqs. "EGD") .or. - |