X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fpurge.cc;h=ff0321052ab6117b63d7ff7b15173ca6a0ee5d6e;hb=48dcc61a4919f6f3d5ee164630a843f2d8b8ade9;hp=a347e9cb6a296548edd19186bb4cb5d1a0621983;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/purge.cc b/src/libmemcached/purge.cc
index a347e9cb..ff032105 100644
--- a/src/libmemcached/purge.cc
+++ b/src/libmemcached/purge.cc
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - 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.    |
@@ -9,13 +9,13 @@
     | 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>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
 #include "libmemcached/common.h"
 
-#define memcached_set_purging(__object, __value) ((__object)->state.is_purging = (__value))
+#define memcached_set_purging(object_, value_) ((object_)->state.is_purging = (value_))
 
 class Purge {
 public:
@@ -24,7 +24,9 @@ public:
     memcached_set_purging(_memc, true);
   }
 
-  ~Purge() { memcached_set_purging(_memc, false); }
+  ~Purge() {
+    memcached_set_purging(_memc, false);
+  }
 
 private:
   Memcached *_memc;
@@ -38,7 +40,9 @@ public:
     _origin = ms;
   }
 
-  ~PollTimeout() { _origin = _timeout; }
+  ~PollTimeout() {
+    _origin = _timeout;
+  }
 
 private:
   int32_t _timeout;
@@ -104,11 +108,8 @@ bool memcached_purge(memcached_instance_st *ptr) {
         WATCHPOINT_ERROR(rc);
         is_successful = false;
       }
-      if (rc == MEMCACHED_TIMEOUT) {
-        break;
-      }
 
-      if (ptr->root->callbacks != NULL) {
+      if (ptr->root->callbacks) {
         memcached_callback_st cb = *ptr->root->callbacks;
         if (memcached_success(rc)) {
           for (uint32_t y = 0; y < cb.number_of_callback; y++) {