[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 200/254: typecheck-gcc.h: separate getinfo slist ch
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 200/254: typecheck-gcc.h: separate getinfo slist checks from other pointers |
Date: |
Sat, 17 Jun 2017 16:53:52 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.1
in repository gnurl.
commit 5fe4f7890221b6ff12967af83ce0f14c05f1e2b0
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jun 1 14:47:18 2017 +0200
typecheck-gcc.h: separate getinfo slist checks from other pointers
Fixes #1524
---
docs/libcurl/symbols-in-versions | 1 +
include/curl/curl.h | 7 ++++---
include/curl/typecheck-gcc.h | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index 6ac8869ca..75c6e07d8 100644
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -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
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 103071264..ddba98c4b 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -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,
diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index fd2c844dc..ecc9dfb94 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -367,8 +367,8 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_socket,
(CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
/* true if info expects a pointer to struct curl_slist * argument */
-#define _curl_is_slist_info(info) \
- (CURLINFO_SLIST < (info) && (info) < CURLINFO_SOCKET)
+#define _curl_is_slist_info(info) \
+ (((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) \
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 214/254: updatemanpages.pl: error out on too old git version, (continued)
- [GNUnet-SVN] [gnurl] 214/254: updatemanpages.pl: error out on too old git version, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 148/254: mkhelp.pl: do not add current time into curl binary, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 164/254: LDAP: using ldap_bind_s on Windows with methods (#878), gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 234/254: metalink: remove unused printf() argument, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 153/254: tests: stabilize test 1034, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 238/254: asyn-ares: s/Curl_expire_latest/Curl_expire, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 235/254: file: make speedcheck use current time for checks, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 156/254: cmake: add CURL_CA_BUNDLE/CURL_CA_FALLBACK/CURL_CA_PATH options, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 183/254: docs: clarify NO_PROXY further, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 237/254: expire: remove Curl_expire_latest(), gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 200/254: typecheck-gcc.h: separate getinfo slist checks from other pointers,
gnunet <=
- [GNUnet-SVN] [gnurl] 218/254: libtest: fix int-in-bool-context warnings, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 244/254: RELEASE-PROCEDURE: updated future release dates, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 249/254: urlglob: fix division by zero, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 175/254: opts: more examples added in option man pages, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 251/254: libressl: OCSP and intermediate certs workaround no longer needed, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 80/254: typecheck-gcc: add support for CURLINFO_SOCKET, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 104/254: tftp: silence bad-function-cast warning, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 107/254: sendrecv: fix MinGW-w64 warning, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 152/254: ssh: ignore timeouts during disconnect, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 211/254: dedotdot: fixed output for ".." and "." only input, gnunet, 2017/06/17