projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in build lp
[m6w6/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index dcb9f0012ba7234f8ae882ae635d4b6ad4030268..794d3d152e8d6dd47513246ab62e637bc09335b0 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-36,7
+36,6
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
-#include <cassert>
/*
What happens if no servers exist?
/*
What happens if no servers exist?
@@
-87,7
+86,7
@@
char *memcached_get_by_key(memcached_st *ptr,
*error= memcached_mget_by_key_real(ptr, group_key, group_key_length,
(const char * const *)&key, &key_length,
1, false);
*error= memcached_mget_by_key_real(ptr, group_key, group_key_length,
(const char * const *)&key, &key_length,
1, false);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
if (memcached_failed(*error))
if (memcached_failed(*error))
@@
-105,7
+104,7
@@
char *memcached_get_by_key(memcached_st *ptr,
char *value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
char *value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
/* This is for historical reasons */
if (*error == MEMCACHED_END)
/* This is for historical reasons */
if (*error == MEMCACHED_END)
@@
-157,7
+156,7
@@
char *memcached_get_by_key(memcached_st *ptr,
}
}
}
}
}
}
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
return NULL;
}
return NULL;
}
@@
-171,7
+170,7
@@
char *memcached_get_by_key(memcached_st *ptr,
&dummy_error);
WATCHPOINT_ASSERT(dummy_length == 0);
WATCHPOINT_ASSERT(dummy_value == 0);
&dummy_error);
WATCHPOINT_ASSERT(dummy_length == 0);
WATCHPOINT_ASSERT(dummy_value == 0);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
return value;
}
return value;
}