diff options
| -rw-r--r-- | src/htsbauth.c | 30 | ||||
| -rw-r--r-- | src/htscoremain.c | 2 | ||||
| -rw-r--r-- | src/htsindex.c | 2 | ||||
| -rw-r--r-- | src/htslib.c | 1 |
4 files changed, 17 insertions, 18 deletions
diff --git a/src/htsbauth.c b/src/htsbauth.c index 583896a..3f29bb8 100644 --- a/src/htsbauth.c +++ b/src/htsbauth.c @@ -129,23 +129,23 @@ int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path) { // Matches wildcard cookie domains that start with a dot // chk_dom: the domain stored in the cookie (potentially wildcard). // domain: query domain -int cookie_cmp_wildcard_domain(char *chk_dom, char *domain) { - int n = strlen(chk_dom); - int m = strlen(domain); - int l = n < m ? n : m; - int i; - for (i = l - 1; i >= 0; i--) { - if (chk_dom[n - i - 1] != domain[m - i - 1]) { - return 1; - } - } - if (m < n && chk_dom[0] == '.') { - return 0; - } - else if (m != n) { - return 1; +static int cookie_cmp_wildcard_domain(char *chk_dom, char *domain) { + int n = strlen(chk_dom); + int m = strlen(domain); + int l = n < m ? n : m; + int i; + for (i = l - 1; i >= 0; i--) { + if (chk_dom[n - i - 1] != domain[m - i - 1]) { + return 1; } + } + if (m < n && chk_dom[0] == '.') { return 0; + } + else if (m != n) { + return 1; + } + return 0; } diff --git a/src/htscoremain.c b/src/htscoremain.c index 1048eb6..7ef734b 100644 --- a/src/htscoremain.c +++ b/src/htscoremain.c @@ -2425,7 +2425,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) { /* produce key #i */ #define FMT() \ char buffer[256]; \ - char *name; \ + const char *name; \ const long expected = (long) i * 1664525 + 1013904223; \ do { \ if (strings == NULL) { \ diff --git a/src/htsindex.c b/src/htsindex.c index 30fe59a..e11df1e 100644 --- a/src/htsindex.c +++ b/src/htsindex.c @@ -146,7 +146,7 @@ int index_keyword(const char *html_data, LLint size, const char *mime, int i = 0; // - int WordIndexSize = 1024; + //int WordIndexSize = 1024; inthash WordIndexHash = NULL; FILE *tmpfp = NULL; diff --git a/src/htslib.c b/src/htslib.c index 313b2ba..04243ff 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -2283,7 +2283,6 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port, } #else const int flags = fcntl(soc, F_GETFL, 0); - unsigned long p = 1; // non bloquant if (flags == -1 || fcntl(soc, F_SETFL, flags | O_NONBLOCK) == -1) { snprintf(retour->msg, sizeof(retour->msg), "Non-blocking socket failed: %s", strerror(errno)); |