CXX-279 return value from all control paths

Author: TylerBrock

SConstruct

@@ -305,8 +305,6 @@ if len(mongoclientVersionComponents) not in (3,4):
     print("Error: client version most be of the form w.x.y[-rcz][-string]")
     Exit(1)
 
-mongoclientVersionRC = mongoclientVersionComponents[3:][0]
-
 env = Environment( BUILD_DIR=buildDir,
                    VARIANT_DIR=variantDir,
                    EXTRAPATH=get_option("extrapath"),
@@ -321,7 +319,6 @@ env = Environment( BUILD_DIR=buildDir,
                    MONGOCLIENT_VERSION_MAJOR=mongoclientVersionComponents[0],
                    MONGOCLIENT_VERSION_MINOR=mongoclientVersionComponents[1],
                    MONGOCLIENT_VERSION_PATCH=mongoclientVersionComponents[2],
-                   MONGOCLIENT_VERSION_RC=mongoclientVersionRC,
                    INSTALL_DIR=get_option("prefix"),
                    )
 

src/mongo/client/scoped_db_conn_test.cpp

@@ -188,9 +188,8 @@ namespace mongo {
                 if ((client_fd = ::accept(_fd, client_sa.get_address(), &client_sa.size)) == -1) {
                     perror("accept");
                     std::abort();
-                } else {
-                    return new TCPSocket(client_sa, client_fd);
                 }
+                return new TCPSocket(client_sa, client_fd);
             }
 
         private: