Commit 2ef7a28a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

include: cleanup 

Made the public headers checksrc compliant

Removed types.h (it's been unused since April 2004)

Made the root makefile do make in include by default as well, so that
TAGS and the checksrc will work better.
parent 2a02c07a

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ 


bin_SCRIPTS = curl-config



SUBDIRS = lib src

DIST_SUBDIRS = $(SUBDIRS) tests include packages docs

SUBDIRS = lib src include

DIST_SUBDIRS = $(SUBDIRS) tests packages docs



pkgconfigdir = $(libdir)/pkgconfig

pkgconfig_DATA = libcurl.pc

include/curl/Makefile.am

+8 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#

###########################################################################

pkginclude_HEADERS = \

	curl.h curlver.h easy.h mprintf.h stdcheaders.h types.h multi.h \

	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \

	typecheck-gcc.h curlbuild.h curlrules.h



pkgincludedir= $(includedir)/curl
@@ -44,3 +44,10 @@ EXTRA_DIST = curlbuild.h.in 


DISTCLEANFILES = curlbuild.h



checksrc:

	@@PERL@ $(top_srcdir)/lib/checksrc.pl -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST)



if CURLDEBUG

# for debug builds, we scan the sources on all regular make invokes

all-local: checksrc

endif

include/curl/curl.h

+7 −6
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ typedef enum { 
                                    7.19.0) */

  CURLE_FTP_PRET_FAILED,         /* 84 - a PRET command failed */

  CURLE_RTSP_CSEQ_ERROR,         /* 85 - mismatch of RTSP CSeq numbers */

  CURLE_RTSP_SESSION_ERROR,      /* 86 - mismatch of RTSP Session Identifiers */

  CURLE_RTSP_SESSION_ERROR,      /* 86 - mismatch of RTSP Session Ids */

  CURLE_FTP_BAD_FILE_LIST,       /* 87 - unable to parse FTP file list */

  CURLE_CHUNK_FAILED,            /* 88 - chunk callback reported error */
@@ -755,7 +755,7 @@ typedef enum { 
#endif



#ifdef CURL_ISOCPP

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

#define CINIT(na,t,nu) CURLOPT_ ## na = CURLOPTTYPE_ ## t + nu

#else

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

#define LONG          CURLOPTTYPE_LONG
@@ -924,7 +924,7 @@ typedef enum { 
  CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */

  CINIT(UPLOAD, LONG, 46),       /* this is an upload */

  CINIT(POST, LONG, 47),         /* HTTP POST method */

  CINIT(DIRLISTONLY, LONG, 48),  /* return bare names when listing directories */

  CINIT(DIRLISTONLY, LONG, 48),  /* bare names when listing directories */



  CINIT(APPEND, LONG, 50),       /* Append instead of overwrite on upload! */
@@ -1118,8 +1118,8 @@ typedef enum { 
     and password to whatever host the server decides. */

  CINIT(UNRESTRICTED_AUTH, LONG, 105),



  /* Specifically switch on or off the FTP engine's use of the EPRT command ( it

     also disables the LPRT attempt). By default, those ones will always be

  /* Specifically switch on or off the FTP engine's use of the EPRT command (

     it also disables the LPRT attempt). By default, those ones will always be

     attempted before the good old traditional PORT command. */

  CINIT(FTP_USE_EPRT, LONG, 106),
@@ -1703,7 +1703,8 @@ CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost, 
 * 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);

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

                                        size_t len);



/*

 * NAME curl_formget()

include/curl/curlbuild.h.in

+11 −11
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

include/curl/typecheck-gcc.h

+62 −56
Original line number Diff line number Diff line
@@ -149,7 +149,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")
@@ -160,7 +161,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")
@@ -173,9 +175,11 @@ _CURL_WARNING(_curl_easy_setopt_err_conv_cb, 
_CURL_WARNING(_curl_easy_setopt_err_seek_cb,

  "curl_easy_setopt expects a curl_seek_callback argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_cb_data,

  "curl_easy_setopt expects a private data pointer as argument for this option")

              "curl_easy_setopt expects a "

              "private data pointer as argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_error_buffer,

  "curl_easy_setopt expects a char buffer of CURL_ERROR_SIZE as argument for this option")

              "curl_easy_setopt expects a "

              "char buffer of CURL_ERROR_SIZE as argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_FILE,

  "curl_easy_setopt expects a FILE* argument for this option")

_CURL_WARNING(_curl_easy_setopt_err_postfields,
@@ -481,7 +485,8 @@ typedef int (_curl_sockopt_callback1)(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" */

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

   "similar" */

#define _curl_is_opensocket_cb(expr)                                    \

  (_curl_is_NULL(expr) ||                                                     \

   __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\
@@ -550,7 +555,8 @@ typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *); 
typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);

typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);

typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);

typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX, const void *);

typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,

                                           const void *);

#else

typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;

typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;