Commit 24bf52bc authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

Adapting last changes to OS400: 

_ Updated packages/OS400/curl.inc.in with new definitions.
_ New connect/bind/sendto/recvfrom wrappers to support AF_UNIX sockets.
_ Include files line length shortened below 100 chars.
_ Const parameter in lib/qssl.[ch].
_ Typos in packages/OS400/initscript.sh.
parent 862049c4

include/curl/curl.h

+12 −6
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
 * Define WIN32 when build target is Win32 API

 */



#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) && !defined(__SYMBIAN32__)

#if (defined(_WIN32) || defined(__WIN32__)) && \

     !defined(WIN32) && !defined(__SYMBIAN32__)

#define WIN32

#endif
@@ -62,7 +63,8 @@ 
/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish

   libc5-based Linux systems. Only include it on system that are known to

   require it! */

#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || defined(__minix) || defined(__SYMBIAN32__)

#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \

    defined(__minix) || defined(__SYMBIAN32__)

#include <sys/select.h>

#endif
@@ -89,7 +91,8 @@ typedef void CURL; 
 * Decorate exportable functions for Win32 and Symbian OS DLL linking.

 * This avoids using a .def file for building libcurl.dll.

 */

#if (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)) && !defined(CURL_STATICLIB)

#if (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)) && \

     !defined(CURL_STATICLIB)

#if defined(BUILDING_LIBCURL)

#define CURL_EXTERN  __declspec(dllexport)

#else
@@ -118,7 +121,8 @@ typedef void CURL; 
 * Note: "pocc -Ze" is MSVC compatibility mode and this sets _MSC_VER!

 */



#if (defined(_MSC_VER) && !defined(__POCC__)) || (defined(__LCC__) && defined(WIN32))

#if (defined(_MSC_VER) && !defined(__POCC__)) || (defined(__LCC__) && \

     defined(WIN32))

/* MSVC */

#ifdef _WIN32_WCE

  typedef long curl_off_t;
@@ -1379,9 +1383,11 @@ CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost, 


/*

 * callback function for curl_formget()

 * The void *arg pointer will be the one passed as second argument to curl_formget().

 * The void *arg pointer will be the one passed as second argument to

 *   curl_formget().

 * The character buffer passed to it must not be freed.

 * Should return the buffer length passed to it as the argument "len" on success.

 * Should return the buffer length passed to it as the argument "len" on

 *   success.

 */

typedef size_t (*curl_formget_callback)(void *arg, const char *buf, size_t len);

include/curl/mprintf.h

+4 −2
Original line number Diff line number Diff line
@@ -35,11 +35,13 @@ extern "C" { 
CURL_EXTERN int curl_mprintf(const char *format, ...);

CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);

CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);

CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);

CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,

                               const char *format, ...);

CURL_EXTERN int curl_mvprintf(const char *format, va_list args);

CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);

CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);

CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);

CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,

                                const char *format, va_list args);

CURL_EXTERN char *curl_maprintf(const char *format, ...);

CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);

include/curl/multi.h

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle, 
#undef CINIT /* re-using the same name as in curl.h */



#ifdef CURL_ISOCPP

#define CINIT(name,type,number) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + number

#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num

#else

/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */

#define LONG          CURLOPTTYPE_LONG

include/curl/typecheck-gcc.h

+11 −6
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ _CURL_WARNING(_curl_easy_setopt_err_long, 
_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,

  "curl_easy_setopt expects a curl_off_t argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_string,

  "curl_easy_setopt expects a string (char* or char[]) argument for this option")

  "curl_easy_setopt expects a string (char* or char[]) argument for this option"

  )

_CURL_WARNING(_curl_easy_setopt_err_write_callback,

  "curl_easy_setopt expects a curl_write_callback argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_read_cb,
@@ -137,7 +138,8 @@ _CURL_WARNING(_curl_easy_setopt_err_ioctl_cb, 
_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,

  "curl_easy_setopt expects a curl_sockopt_callback argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,

  "curl_easy_setopt expects a curl_opensocket_callback argument for this option")

  "curl_easy_setopt expects a curl_opensocket_callback argument for this option"

  )

_CURL_WARNING(_curl_easy_setopt_err_progress_cb,

  "curl_easy_setopt expects a curl_progress_callback argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
@@ -280,7 +282,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist, 
#define _curl_is_double_info(info)                                            \

  (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)



/* evaluates to true if info expects a pointer to struct curl_slist * argument */

/* true if info expects a pointer to struct curl_slist * argument */

#define _curl_is_slist_info(info)                                             \

  (CURLINFO_SLIST < (info))
@@ -408,10 +410,12 @@ typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE*); 
   _curl_callback_compatible((expr), _curl_write_callback5) ||                \

   _curl_callback_compatible((expr), _curl_write_callback6))

typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void*);

typedef size_t (_curl_write_callback2)(const char *, size_t, size_t, const void*);

typedef size_t (_curl_write_callback2)(const char *, size_t, size_t,

                                       const void*);

typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE*);

typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void*);

typedef size_t (_curl_write_callback5)(const void *, size_t, size_t, const void*);

typedef size_t (_curl_write_callback5)(const void *, size_t, size_t,

                                       const void*);

typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE*);



/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
@@ -434,7 +438,8 @@ typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void*); 
   _curl_callback_compatible((expr), _curl_sockopt_callback1) ||              \

   _curl_callback_compatible((expr), _curl_sockopt_callback2))

typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);

typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t, curlsocktype);

typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t,

                                      curlsocktype);



/* evaluates to true if expr is of type curl_opensocket_callback or "similar" */

#define _curl_is_opensocket_cb(expr)                                    \

lib/config-os400.h

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,9 @@ 
/* Define if you have the <sys/types.h> header file. */

#define HAVE_SYS_TYPES_H



/* Define if you have the <sys/un.h> header file. */

#define HAVE_SYS_UN_H



/* Define if you have the <sys/ioctl.h> header file. */

#define HAVE_SYS_IOCTL_H
@@ -379,6 +382,9 @@ 


#define SIZEOF_CURL_OFF_T 8



/* Define this if you have struct sockaddr_storage */

#define HAVE_STRUCT_SOCKADDR_STORAGE



/* Define if you have the ANSI C header files. */

#define STDC_HEADERS