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

diff --git a/src/libmemcached/purge.cc b/src/libmemcached/purge.cc
index a347e9cb..d6943701 100644
--- a/src/libmemcached/purge.cc
+++ b/src/libmemcached/purge.cc
@@ -15,7 +15,7 @@
 
 #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;
@@ -108,7 +112,7 @@ bool memcached_purge(memcached_instance_st *ptr) {
         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++) {