[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 165/205: nss: fix build after e60fe20fdf94e829ba5fc
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 165/205: nss: fix build after e60fe20fdf94e829ba5fce33f7a9d6c281149f7d |
Date: |
Thu, 20 Apr 2017 16:21:45 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit c59fcdac909cb013943f5d46543c8426b06ccf4f
Author: Marcel Raad <address@hidden>
AuthorDate: Wed Apr 5 23:25:28 2017 +0200
nss: fix build after e60fe20fdf94e829ba5fce33f7a9d6c281149f7d
Curl_llist_alloc is now Curl_llist_init.
Closes https://github.com/curl/curl/pull/1391
---
lib/urldata.h | 2 +-
lib/vtls/nss.c | 23 ++++++++---------------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/lib/urldata.h b/lib/urldata.h
index fa6d4e0fc..bd7d25d2f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -316,7 +316,7 @@ struct ssl_connect_data {
PRFileDesc *handle;
char *client_nickname;
struct Curl_easy *data;
- struct curl_llist *obj_list;
+ struct curl_llist obj_list;
PK11GenericObject *obj_clicert;
#elif defined(USE_GSKIT)
gsk_handle handle;
diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index a09f457f8..0149d7e37 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -81,7 +81,7 @@ PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
static PRLock *nss_initlock = NULL;
static PRLock *nss_crllock = NULL;
static PRLock *nss_findslot_lock = NULL;
-static struct curl_llist *nss_crl_list = NULL;
+static struct curl_llist nss_crl_list;
static NSSInitContext *nss_context = NULL;
static volatile int initialized = 0;
@@ -413,7 +413,7 @@ static CURLcode nss_create_object(struct ssl_connect_data
*ssl,
if(!obj)
return result;
- if(!Curl_llist_insert_next(ssl->obj_list, ssl->obj_list->tail, obj)) {
+ if(!Curl_llist_insert_next(&ssl->obj_list, ssl->obj_list.tail, obj)) {
PK11_DestroyGenericObject(obj);
return CURLE_OUT_OF_MEMORY;
}
@@ -496,7 +496,7 @@ static CURLcode nss_cache_crl(SECItem *crl_der)
PR_Lock(nss_crllock);
/* store the CRL item so that we can free it in Curl_nss_cleanup() */
- if(!Curl_llist_insert_next(nss_crl_list, nss_crl_list->tail, crl_der)) {
+ if(!Curl_llist_insert_next(&nss_crl_list, nss_crl_list.tail, crl_der)) {
SECITEM_FreeItem(crl_der, PR_TRUE);
PR_Unlock(nss_crllock);
return CURLE_OUT_OF_MEMORY;
@@ -1227,9 +1227,7 @@ static CURLcode nss_init(struct Curl_easy *data)
return CURLE_OK;
/* list of all CRL items we need to destroy in Curl_nss_cleanup() */
- nss_crl_list = Curl_llist_alloc(nss_destroy_crl_item);
- if(!nss_crl_list)
- return CURLE_OUT_OF_MEMORY;
+ Curl_llist_init(&nss_crl_list, nss_destroy_crl_item);
/* First we check if $SSL_DIR points to a valid dir */
cert_dir = getenv("SSL_DIR");
@@ -1336,8 +1334,7 @@ void Curl_nss_cleanup(void)
}
/* destroy all CRL items */
- Curl_llist_destroy(nss_crl_list, NULL);
- nss_crl_list = NULL;
+ Curl_llist_destroy(&nss_crl_list, NULL);
PR_Unlock(nss_initlock);
@@ -1385,8 +1382,7 @@ static void nss_close(struct ssl_connect_data *connssl)
connssl->client_nickname = NULL;
/* destroy all NSS objects in order to avoid failure of NSS shutdown */
- Curl_llist_destroy(connssl->obj_list, NULL);
- connssl->obj_list = NULL;
+ Curl_llist_destroy(&connssl->obj_list, NULL);
connssl->obj_clicert = NULL;
if(connssl->handle) {
@@ -1636,8 +1632,7 @@ static CURLcode nss_fail_connect(struct ssl_connect_data
*connssl,
}
/* cleanup on connection failure */
- Curl_llist_destroy(connssl->obj_list, NULL);
- connssl->obj_list = NULL;
+ Curl_llist_destroy(&connssl->obj_list, NULL);
return curlerr;
}
@@ -1678,9 +1673,7 @@ static CURLcode nss_setup_connect(struct connectdata
*conn, int sockindex)
connssl->data = data;
/* list of all NSS objects we need to destroy in Curl_nss_close() */
- connssl->obj_list = Curl_llist_alloc(nss_destroy_object);
- if(!connssl->obj_list)
- return CURLE_OUT_OF_MEMORY;
+ Curl_llist_init(&connssl->obj_list, nss_destroy_object);
/* FIXME. NSS doesn't support multiple databases open at the same time. */
PR_Lock(nss_initlock);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 168/205: test1606: verify speedcheck, (continued)
- [GNUnet-SVN] [gnurl] 168/205: test1606: verify speedcheck, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 128/205: cmake: add more missing files to the dist, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 97/205: cmake: build manual pages (including curl.1), gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 106/205: openssl: fall back on SSL_ERROR_* string when no error detail, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 136/205: ssh: fix narrowing conversion warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 141/205: CTestConfig.cmake: removed, unused, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 139/205: docs/index.html: removed, was not shipped anyway, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 173/205: BUGS: "Bugs in old versions", gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 158/205: tests: added test for Curl_splaygetbest to unit1309, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 146/205: tests/server/util: remove in6addr_any for recent MinGW, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 165/205: nss: fix build after e60fe20fdf94e829ba5fce33f7a9d6c281149f7d,
gnunet <=
- [GNUnet-SVN] [gnurl] 187/205: tests/server/util: prefer <poll.h> over <sys/poll.h>, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 153/205: RELEASE-NOTES: synced with 4f2e348f9b42c69c480, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 190/205: mbedtls: fix memory leak in error path, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 189/205: curl-compilers.m4: turn implicit function declarations into errors, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 172/205: system.h: add section for tcc, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 200/205: openssl: don't try to print nonexistant peer private keys, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 188/205: test1541: also test for CURL_PULL_WS2TCPIP_H, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 205/205: Patchset for gnURL microfork: * Patches to rename libcurl to libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm which can be used to build this with guix prior to installing it. (author: ng0), gnunet, 2017/04/20