X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fpoll.cc;h=5914aa47655236070f2e741b94d7da98e7e2121d;hb=4b584c02c679edd005cd2e542d2ff1d9dcb312b9;hp=6fdf242c90d0637c2eba38df2d9c3f2cb716fe28;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/poll.cc b/src/libmemcached/poll.cc
index 6fdf242c..5914aa47 100644
--- a/src/libmemcached/poll.cc
+++ b/src/libmemcached/poll.cc
@@ -1,85 +1,79 @@
-/* LibMemcached
- * Copyright (C) 2013 Data Differential, http://datadifferential.com/
- * Copyright (C) 2010 Brian Aker, Trond Norbye
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- *
- * Summary: Implementation of poll by using select
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - C/C++ Client Library for memcached                  |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    +--------------------------------------------------------------------+
+*/
 
 #include "libmemcached/common.h"
 
 #if defined(_WIN32)
-#include "libmemcached/poll.h"
+#  include "libmemcached/poll.h"
+#  if HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  endif
+#  include <time.h>
+#  if HAVE_STRINGS_H
+#    include <cstrings>
+#  endif
 
-#include <sys/time.h>
-#include <strings.h>
-
-int poll(struct pollfd fds[], nfds_t nfds, int tmo)
-{
+int poll(struct pollfd fds[], nfds_t nfds, int tmo) {
   fd_set readfds, writefds, errorfds;
   FD_ZERO(&readfds);
   FD_ZERO(&writefds);
   FD_ZERO(&errorfds);
 
-  int maxfd= 0;
+  int maxfd = 0;
 
-  for (nfds_t x= 0; x < nfds; ++x)
-  {
-    if (fds[x].events & (POLLIN | POLLOUT))
-    {
-#ifndef _WIN32
-      if (fds[x].fd > maxfd)
-      {
-        maxfd= fds[x].fd;
+  for (nfds_t x = 0; x < nfds; ++x) {
+    if (fds[x].events & (POLLIN | POLLOUT)) {
+#  ifndef _WIN32
+      if (fds[x].fd > maxfd) {
+        maxfd = fds[x].fd;
       }
-#endif
-      if (fds[x].events & POLLIN)
-      {
+#  endif
+      if (fds[x].events & POLLIN) {
         FD_SET(fds[x].fd, &readfds);
       }
-      if (fds[x].events & POLLOUT)
-      {
+      if (fds[x].events & POLLOUT) {
         FD_SET(fds[x].fd, &writefds);
       }
     }
   }
 
-  struct timeval timeout= { .tv_sec = tmo / 1000,
-                            .tv_usec= (tmo % 1000) * 1000 };
-  struct timeval *tp= &timeout;
-  if (tmo == -1)
-  {
-    tp= NULL;
+  struct timeval timeout = {tmo / 1000, (tmo % 1000) * 1000};
+  struct timeval *tp = &timeout;
+  if (tmo == -1) {
+    tp = NULL;
   }
-  int ret= select(maxfd + 1, &readfds, &writefds, &errorfds, tp);
-  if (ret <= 0)
-  {
+  int ret = select(maxfd + 1, &readfds, &writefds, &errorfds, tp);
+  if (ret <= 0) {
     return ret;
   }
 
   /* Iterate through all of them because I need to clear the revent map */
-  for (nfds_t x= 0; x < nfds; ++x)
-  {
-    fds[x].revents= 0;
-    if (FD_ISSET(fds[x].fd, &readfds))
-    {
+  for (nfds_t x = 0; x < nfds; ++x) {
+    fds[x].revents = 0;
+    if (FD_ISSET(fds[x].fd, &readfds)) {
       fds[x].revents |= POLLIN;
     }
-    if (FD_ISSET(fds[x].fd, &writefds))
-    {
+    if (FD_ISSET(fds[x].fd, &writefds)) {
       fds[x].revents |= POLLOUT;
     }
-    if (FD_ISSET(fds[x].fd, &errorfds))
-    {
+    if (FD_ISSET(fds[x].fd, &errorfds)) {
       fds[x].revents |= POLLERR;
     }
   }
 
-   return ret;
+  return ret;
 }
 
 #endif // defined(_WIN32)