Fossil SCM
Fix harmless compiler warnings in http_ssl.c that occur when building without SSL support.
Commit
b2824009b2dbb8f0bad7f71d7e8de5bab18e0c7f04e8a07f6a2f250cab74394c
Parent
b5ab1ebe5e7c7da…
1 file changed
+4
-4
+4
-4
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -24,19 +24,19 @@ | ||
| 24 | 24 | ** SSL support is abstracted out into this module because Fossil can |
| 25 | 25 | ** be compiled without SSL support (which requires OpenSSL library) |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | 28 | #include "config.h" |
| 29 | +#include "http_ssl.h" | |
| 29 | 30 | |
| 30 | 31 | #ifdef FOSSIL_ENABLE_SSL |
| 31 | 32 | |
| 32 | 33 | #include <openssl/bio.h> |
| 33 | 34 | #include <openssl/ssl.h> |
| 34 | 35 | #include <openssl/err.h> |
| 35 | 36 | #include <openssl/x509.h> |
| 36 | 37 | |
| 37 | -#include "http_ssl.h" | |
| 38 | 38 | #include <assert.h> |
| 39 | 39 | #include <sys/types.h> |
| 40 | 40 | |
| 41 | 41 | /* |
| 42 | 42 | ** There can only be a single OpenSSL IO connection open at a time. |
| @@ -518,16 +518,16 @@ | ||
| 518 | 518 | ** for the domains listed. Or if |
| 519 | 519 | ** the --all option is specified, |
| 520 | 520 | ** remove all TLS cert exceptions. |
| 521 | 521 | */ |
| 522 | 522 | void test_tlsconfig_info(void){ |
| 523 | - const char *zCmd; | |
| 524 | - size_t nCmd; | |
| 525 | - int nHit = 0; | |
| 526 | 523 | #if !defined(FOSSIL_ENABLE_SSL) |
| 527 | 524 | fossil_print("TLS disabled in this build\n"); |
| 528 | 525 | #else |
| 526 | + const char *zCmd; | |
| 527 | + size_t nCmd; | |
| 528 | + int nHit = 0; | |
| 529 | 529 | db_find_and_open_repository(OPEN_OK_NOT_FOUND|OPEN_SUBSTITUTE,0); |
| 530 | 530 | db_open_config(1,0); |
| 531 | 531 | zCmd = g.argc>=3 ? g.argv[2] : "show"; |
| 532 | 532 | nCmd = strlen(zCmd); |
| 533 | 533 | if( strncmp("show",zCmd,nCmd)==0 ){ |
| 534 | 534 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -24,19 +24,19 @@ | |
| 24 | ** SSL support is abstracted out into this module because Fossil can |
| 25 | ** be compiled without SSL support (which requires OpenSSL library) |
| 26 | */ |
| 27 | |
| 28 | #include "config.h" |
| 29 | |
| 30 | #ifdef FOSSIL_ENABLE_SSL |
| 31 | |
| 32 | #include <openssl/bio.h> |
| 33 | #include <openssl/ssl.h> |
| 34 | #include <openssl/err.h> |
| 35 | #include <openssl/x509.h> |
| 36 | |
| 37 | #include "http_ssl.h" |
| 38 | #include <assert.h> |
| 39 | #include <sys/types.h> |
| 40 | |
| 41 | /* |
| 42 | ** There can only be a single OpenSSL IO connection open at a time. |
| @@ -518,16 +518,16 @@ | |
| 518 | ** for the domains listed. Or if |
| 519 | ** the --all option is specified, |
| 520 | ** remove all TLS cert exceptions. |
| 521 | */ |
| 522 | void test_tlsconfig_info(void){ |
| 523 | const char *zCmd; |
| 524 | size_t nCmd; |
| 525 | int nHit = 0; |
| 526 | #if !defined(FOSSIL_ENABLE_SSL) |
| 527 | fossil_print("TLS disabled in this build\n"); |
| 528 | #else |
| 529 | db_find_and_open_repository(OPEN_OK_NOT_FOUND|OPEN_SUBSTITUTE,0); |
| 530 | db_open_config(1,0); |
| 531 | zCmd = g.argc>=3 ? g.argv[2] : "show"; |
| 532 | nCmd = strlen(zCmd); |
| 533 | if( strncmp("show",zCmd,nCmd)==0 ){ |
| 534 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -24,19 +24,19 @@ | |
| 24 | ** SSL support is abstracted out into this module because Fossil can |
| 25 | ** be compiled without SSL support (which requires OpenSSL library) |
| 26 | */ |
| 27 | |
| 28 | #include "config.h" |
| 29 | #include "http_ssl.h" |
| 30 | |
| 31 | #ifdef FOSSIL_ENABLE_SSL |
| 32 | |
| 33 | #include <openssl/bio.h> |
| 34 | #include <openssl/ssl.h> |
| 35 | #include <openssl/err.h> |
| 36 | #include <openssl/x509.h> |
| 37 | |
| 38 | #include <assert.h> |
| 39 | #include <sys/types.h> |
| 40 | |
| 41 | /* |
| 42 | ** There can only be a single OpenSSL IO connection open at a time. |
| @@ -518,16 +518,16 @@ | |
| 518 | ** for the domains listed. Or if |
| 519 | ** the --all option is specified, |
| 520 | ** remove all TLS cert exceptions. |
| 521 | */ |
| 522 | void test_tlsconfig_info(void){ |
| 523 | #if !defined(FOSSIL_ENABLE_SSL) |
| 524 | fossil_print("TLS disabled in this build\n"); |
| 525 | #else |
| 526 | const char *zCmd; |
| 527 | size_t nCmd; |
| 528 | int nHit = 0; |
| 529 | db_find_and_open_repository(OPEN_OK_NOT_FOUND|OPEN_SUBSTITUTE,0); |
| 530 | db_open_config(1,0); |
| 531 | zCmd = g.argc>=3 ? g.argv[2] : "show"; |
| 532 | nCmd = strlen(zCmd); |
| 533 | if( strncmp("show",zCmd,nCmd)==0 ){ |
| 534 |