From 75285e87132ead1a176e8dc38338ea493a7c5ecd Mon Sep 17 00:00:00 2001
From: Joshua Peraza <jperaza@jperaza-macbookpro.roam.corp.google.com>
Date: Wed, 9 May 2018 16:28:39 -0700
Subject: [PATCH] Define and use kInvalidSocket

---
 httplib.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/httplib.h b/httplib.h
index a5eeaa2..0070e2d 100644
--- a/httplib.h
+++ b/httplib.h
@@ -39,6 +39,7 @@
 #endif
 
 typedef SOCKET socket_t;
+constexpr socket_t kInvalidSocket = INVALID_SOCKET;
 #else
 #include <pthread.h>
 #include <unistd.h>
@@ -51,6 +52,7 @@ typedef SOCKET socket_t;
 #include <sys/select.h>
 
 typedef int socket_t;
+constexpr socket_t kInvalidSocket = -1;
 #endif
 
 #include <fstream>
@@ -560,13 +562,13 @@ socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0)
     auto service = std::to_string(port);
 
     if (getaddrinfo(host, service.c_str(), &hints, &result)) {
-        return -1;
+        return kInvalidSocket;
     }
 
     for (auto rp = result; rp; rp = rp->ai_next) {
        // Create a socket
        auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-       if (sock == -1) {
+       if (sock == kInvalidSocket) {
           continue;
        }
 
@@ -584,7 +586,7 @@ socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0)
     }
 
     freeaddrinfo(result);
-    return -1;
+    return kInvalidSocket;
 }
 
 inline void set_nonblocking(socket_t sock, bool nonblocking)
@@ -1415,7 +1417,7 @@ inline std::string SocketStream::get_remote_addr() {
 inline Server::Server(HttpVersion http_version)
     : http_version_(http_version)
     , is_running_(false)
-    , svr_sock_(-1)
+    , svr_sock_(kInvalidSocket)
     , running_threads_(0)
 {
 #ifndef _WIN32
@@ -1500,10 +1502,10 @@ inline bool Server::is_running() const
 inline void Server::stop()
 {
     if (is_running_) {
-        assert(svr_sock_ != -1);
+        assert(svr_sock_ != kInvalidSocket);
         detail::shutdown_socket(svr_sock_);
         detail::close_socket(svr_sock_);
-        svr_sock_ = -1;
+        svr_sock_ = kInvalidSocket;
     }
 }
 
@@ -1624,7 +1626,7 @@ inline int Server::bind_internal(const char* host, int port, int socket_flags)
     }
 
     svr_sock_ = create_server_socket(host, port, socket_flags);
-    if (svr_sock_ == -1) {
+    if (svr_sock_ == kInvalidSocket) {
         return -1;
     }
 
@@ -1650,7 +1652,7 @@ inline bool Server::listen_internal()
         auto val = detail::select_read(svr_sock_, 0, 100000);
 
         if (val == 0) { // Timeout
-            if (svr_sock_ == -1) {
+            if (svr_sock_ == kInvalidSocket) {
                 // The server socket was closed by 'stop' method.
                 break;
             }
@@ -1659,8 +1661,8 @@ inline bool Server::listen_internal()
 
         socket_t sock = accept(svr_sock_, NULL, NULL);
 
-        if (sock == -1) {
-            if (svr_sock_ != -1) {
+        if (sock == kInvalidSocket) {
+            if (svr_sock_ != kInvalidSocket) {
                 detail::close_socket(svr_sock_);
                 ret = false;
             } else {
@@ -1894,7 +1896,7 @@ inline bool Client::send(Request& req, Response& res)
     }
 
     auto sock = create_client_socket();
-    if (sock == -1) {
+    if (sock == kInvalidSocket) {
         return false;
     }