[GNUnet-SVN] [libmicrohttpd] 03/08: convert upgrade_fd_in_epoll to 'bool'

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libmicrohttpd.

commit 3b2c0e14365870933c6090d3c2537995e48b36e5
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Feb 15 13:28:32 2017 +0100

    convert upgrade_fd_in_epoll to 'bool'
---
 src/microhttpd/daemon.c   | 8 ++++----
 src/microhttpd/internal.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 11df3a38..993ad27c 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3758,7 +3758,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
   }
 
 #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
-  if ( (MHD_NO == daemon->upgrade_fd_in_epoll) &&
+  if ( (! daemon->upgrade_fd_in_epoll) &&
        (-1 != daemon->epoll_upgrade_fd) )
     {
       event.events = EPOLLIN | EPOLLOUT;
@@ -3775,7 +3775,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
 #endif
          return MHD_NO;
        }
-      daemon->upgrade_fd_in_epoll = MHD_YES;
+      daemon->upgrade_fd_in_epoll = true;
     }
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
   if ( (daemon->listen_socket_in_epoll) &&
@@ -5544,14 +5544,14 @@ thread_failed:
      indicate failure */
 #ifdef EPOLL_SUPPORT
 #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
-  if (MHD_YES == daemon->upgrade_fd_in_epoll)
+  if (daemon->upgrade_fd_in_epoll)
     {
       if (0 != epoll_ctl (daemon->epoll_fd,
                          EPOLL_CTL_DEL,
                          daemon->epoll_upgrade_fd,
                          NULL))
        MHD_PANIC (_("Failed to remove FD from epoll set\n"));
-      daemon->upgrade_fd_in_epoll = MHD_NO;
+      daemon->upgrade_fd_in_epoll = false;
     }
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
   if (-1 != daemon->epoll_fd)
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index b9c30b5d..707bfe82 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -1407,10 +1407,10 @@ struct MHD_Daemon
   int epoll_upgrade_fd;
 
   /**
-   * #MHD_YES if @e epoll_upgrade_fd is in the 'epoll' set,
-   * #MHD_NO if not.
+   * true if @e epoll_upgrade_fd is in the 'epoll' set,
+   * false if not.
    */
-  int upgrade_fd_in_epoll;
+  bool upgrade_fd_in_epoll;
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
 
 #endif

-- 
To stop receiving notification emails like this one, please contact
address@hidden