Commit 5d415815 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

OS400: coding style standards

parent f68559c0

lib/setup-os400.h

+5 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
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 <netdb.h>
@@ -42,7 +42,8 @@ typedef unsigned long u_int32_t; 
#include <qsoasync.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,

                                   struct addrinfo * * res);

#define getaddrinfo             Curl_getaddrinfo_a
@@ -66,7 +67,8 @@ extern int Curl_SSL_Init_a(SSLInit * init); 
#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

packages/OS400/ccsidcurl.c

+15 −13
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ makeOS400IconvCode(char buf[ICONV_ID_SIZE], unsigned int ccsid) 




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];
@@ -407,7 +408,7 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid) 
     compiler seems to compare string values after substitution. */



#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



  /* 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)))

            ret = CURLE_OUT_OF_MEMORY;

          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 *));

            if(!cipt->certinfo)

              ret = CURLE_OUT_OF_MEMORY;
@@ -763,7 +765,7 @@ Curl_formadd_convert(struct curl_forms * forms, 
  forms[formx].value = cp;



  if(lengthx >= 0)

    forms[lengthx].value = (char *) l;  /* Update to length after conversion. */

    forms[lengthx].value = (char *) l;  /* Update length after conversion. */



  return l;

}

packages/OS400/ccsidcurl.h

+2 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ CURL_EXTERN char * curl_easy_unescape_ccsid(CURL * handle, const char * string, 
                                            int length, int * outlength,

                                            unsigned int sccsid,

                                            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,

                                                        unsigned int ccsid);

CURL_EXTERN time_t curl_getdate_ccsid(const char * p, const time_t * unused,

                                      unsigned int ccsid);

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,

                                                  unsigned int ccsid);

CURL_EXTERN const char * curl_share_strerror_ccsid(CURLSHcode error,

packages/OS400/os400sys.c

+116 −116
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ buffer_undef(localkey_t key, long size) 
  if(Curl_thread_buffer == buffer_undef) {      /* If unchanged during lock. */

    if(!pthread_key_create(&thdkey, thdbufdestroy))

      Curl_thread_buffer = buffer_threaded;

    else if (!(locbufs = calloc((size_t) LK_LAST,

                                             sizeof *locbufs))) {

    else if(!(locbufs = calloc((size_t) LK_LAST, sizeof *locbufs))) {

      pthread_mutex_unlock(&mutex);

      return (char *) NULL;

      }
@@ -949,7 +948,8 @@ Curl_gss_display_status_a(OM_uint32 * minor_status, OM_uint32 status_value, 




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_name_t target_name, gss_OID mech_type,

                            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)

    free(cp);



  /* Result data are binary in nature, so they haven't been converted to EBCDIC.

     Therefore do not convert. */

  /* Result data are binary in nature, so they haven't been

     converted to EBCDIC. Therefore do not convert. */



  return result;

}