Cleaning out asserts;

[awesomized/libmemcached] / lib / memcached_string.c

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;