Changeset 6022

Timestamp:

Jun 11, 2019 2:03:02 AM (5 years ago)

Author:

nanang

Message:

Misc (re #2147): Fixed warnings in SSL socket: redefinition of typedef 'pj_ssl_sock_t' and unused 'get_pem'.

Location:

pjproject/trunk/pjlib/src/pj

Files:

• ssl_sock_imp_common.h (modified) (2 diffs)
• ssl_sock_ossl.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.h

@@ -94 +94 @@
  * Secure socket structure definition.
  */
-typedef struct pj_ssl_sock_t
+struct pj_ssl_sock_t
 {
     pj_pool_t            *pool;
@@ -140 +140 @@
     circ_buf_t            circ_buf_output;
     pj_lock_t            *circ_buf_output_mutex;
-} pj_ssl_sock_t;
+};
 
 

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -38 +38 @@
     (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
 
-#include "ssl_sock_imp_common.h"
 #include "ssl_sock_imp_common.c"
 
@@ -1577 +1576 @@
     int i;
 
+    /* For now, get_pem has to be PJ_TRUE */
+    pj_assert(get_pem);
+    PJ_UNUSED_ARG(get_pem);
+
     ci->raw_chain.cert_raw = (pj_str_t *)pj_pool_calloc(pool,
                                                         sk_X509_num(chain),