X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fversion.cc;h=53d24c1cb02dc7eb51003a0557675b661fd4cc7d;hb=e0165c033349179841bd1658f4068a9e4c075f66;hp=bbe46cc5011a513315e8e371028db1fb18c7ea5c;hpb=c5bd49aee7b7bcb434cc526ff67d4bccddd4ba90;p=awesomized%2Flibmemcached

diff --git a/libmemcached/version.cc b/libmemcached/version.cc
index bbe46cc5..53d24c1c 100644
--- a/libmemcached/version.cc
+++ b/libmemcached/version.cc
@@ -52,7 +52,7 @@ static inline memcached_return_t memcached_version_textual(Memcached *memc)
   bool errors_happened= false;
   for (uint32_t x= 0; x < memcached_server_count(memc); x++)
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
+    memcached_instance_st* instance= memcached_instance_fetch(memc, x);
 
     // Optimization, we only fetch version once.
     if (instance->major_version != UINT8_MAX)
@@ -73,14 +73,13 @@ static inline memcached_return_t memcached_version_textual(Memcached *memc)
   if (success)
   {
     // Collect the returned items
-    org::libmemcached::Instance* instance;
+    memcached_instance_st* instance;
     memcached_return_t readable_error;
     while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
       memcached_return_t rrc= memcached_response(instance, NULL);
       if (memcached_failed(rrc))
       {
-        memcached_io_reset(instance);
         errors_happened= true;
       }
     }
@@ -105,7 +104,7 @@ static inline memcached_return_t memcached_version_binary(Memcached *memc)
   bool errors_happened= false;
   for (uint32_t x= 0; x < memcached_server_count(memc); x++) 
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
+    memcached_instance_st* instance= memcached_instance_fetch(memc, x);
 
     initialize_binary_request(instance, request.message.header);
 
@@ -117,7 +116,6 @@ static inline memcached_return_t memcached_version_binary(Memcached *memc)
     memcached_return_t rrc= memcached_vdo(instance, vector, 1, true);
     if (memcached_failed(rrc))
     {
-      memcached_io_reset(instance);
       errors_happened= true;
       continue;
     }
@@ -128,7 +126,7 @@ static inline memcached_return_t memcached_version_binary(Memcached *memc)
   if (success)
   {
     // Collect the returned items
-    org::libmemcached::Instance* instance;
+    memcached_instance_st* instance;
     memcached_return_t readable_error;
     while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
@@ -136,7 +134,6 @@ static inline memcached_return_t memcached_version_binary(Memcached *memc)
       memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
       if (memcached_failed(rrc))
       {
-        memcached_io_reset(instance);
         errors_happened= true;
       }
     }
@@ -145,7 +142,7 @@ static inline memcached_return_t memcached_version_binary(Memcached *memc)
   return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-static inline void version_ascii_instance(org::libmemcached::Instance* instance)
+static inline void version_ascii_instance(memcached_instance_st* instance)
 {
   if (instance->major_version != UINT8_MAX)
   {
@@ -158,7 +155,7 @@ static inline void version_ascii_instance(org::libmemcached::Instance* instance)
   }
 }
 
-static inline void version_binary_instance(org::libmemcached::Instance* instance)
+static inline void version_binary_instance(memcached_instance_st* instance)
 {
   if (instance->major_version != UINT8_MAX)
   {
@@ -178,7 +175,7 @@ static inline void version_binary_instance(org::libmemcached::Instance* instance
   }
 }
 
-void memcached_version_instance(org::libmemcached::Instance* instance)
+void memcached_version_instance(memcached_instance_st* instance)
 {
   if (instance)
   {
@@ -202,6 +199,29 @@ void memcached_version_instance(org::libmemcached::Instance* instance)
   }
 }
 
+int8_t memcached_version_instance_cmp(memcached_instance_st *instance,
+    uint8_t maj, uint8_t min, uint8_t mic)
+{
+  if (!instance || memcached_server_major_version(instance) == UINT8_MAX) {
+    return INT8_MIN;
+  } else {
+    uint32_t sv, cv;
+
+    sv = memcached_server_micro_version(instance)
+        |memcached_server_minor_version(instance) << 8
+        |memcached_server_major_version(instance) << 16
+        ;
+    cv = mic
+        |min << 8
+        |maj << 16
+        ;
+    if (sv < cv) {
+      return -1;
+    }
+    return sv != cv;
+  }
+}
+
 memcached_return_t memcached_version(memcached_st *shell)
 {
   Memcached* memc= memcached2Memcached(shell);