diff options
author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-06 01:08:40 +0000 |
---|---|---|
committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-06 01:08:40 +0000 |
commit | aca4351e2f768674a4a6928e634406e7385226d9 (patch) | |
tree | 45ba98a0f5e105e8c62181d11c7f5497c422972a /memcache/apr_memcache.c | |
parent | c83b477521ed2aaf40c6a47d540c665ca9bd539c (diff) | |
parent | 796db2a03ab94945939e0e91c269a611463d43a8 (diff) | |
download | libapr-util-1.4.0.tar.gz |
Tag v1.4.0.1.4.0
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.0@1210733 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memcache/apr_memcache.c')
-rw-r--r-- | memcache/apr_memcache.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c index d244d564..f96d887a 100644 --- a/memcache/apr_memcache.c +++ b/memcache/apr_memcache.c @@ -418,15 +418,17 @@ APU_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p, mc_conn_construct, /* Make a New Connection */ mc_conn_destruct, /* Kill Old Connection */ server, np); + if (rv != APR_SUCCESS) { + return rv; + } apr_reslist_cleanup_order_set(server->conns, APR_RESLIST_CLEANUP_FIRST); #else rv = mc_conn_construct((void**)&(server->conn), server, np); -#endif - if (rv != APR_SUCCESS) { return rv; } +#endif *ms = server; @@ -772,11 +774,9 @@ apr_memcache_getp(apr_memcache_t *mc, if (strncmp(MS_VALUE, conn->buffer, MS_VALUE_LEN) == 0) { char *flags; char *length; - char *start; char *last; apr_size_t len = 0; - start = conn->buffer; flags = apr_strtok(conn->buffer, " ", &last); flags = apr_strtok(NULL, " ", &last); flags = apr_strtok(NULL, " ", &last); @@ -1345,12 +1345,10 @@ apr_memcache_multgetp(apr_memcache_t *mc, char *key; char *flags; char *length; - char *start; char *last; char *data; apr_size_t len = 0; - start = conn->buffer; key = apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore */ key = apr_strtok(NULL, " ", &last); flags = apr_strtok(NULL, " ", &last); |