From 4c5720f760282df8936e55064560373b6c9def0d Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Sat, 6 Jun 2015 16:51:47 +0200 Subject: [PATCH] =?utf8?q?chg:=20replace=20default=20std::shared=5Fptr()=20with=20explicit=20nullptr=20for=20empty=20return?= =?utf8?q?=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/db/mysql.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/db/mysql.cpp b/src/db/mysql.cpp index 0f4df70..db3a7b9 100644 --- a/src/db/mysql.cpp +++ b/src/db/mysql.cpp @@ -47,13 +47,13 @@ std::shared_ptr MySQLJobProvider::_connect( const std::string& server, co MYSQL* tmp( mysql_init( NULL ) ); if( !tmp ) { - return std::shared_ptr(); + return nullptr; } tmp = mysql_real_connect( tmp, server.c_str(), user.c_str(), password.c_str(), database.c_str(), 3306, NULL, CLIENT_COMPRESS ); if( !tmp ) { - return std::shared_ptr(); + return nullptr; } auto l = lib_ref; @@ -110,7 +110,7 @@ std::shared_ptr MySQLJobProvider::fetchJob() { std::tie( err, res ) = query( q ); if( err ) { - return std::shared_ptr(); + return nullptr; } unsigned int num = mysql_num_fields( res.get() ); @@ -118,7 +118,7 @@ std::shared_ptr MySQLJobProvider::fetchJob() { MYSQL_ROW row = mysql_fetch_row( res.get() ); if( !row ) { - return std::shared_ptr(); + return nullptr; } auto job = std::make_shared(); @@ -126,7 +126,7 @@ std::shared_ptr MySQLJobProvider::fetchJob() { unsigned long* l = mysql_fetch_lengths( res.get() ); if( !l ) { - return std::shared_ptr(); + return nullptr; } job->id = std::string( row[0], row[0] + l[0] ); @@ -197,19 +197,19 @@ std::shared_ptr MySQLJobProvider::fetchTBSCert( std::shared_ptr< std::tie( err, res ) = query( q ); if( err ) { - return std::shared_ptr(); + return nullptr; } MYSQL_ROW row = mysql_fetch_row( res.get() ); if( !row ) { - return std::shared_ptr(); + return nullptr; } unsigned long* l = mysql_fetch_lengths( res.get() ); if( !l ) { - return std::shared_ptr(); + return nullptr; } std::string profileName = std::string( row[4], row[4] + l[4] ); @@ -233,7 +233,7 @@ std::shared_ptr MySQLJobProvider::fetchTBSCert( std::shared_ptr< if( err ) { std::cout << mysql_error( this->conn.get() ); - return std::shared_ptr(); + return nullptr; } std::cout << "Fetching SANs" << std::endl; @@ -242,7 +242,7 @@ std::shared_ptr MySQLJobProvider::fetchTBSCert( std::shared_ptr< unsigned long* l = mysql_fetch_lengths( res.get() ); if( !l ) { - return std::shared_ptr(); + return nullptr; } std::shared_ptr nSAN = std::shared_ptr( new SAN() ); @@ -256,7 +256,7 @@ std::shared_ptr MySQLJobProvider::fetchTBSCert( std::shared_ptr< if( err ) { std::cout << mysql_error( this->conn.get() ); - return std::shared_ptr(); + return nullptr; } @@ -264,7 +264,7 @@ std::shared_ptr MySQLJobProvider::fetchTBSCert( std::shared_ptr< unsigned long* l = mysql_fetch_lengths( res.get() ); if( !l ) { - return std::shared_ptr(); + return nullptr; } std::shared_ptr nAVA = std::shared_ptr( new AVA() ); -- 2.47.3