Cleaning out asserts;

diff --git a/include/memcached.h b/include/memcached.h
index d8d471a81d99878d41f01e5cbd9478f8bee3d81d..6854035b5bd0593544ee5b74e4e4bd206783e621 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -217,12 +217,22 @@ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
 #define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout);
 #define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d (%s) %zu\n", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout);
 #define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);
+#define WATCHPOINT_ASSERT(A) assert((A));
 #else
+/*
+#define WATCHPOINT { 1; };
+#define WATCHPOINT_ERROR(A) { 1; };
+#define WATCHPOINT_STRING(A) { 1; };
+#define WATCHPOINT_NUMBER(A) { 1; };
+#define WATCHPOINT_ERRNO(A) { 1; };
+#define WATCHPOINT_ASSERT(A) { 1; };
+*/
 #define WATCHPOINT
-#define WATCHPOINT_ERROR(A) 
+#define WATCHPOINT_ERROR(A)
 #define WATCHPOINT_STRING(A)
 #define WATCHPOINT_NUMBER(A)
 #define WATCHPOINT_ERRNO(A)
+#define WATCHPOINT_ASSERT(A)
 #endif
 
 

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 17a0d83bf5ff94bbeed5e70ef22b5f1554cdc992..319c3fa3a703a529fcfd6e3f51db72db8d846358 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -108,7 +108,7 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
     }
   }
 
-  assert(temp_flag); /* Programming mistake if it gets this far */
+  WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
   if (ptr->flags & temp_flag)
     return 1;
   else

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index abf15676bf6d23a58cad66db5f433db1e0fcc9db..8ffaaef9fb91057e5c3f6ee1c8aba8c9368ccbdc 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -14,7 +14,7 @@ memcached_return memcached_real_connect(memcached_st *ptr, unsigned int server_k
   if (ptr->hosts[server_key].fd == -1)
   {
     /* Old connection junk still is in the structure */
-    assert(ptr->hosts[server_key].stack_responses == 0);
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
 
     if ((h= gethostbyname(ptr->hosts[server_key].hostname)) == NULL)
     {
@@ -86,7 +86,7 @@ test_connect:
       }
       ptr->connected++;
     }
-    assert(ptr->hosts[server_key].stack_responses == 0);
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
   }
 
   return MEMCACHED_SUCCESS;

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 3ddeff886eb75cc8ab7af02d997dd29a75c4d043..80b9de378327935e648d4dbd9580beb98a490e53 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -168,7 +168,9 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
     goto error;
   }
   else if (*error == MEMCACHED_END)
-    assert(0); /* If this happens we have somehow messed up the fetch */
+  {
+    WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+  }
   else if (*error == MEMCACHED_SUCCESS)
   {
     memcached_return rc;
@@ -298,7 +300,9 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
     else if (*error == MEMCACHED_END && *value_length == 0)
       return NULL;
     else if (*error == MEMCACHED_END)
-      assert(0); /* If this happens we have somehow messed up the fetch */
+    {
+      WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+    }
     else if (*error != MEMCACHED_SUCCESS)
       return NULL;
     else

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index ca7229c2cd89880945afe49622c65e9974017f6a..0e26fbbea44cd1dd40642664e9d1866a73dd658d 100644 (file)
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -22,7 +22,10 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le
     hash= internal_generate_hash(key, key_length);
 
   if (ptr->flags & MEM_USE_KETAMA)
-    assert(0);
+  {
+    WATCHPOINT_ASSERT(0);
+    return 0;
+  }
   else
     return hash % ptr->number_of_hosts;
 }

diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 77541e2ad9d3463e013553a5bc8ed344ef0d61e2..54a0e8cc9612eb5c0d66a274fa8a3a763e324e26 100644 (file)
--- a/lib/memcached_io.c
+++ b/lib/memcached_io.c
@@ -102,7 +102,7 @@ ssize_t memcached_io_write(memcached_st *ptr, unsigned int server_key,
 
       sent_length= memcached_io_flush(ptr, server_key);
 
-      assert(sent_length == MEMCACHED_MAX_BUFFER);
+      WATCHPOINT_ASSERT(sent_length == MEMCACHED_MAX_BUFFER);
       ptr->write_buffer_offset= 0;
     }
   }

diff --git a/lib/memcached_parse.c b/lib/memcached_parse.c
index d3b1827e5b659d62f02a8c7afa43959ea8ec3003..069593e5ec191d21208b586e632d7e8848d82826 100644 (file)
--- a/lib/memcached_parse.c
+++ b/lib/memcached_parse.c
@@ -17,7 +17,7 @@ memcached_server_st *memcached_servers_parse(char *server_strings)
   memcached_server_st *servers= NULL;
   memcached_return rc;
 
-  assert(server_strings);
+  WATCHPOINT_ASSERT(server_strings);
 
   end_ptr= server_strings + strlen(server_strings);
 

diff --git a/lib/memcached_response.c b/lib/memcached_response.c
index d0962a2d759e27b27839181d14251f81f02a89e8..673ccb2f6aed105c9e7c661ca3a2e486813bb694 100644 (file)
--- a/lib/memcached_response.c
+++ b/lib/memcached_response.c
@@ -43,7 +43,7 @@ memcached_return memcached_response(memcached_st *ptr,
         buffer_ptr++;
 
       total_length++;
-      assert(total_length < buffer_length);
+      WATCHPOINT_ASSERT(total_length < buffer_length);
     }
 
     if (memcached_server_response_count(ptr, server_key))

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 9d82b56f8659244c7dfc2c16072f18a39e5b95ce..f9ba64d6db358467523f1098417c63d427c57bbe 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -33,13 +33,13 @@ static memcached_return memcached_send(memcached_st *ptr,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  assert(value);
-  assert(value_length);
+  WATCHPOINT_ASSERT(value);
+  WATCHPOINT_ASSERT(value_length);
 
-  /* Leaving this assert in since only a library fubar could blow this */
+  /* Leaving this WATCHPOINT_ASSERT in since only a library fubar could blow this */
 #ifdef NOT_DONE
   if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0)
-    assert(0);
+    WATCHPOINT_ASSERT(0);
 #endif
     
   server_key= memcached_generate_hash(ptr, key, key_length);

diff --git a/lib/memcached_string.c b/lib/memcached_string.c
index 47dac67e62b103cb7591b79d5edc069272e84e80..e2f140178f8f44b54b5ed2277474791a41929f9e 100644 (file)
--- a/lib/memcached_string.c
+++ b/lib/memcached_string.c
@@ -49,7 +49,7 @@ memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_s
     return NULL;
   }
 
-  assert(string->string == string->end);
+  WATCHPOINT_ASSERT(string->string == string->end);
 
   return string;
 }
@@ -76,20 +76,15 @@ memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st
 {
   memcached_return rc;
 
-  WATCHPOINT;
   rc= memcached_string_check(string, length);
-  WATCHPOINT;
 
   if (rc != MEMCACHED_SUCCESS)
     return rc;
   
-  WATCHPOINT;
-  assert(string->string);
-  assert(string->end >= string->string && string->end <= string->string + string->current_size);
+  WATCHPOINT_ASSERT(string->string);
+  WATCHPOINT_ASSERT(string->end >= string->string && string->end <= string->string + string->current_size);
 
-  WATCHPOINT;
   memcpy(string->end, value, length);
-  WATCHPOINT;
   string->end+= length;
 
   return MEMCACHED_SUCCESS;