ext/libcouchbase/src/lcbio/connect.cc in libcouchbase-1.0.4 vs ext/libcouchbase/src/lcbio/connect.cc in libcouchbase-1.1.0

@@ -300,11 +300,10 @@
         lcbio_mksyserr(sockerr, &cs->syserr);
         cs->clear_sock();
         goto GT_NEXTSOCK;
 
     } else {
-        rv = 0;
         ai = cs->ai;
 
         GT_CONNECT:
         rv = io->E_connect(s->u.fd, ai->ai_addr, ai->ai_addrlen);
         if (rv == 0) {
@@ -432,11 +431,11 @@
     return new Connstart(iot, settings, dest, timeout, handler, arg);
 }
 
 Connstart::Connstart(lcbio_TABLE* iot_, lcb_settings* settings_,
                     const lcb_host_t *dest, uint32_t timeout,
-                    lcbio_CONNDONE_cb handler, void *arg)
-    : user_handler(handler), user_arg(arg), sock(NULL), syserr(0),
+                    lcbio_CONNDONE_cb handler_, void *arg)
+    : user_handler(handler_), user_arg(arg), sock(NULL), syserr(0),
       event(NULL), ev_active(false), in_uhandler(false),
       ai_root(NULL), ai(NULL), state(CS_PENDING), last_error(LCB_SUCCESS),
       timer(iot_, this) {
 
     addrinfo hints;