summaryrefslogtreecommitdiff
path: root/memcache
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-10-23 00:43:22 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2013-10-23 00:43:22 +0000
commitc4e65bd3142bec6f0c895f01a9260dffb85fcdb8 (patch)
tree83fd8aa95c6173c8fa0f7129844da4e6c44caec6 /memcache
parent28e1d9dfddfbbdddadbe122d7788ea51e8b471ae (diff)
downloadlibapr-c4e65bd3142bec6f0c895f01a9260dffb85fcdb8.tar.gz
fix some minor bugs and useless assignments so that clang scan-build
is a little quieter git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1534882 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memcache')
-rw-r--r--memcache/apr_memcache.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c
index c5710d8b2..a6b3276cf 100644
--- a/memcache/apr_memcache.c
+++ b/memcache/apr_memcache.c
@@ -407,6 +407,9 @@ APR_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p,
apr_pool_t *np;
rv = apr_pool_create(&np, p);
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
server = apr_palloc(np, sizeof(apr_memcache_server_t));
@@ -787,8 +790,8 @@ apr_memcache_getp(apr_memcache_t *mc,
char *last;
apr_size_t len = 0;
- flags = apr_strtok(conn->buffer, " ", &last);
- flags = apr_strtok(NULL, " ", &last);
+ apr_strtok(conn->buffer, " ", &last);
+ apr_strtok(NULL, " ", &last);
flags = apr_strtok(NULL, " ", &last);
if (flags_) {
@@ -1359,7 +1362,7 @@ apr_memcache_multgetp(apr_memcache_t *mc,
char *data;
apr_size_t len = 0;
- key = apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore */
+ apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore */
key = apr_strtok(NULL, " ", &last);
flags = apr_strtok(NULL, " ", &last);