curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-25 21:46:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

OS400: coding style standards

Browse Source
This commit is contained in:
Patrick Monnerat 2013-10-28 12:00:22 +01:00
parent f68559c086
commit 5d415815df
4 changed files with 138 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/setup-os400.h
View File

@ -33,7 +33,7 @@
typedef unsigned long u_int32_t; typedef unsigned long u_int32_t;
/* System API wrapper prototypes and definitions to support ASCII parameters. */ /* System API wrapper prototypes & definitions to support ASCII parameters. */
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
@ -42,7 +42,8 @@ typedef unsigned long u_int32_t;
#include <qsoasync.h> #include <qsoasync.h>
#include <gssapi.h> #include <gssapi.h>
extern int Curl_getaddrinfo_a(const char * nodename, const char * servname, extern int Curl_getaddrinfo_a(const char * nodename,
const char * servname,
const struct addrinfo * hints, const struct addrinfo * hints,
struct addrinfo * * res); struct addrinfo * * res);
#define getaddrinfo Curl_getaddrinfo_a #define getaddrinfo Curl_getaddrinfo_a
@ -66,7 +67,8 @@ extern int Curl_SSL_Init_a(SSLInit * init);
#define SSL_Init Curl_SSL_Init_a #define SSL_Init Curl_SSL_Init_a
extern char * Curl_SSL_Strerror_a(int sslreturnvalue, SSLErrorMsg * serrmsgp); extern char * Curl_SSL_Strerror_a(int sslreturnvalue,
SSLErrorMsg * serrmsgp);
#define SSL_Strerror Curl_SSL_Strerror_a #define SSL_Strerror Curl_SSL_Strerror_a

10
packages/OS400/ccsidcurl.c
View File

@ -77,7 +77,8 @@ makeOS400IconvCode(char buf[ICONV_ID_SIZE], unsigned int ccsid)
static iconv_t static iconv_t
iconv_open_CCSID(unsigned int ccsidout, unsigned int ccsidin, unsigned int cstr) iconv_open_CCSID(unsigned int ccsidout, unsigned int ccsidin,
unsigned int cstr)
{ {
char fromcode[ICONV_ID_SIZE]; char fromcode[ICONV_ID_SIZE];
@ -407,7 +408,7 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
compiler seems to compare string values after substitution. */ compiler seems to compare string values after substitution. */
#if CURLVERSION_NOW != CURLVERSION_FOURTH #if CURLVERSION_NOW != CURLVERSION_FOURTH
#error curl_version_info_data structure has changed: upgrade this procedure too. #error curl_version_info_data structure has changed: upgrade this procedure.
#endif #endif
/* If caller has been compiled with a new version, error. */ /* If caller has been compiled with a new version, error. */
@ -653,7 +654,8 @@ curl_easy_getinfo_ccsid(CURL * curl, CURLINFO info, ...)
if(!(cipt = (struct curl_certinfo *) malloc(sizeof *cipt))) if(!(cipt = (struct curl_certinfo *) malloc(sizeof *cipt)))
ret = CURLE_OUT_OF_MEMORY; ret = CURLE_OUT_OF_MEMORY;
else { else {
cipt->certinfo = (struct curl_slist * *) calloc(cipf->num_of_certs + cipt->certinfo = (struct curl_slist * *)
calloc(cipf->num_of_certs +
1, sizeof(struct curl_slist *)); 1, sizeof(struct curl_slist *));
if(!cipt->certinfo) if(!cipt->certinfo)
ret = CURLE_OUT_OF_MEMORY; ret = CURLE_OUT_OF_MEMORY;
@ -763,7 +765,7 @@ Curl_formadd_convert(struct curl_forms * forms,
forms[formx].value = cp; forms[formx].value = cp;
if(lengthx >= 0) if(lengthx >= 0)
forms[lengthx].value = (char *) l; /* Update to length after conversion. */ forms[lengthx].value = (char *) l; /* Update length after conversion. */
return l; return l;
} }

4
packages/OS400/ccsidcurl.h
View File

@ -38,13 +38,13 @@ CURL_EXTERN char * curl_easy_unescape_ccsid(CURL * handle, const char * string,
int length, int * outlength, int length, int * outlength,
unsigned int sccsid, unsigned int sccsid,
unsigned int dccsid); unsigned int dccsid);
CURL_EXTERN struct curl_slist * curl_slist_append_ccsid(struct curl_slist * lst, CURL_EXTERN struct curl_slist * curl_slist_append_ccsid(struct curl_slist * l,
const char * data, const char * data,
unsigned int ccsid); unsigned int ccsid);
CURL_EXTERN time_t curl_getdate_ccsid(const char * p, const time_t * unused, CURL_EXTERN time_t curl_getdate_ccsid(const char * p, const time_t * unused,
unsigned int ccsid); unsigned int ccsid);
CURL_EXTERN curl_version_info_data * curl_version_info_ccsid(CURLversion stamp, CURL_EXTERN curl_version_info_data * curl_version_info_ccsid(CURLversion stamp,
unsigned int csid); unsigned int cid);
CURL_EXTERN const char * curl_easy_strerror_ccsid(CURLcode error, CURL_EXTERN const char * curl_easy_strerror_ccsid(CURLcode error,
unsigned int ccsid); unsigned int ccsid);
CURL_EXTERN const char * curl_share_strerror_ccsid(CURLSHcode error, CURL_EXTERN const char * curl_share_strerror_ccsid(CURLSHcode error,

10
packages/OS400/os400sys.c
View File

@ -229,8 +229,7 @@ buffer_undef(localkey_t key, long size)
if(Curl_thread_buffer == buffer_undef) { /* If unchanged during lock. */ if(Curl_thread_buffer == buffer_undef) { /* If unchanged during lock. */
if(!pthread_key_create(&thdkey, thdbufdestroy)) if(!pthread_key_create(&thdkey, thdbufdestroy))
Curl_thread_buffer = buffer_threaded; Curl_thread_buffer = buffer_threaded;
else if (!(locbufs = calloc((size_t) LK_LAST, else if(!(locbufs = calloc((size_t) LK_LAST, sizeof *locbufs))) {
sizeof *locbufs))) {
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
return (char *) NULL; return (char *) NULL;
} }
@ -949,7 +948,8 @@ Curl_gss_display_status_a(OM_uint32 * minor_status, OM_uint32 status_value,
OM_uint32 OM_uint32
Curl_gss_init_sec_context_a(OM_uint32 * minor_status, gss_cred_id_t cred_handle, Curl_gss_init_sec_context_a(OM_uint32 * minor_status,
gss_cred_id_t cred_handle,
gss_ctx_id_t * context_handle, gss_ctx_id_t * context_handle,
gss_name_t target_name, gss_OID mech_type, gss_name_t target_name, gss_OID mech_type,
gss_flags_t req_flags, OM_uint32 time_req, gss_flags_t req_flags, OM_uint32 time_req,
@ -1219,8 +1219,8 @@ Curl_ldap_get_values_len_a(void * ld, LDAPMessage * entry, const char * attr)
if(cp) if(cp)
free(cp); free(cp);
/* Result data are binary in nature, so they haven't been converted to EBCDIC. /* Result data are binary in nature, so they haven't been
Therefore do not convert. */ converted to EBCDIC. Therefore do not convert. */
return result; return result;
} }