Minor tweaks to work better with clion
Minor tweaks to work better with clion

Opening memcached.cc in clion gives some red lines under
some statemens. This patch just fix those errors to make it
easier to work with clion.

Clion doesn't seem to like it when the variable name is the same
as the datatype.

Some variables hide a variable in the outer scope

Change-Id: Iefdc255c0967274dca939b2cbf44a79283d0e409
Reviewed-on: http://review.couchbase.org/54969
Tested-by: buildbot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>
Reviewed-by: Dave Rigby <a09264da4832c7ff1d3bf1608a19f4b870f93750@couchbase.com>

daverigby/kv_engine,owendCB/memcached,daverigby/kv_engine,couchbase/memcached,daverigby/kv_engine,couchbase/memcached,daverigby/kv_engine,daverigby/memcached,daverigby/memcached,couchbase/memcached,owendCB/memcached,owendCB/memcached,couchbase/memcached,daverigby/memcached,owendCB/memcached,daverigby/memcached