[gnurl] 81/411: vtls: make it 'struct Curl_ssl_session'

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 3acb2abdf5c712a11d281f45222efe26e7675656
Author: Daniel Stenberg <daniel@haxx.se>
AuthorDate: Wed Sep 2 12:17:49 2020 +0200

    vtls: make it 'struct Curl_ssl_session'
    
    Use uppercase C for internal symbols.
    
    Closes #5906
---
 lib/share.c     |  2 +-
 lib/share.h     |  2 +-
 lib/urldata.h   |  4 ++--
 lib/vtls/vtls.c | 12 ++++++------
 lib/vtls/vtls.h |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/share.c b/lib/share.c
index a2d896042..407ac3453 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -92,7 +92,7 @@ curl_share_setopt(struct Curl_share *share, CURLSHoption 
option, ...)
       if(!share->sslsession) {
         share->max_ssl_sessions = 8;
         share->sslsession = calloc(share->max_ssl_sessions,
-                                   sizeof(struct curl_ssl_session));
+                                   sizeof(struct Curl_ssl_session));
         share->sessionage = 0;
         if(!share->sslsession)
           res = CURLSHE_NOMEM;
diff --git a/lib/share.h b/lib/share.h
index beb8fca3d..aa964b6cc 100644
--- a/lib/share.h
+++ b/lib/share.h
@@ -54,7 +54,7 @@ struct Curl_share {
   struct PslCache psl;
 #endif
 
-  struct curl_ssl_session *sslsession;
+  struct Curl_ssl_session *sslsession;
   size_t max_ssl_sessions;
   long sessionage;
 };
diff --git a/lib/urldata.h b/lib/urldata.h
index ce11e1c15..40f9b26df 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -272,7 +272,7 @@ struct ssl_general_config {
 };
 
 /* information stored about one single SSL session */
-struct curl_ssl_session {
+struct Curl_ssl_session {
   char *name;       /* host name for which this ID was used */
   char *conn_to_host; /* host name for the connection (may be NULL) */
   const char *scheme; /* protocol scheme used */
@@ -1316,7 +1316,7 @@ struct UrlState {
                        strdup() data.
                     */
   int first_remote_port; /* remote port of the first (not followed) request */
-  struct curl_ssl_session *session; /* array of 'max_ssl_sessions' size */
+  struct Curl_ssl_session *session; /* array of 'max_ssl_sessions' size */
   long sessionage;                  /* number of the most recent session */
   unsigned int tempcount; /* number of entries in use in tempwrite, 0 - 3 */
   struct tempbuf tempwrite[3]; /* BOTH, HEADER, BODY */
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 9db4fd0ef..e65fb4f78 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -365,7 +365,7 @@ bool Curl_ssl_getsessionid(struct connectdata *conn,
                            size_t *idsize, /* set 0 if unknown */
                            int sockindex)
 {
-  struct curl_ssl_session *check;
+  struct Curl_ssl_session *check;
   struct Curl_easy *data = conn->data;
   size_t i;
   long *general_age;
@@ -432,7 +432,7 @@ bool Curl_ssl_getsessionid(struct connectdata *conn,
 /*
  * Kill a single session ID entry in the cache.
  */
-void Curl_ssl_kill_session(struct curl_ssl_session *session)
+void Curl_ssl_kill_session(struct Curl_ssl_session *session)
 {
   if(session->sessionid) {
     /* defensive check */
@@ -459,7 +459,7 @@ void Curl_ssl_delsessionid(struct connectdata *conn, void 
*ssl_sessionid)
   struct Curl_easy *data = conn->data;
 
   for(i = 0; i < data->set.general_ssl.max_ssl_sessions; i++) {
-    struct curl_ssl_session *check = &data->state.session[i];
+    struct Curl_ssl_session *check = &data->state.session[i];
 
     if(check->sessionid == ssl_sessionid) {
       Curl_ssl_kill_session(check);
@@ -481,7 +481,7 @@ CURLcode Curl_ssl_addsessionid(struct connectdata *conn,
 {
   size_t i;
   struct Curl_easy *data = conn->data; /* the mother of all structs */
-  struct curl_ssl_session *store = &data->state.session[0];
+  struct Curl_ssl_session *store = &data->state.session[0];
   long oldest_age = data->state.session[0].age; /* zero if unused */
   char *clone_host;
   char *clone_conn_to_host;
@@ -667,13 +667,13 @@ struct curl_slist *Curl_ssl_engines_list(struct Curl_easy 
*data)
  */
 CURLcode Curl_ssl_initsessions(struct Curl_easy *data, size_t amount)
 {
-  struct curl_ssl_session *session;
+  struct Curl_ssl_session *session;
 
   if(data->state.session)
     /* this is just a precaution to prevent multiple inits */
     return CURLE_OK;
 
-  session = calloc(amount, sizeof(struct curl_ssl_session));
+  session = calloc(amount, sizeof(struct Curl_ssl_session));
   if(!session)
     return CURLE_OUT_OF_MEMORY;
 
diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index bcc844416..1a0bb1865 100644
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -221,7 +221,7 @@ CURLcode Curl_ssl_addsessionid(struct connectdata *conn,
  * take sessionid object ownership from sessionid cache
  * (e.g. decrement refcount).
  */
-void Curl_ssl_kill_session(struct curl_ssl_session *session);
+void Curl_ssl_kill_session(struct Curl_ssl_session *session);
 /* delete a session from the cache
  * Sessionid mutex must be locked (see Curl_ssl_sessionid_lock).
  * This will call engine-specific curlssl_session_free function, which must

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.