From 1fc48dc4a67503c65a040606bc00a4cac7210f13 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Wed, 27 Dec 2017 17:36:24 -0800
Subject: Compilation fixes for Windows.

---
 src/supplemental/http/http_msg.c | 15 +++++++--------
 src/supplemental/http/server.c   |  5 ++---
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/supplemental/http')

diff --git a/src/supplemental/http/http_msg.c b/src/supplemental/http/http_msg.c
index 8b3c6a7c..ff931240 100644
--- a/src/supplemental/http/http_msg.c
+++ b/src/supplemental/http/http_msg.c
@@ -145,7 +145,7 @@ http_del_header(nni_list *hdrs, const char *key)
 {
 	http_header *h;
 	NNI_LIST_FOREACH (hdrs, h) {
-		if (strcasecmp(key, h->name) == 0) {
+		if (nni_strcasecmp(key, h->name) == 0) {
 			nni_list_remove(hdrs, h);
 			nni_strfree(h->name);
 			nni_free(h->value, strlen(h->value) + 1);
@@ -173,7 +173,7 @@ http_set_header(nni_list *hdrs, const char *key, const char *val)
 {
 	http_header *h;
 	NNI_LIST_FOREACH (hdrs, h) {
-		if (strcasecmp(key, h->name) == 0) {
+		if (nni_strcasecmp(key, h->name) == 0) {
 			char * news;
 			size_t len = strlen(val) + 1;
 			if ((news = nni_alloc(len)) == NULL) {
@@ -220,7 +220,7 @@ http_add_header(nni_list *hdrs, const char *key, const char *val)
 {
 	http_header *h;
 	NNI_LIST_FOREACH (hdrs, h) {
-		if (strcasecmp(key, h->name) == 0) {
+		if (nni_strcasecmp(key, h->name) == 0) {
 			char * news;
 			size_t len = strlen(h->value) + strlen(val) + 3;
 			if ((news = nni_alloc(len)) == NULL) {
@@ -267,7 +267,7 @@ http_get_header(nni_list *hdrs, const char *key)
 {
 	http_header *h;
 	NNI_LIST_FOREACH (hdrs, h) {
-		if (strcasecmp(h->name, key) == 0) {
+		if (nni_strcasecmp(h->name, key) == 0) {
 			return (h->value);
 		}
 	}
@@ -407,10 +407,9 @@ nni_http_res_alloc_data(nni_http_res *res, size_t size)
 static int
 http_parse_header(nni_list *hdrs, void *line)
 {
-	http_header *h;
-	char *       key = line;
-	char *       val;
-	char *       end;
+	char *key = line;
+	char *val;
+	char *end;
 
 	// Find separation between key and value
 	if ((val = strchr(key, ':')) == NULL) {
diff --git a/src/supplemental/http/server.c b/src/supplemental/http/server.c
index 0a132975..4a46bf44 100644
--- a/src/supplemental/http/server.c
+++ b/src/supplemental/http/server.c
@@ -289,7 +289,6 @@ http_sconn_rxdone(void *arg)
 	char *           uri;
 	size_t           urisz;
 	char *           path;
-	char *           tmp;
 	bool             badmeth = false;
 
 	if ((rv = nni_aio_result(aio)) != 0) {
@@ -819,7 +818,7 @@ http_server_add_handler(void **hp, nni_http_server *s, nni_http_handler *hh,
 	// matches.)  Note that a wild card host matches both.
 	NNI_LIST_FOREACH (&s->handlers, h2) {
 		if ((h2->h_host != NULL) && (h->h_host != NULL) &&
-		    (strcasecmp(h2->h_host, h->h_host) != 0)) {
+		    (nni_strcasecmp(h2->h_host, h->h_host) != 0)) {
 			// Hosts don't match, so we are safe.
 			continue;
 		}
@@ -916,7 +915,7 @@ http_lookup_type(const char *path)
 		if (l2 > l1) {
 			continue;
 		}
-		if (strcasecmp(&path[l1 - l2], content_map[i].ext) == 0) {
+		if (nni_strcasecmp(&path[l1 - l2], content_map[i].ext) == 0) {
 			return (content_map[i].typ);
 		}
 	}
-- 
cgit v1.2.3-70-g09d2