Skip to content

Commit

Permalink
Applied Trond's false assertion removal patch and stamped to 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Trond Norbye authored and dustin committed Jan 3, 2009
1 parent 61e0859 commit ac845d2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.52)
AC_INIT(memcached, 1.3.0, brad@danga.com)
AC_INIT(memcached, 1.3.1, brad@danga.com)
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR(memcached.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
Expand Down
1 change: 0 additions & 1 deletion items.c
Expand Up @@ -270,7 +270,6 @@ void do_item_remove(item *it) {
it->refcount--;
DEBUG_REFCNT(it, '-');
}
assert(it->refcount != 0);
if (it->refcount == 0 && (it->it_flags & ITEM_LINKED) == 0) {
item_free(it);
}
Expand Down
4 changes: 0 additions & 4 deletions memcached.c
Expand Up @@ -1025,7 +1025,6 @@ static void complete_incr_bin(conn *c) {
protocol_binary_request_incr* req = binary_get_request(c);

assert(c != NULL);
assert(c->rbytes >= sizeof(*req));
assert(c->wsize >= sizeof(*rsp));

/* fix byteorder in the request */
Expand Down Expand Up @@ -1392,7 +1391,6 @@ static void process_bin_update(conn *c) {
protocol_binary_request_set* req = binary_get_request(c);

assert(c != NULL);
assert(c->rbytes >= sizeof(*req));

key = binary_get_key(c);
nkey = c->binary_header.request.keylen;
Expand Down Expand Up @@ -1475,7 +1473,6 @@ static void process_bin_append_prepend(conn *c) {
protocol_binary_request_append* req = binary_get_request(c);

assert(c != NULL);
assert(c->rbytes >= sizeof(*req));

key = binary_get_key(c);
nkey = c->binary_header.request.keylen;
Expand Down Expand Up @@ -1552,7 +1549,6 @@ static void process_bin_delete(conn *c) {
size_t nkey = c->binary_header.request.keylen;

assert(c != NULL);
assert(c->rbytes >= sizeof(*req));
assert(c->wsize >= sizeof(*rsp));

if(settings.verbose) {
Expand Down
2 changes: 1 addition & 1 deletion memcached.spec
@@ -1,5 +1,5 @@
Name: memcached
Version: 1.3.0
Version: 1.3.1
Release: 1%{?dist}
Summary: High Performance, Distributed Memory Object Cache

Expand Down

0 comments on commit ac845d2

Please sign in to comment.