diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-19 15:43:01 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-19 15:43:01 +0000 |
| commit | 9c8092eda6e1e63d28dc4299353cf1a8c30b0aa5 (patch) | |
| tree | 8bbdbde0fa86d1906302574376d3268bbb7dcca9 /src | |
| parent | 84eb03f43a6bc47fe041b893a9aaa6773ffc29d5 (diff) | |
Fixed warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/htscharset.c | 4 | ||||
| -rw-r--r-- | src/htslib.c | 3 | ||||
| -rw-r--r-- | src/punycode.c | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/htscharset.c b/src/htscharset.c index 41c99bb..d8101d2 100644 --- a/src/htscharset.c +++ b/src/htscharset.c @@ -756,8 +756,8 @@ char *hts_convertStringUTF8ToIDNA(const char *s, size_t size) { /* encode */ output_length = (punycode_uint) ( capa - destSize ); - while(status = punycode_encode((punycode_uint) segOutputSize, - segInt, NULL, &output_length, &dest[destSize]) + while((status = punycode_encode((punycode_uint) segOutputSize, + segInt, NULL, &output_length, &dest[destSize])) == punycode_big_output) { INCREASE_CAPA(); output_length = (punycode_uint) ( capa - destSize ); diff --git a/src/htslib.c b/src/htslib.c index cbb0005..eb20aae 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -5534,8 +5534,7 @@ HTSEXT_API int hts_init(void) { Initialize the OpensSSL library */ if (!openssl_ctx) { - if (SSL_load_error_strings) - SSL_load_error_strings(); + SSL_load_error_strings(); SSL_library_init(); ///if (SSL_load_error_strings) SSL_load_error_strings(); //if (ERR_load_crypto_strings) ERR_load_crypto_strings(); diff --git a/src/punycode.c b/src/punycode.c index fa44a6a..187351a 100644 --- a/src/punycode.c +++ b/src/punycode.c @@ -278,6 +278,9 @@ enum punycode_status punycode_decode(punycode_uint input_length, return punycode_success; } +#ifdef PUNYCODE_COSTELLO_RFC3492_INCLUDE_TEST +#define PUNYCODE_COSTELLO_RFC3492_INCLUDE_TEST + /******************************************************************/ /* Wrapper for testing (would normally go in a separate .c file): */ @@ -321,6 +324,8 @@ static const char invalid_input[] = "invalid input\n"; static const char overflow[] = "arithmetic overflow\n"; static const char io_error[] = "I/O error\n"; +#endif + /* The following string is used to convert printable */ /* characters between ASCII and the native charset: */ |