Commit 5fe4f789 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

typecheck-gcc.h: separate getinfo slist checks from other pointers 

Fixes #1524
parent 5e796c5e

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ CURLINFO_PRIVATE 7.10.3 
CURLINFO_PROTOCOL               7.52.0

CURLINFO_PROXYAUTH_AVAIL        7.10.8

CURLINFO_PROXY_SSL_VERIFYRESULT 7.52.0

CURLINFO_PTR                    7.54.1

CURLINFO_REDIRECT_COUNT         7.9.7

CURLINFO_REDIRECT_TIME          7.9.7

CURLINFO_REDIRECT_URL           7.18.2

include/curl/curl.h

+4 −3
Original line number Diff line number Diff line
@@ -2251,6 +2251,7 @@ struct curl_tlssessioninfo { 
#define CURLINFO_LONG     0x200000

#define CURLINFO_DOUBLE   0x300000

#define CURLINFO_SLIST    0x400000

#define CURLINFO_PTR      0x400000 /* same as SLIST */

#define CURLINFO_SOCKET   0x500000

#define CURLINFO_MASK     0x0fffff

#define CURLINFO_TYPEMASK 0xf00000
@@ -2290,7 +2291,7 @@ typedef enum { 
  CURLINFO_REDIRECT_URL     = CURLINFO_STRING + 31,

  CURLINFO_PRIMARY_IP       = CURLINFO_STRING + 32,

  CURLINFO_APPCONNECT_TIME  = CURLINFO_DOUBLE + 33,

  CURLINFO_CERTINFO         = CURLINFO_SLIST  + 34,

  CURLINFO_CERTINFO         = CURLINFO_PTR    + 34,

  CURLINFO_CONDITION_UNMET  = CURLINFO_LONG   + 35,

  CURLINFO_RTSP_SESSION_ID  = CURLINFO_STRING + 36,

  CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG   + 37,
@@ -2299,9 +2300,9 @@ typedef enum { 
  CURLINFO_PRIMARY_PORT     = CURLINFO_LONG   + 40,

  CURLINFO_LOCAL_IP         = CURLINFO_STRING + 41,

  CURLINFO_LOCAL_PORT       = CURLINFO_LONG   + 42,

  CURLINFO_TLS_SESSION      = CURLINFO_SLIST  + 43,

  CURLINFO_TLS_SESSION      = CURLINFO_PTR    + 43,

  CURLINFO_ACTIVESOCKET     = CURLINFO_SOCKET + 44,

  CURLINFO_TLS_SSL_PTR      = CURLINFO_SLIST  + 45,

  CURLINFO_TLS_SSL_PTR      = CURLINFO_PTR    + 45,

  CURLINFO_HTTP_VERSION     = CURLINFO_LONG   + 46,

  CURLINFO_PROXY_SSL_VERIFYRESULT = CURLINFO_LONG + 47,

  CURLINFO_PROTOCOL         = CURLINFO_LONG   + 48,

include/curl/typecheck-gcc.h

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

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

 *

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

 * Copyright (C) 1998 - 2017, 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
@@ -368,7 +368,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_socket, 


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

#define _curl_is_slist_info(info)                                       \

  (CURLINFO_SLIST < (info) && (info) < CURLINFO_SOCKET)

  (((info) == CURLINFO_SSL_ENGINES) || ((info) == CURLINFO_COOKIELIST))



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

#define _curl_is_socket_info(info)                                            \