Improve chances for copy elision

m-kuhn · m-kuhn · commit 447cd18a27ea · 2017-11-15T08:51:17.000+01:00
diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -683,20 +683,17 @@ bool QgsAuxiliaryStorage::createTable( const QString &type, const QString &table
 
 spatialite_database_unique_ptr QgsAuxiliaryStorage::createDB( const QString &filename )
 {
-  int rc;
-
-  // open/create database
   spatialite_database_unique_ptr database;
+
+  int rc;
   rc = database.open_v2( filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nullptr );
   if ( rc )
   {
     debugMsg( QStringLiteral( "sqlite3_open_v2" ), database.get() );
-    return database;
   }
-
-  // activating Foreign Key constraints
-  if ( !exec( QStringLiteral( "PRAGMA foreign_keys = 1" ), database.get() ) )
-    return database;
+  else
+    // activating Foreign Key constraints
+    exec( QStringLiteral( "PRAGMA foreign_keys = 1" ), database.get() );
 
   return database;
 }

Original file line number	Diff line number	Diff line change
`@@ -683,20 +683,17 @@ bool QgsAuxiliaryStorage::createTable( const QString &type, const QString &table`
`683`	`683`
`684`	`684`	`spatialite_database_unique_ptr QgsAuxiliaryStorage::createDB( const QString &filename )`
`685`	`685`	`{`
`686`		`- int rc;`
`687`		`-`
`688`		`- // open/create database`
`689`	`686`	`spatialite_database_unique_ptr database;`
	`687`	`+`
	`688`	`+ int rc;`
`690`	`689`	`rc = database.open_v2( filename, SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE, nullptr );`
`691`	`690`	`if ( rc )`
`692`	`691`	`{`
`693`	`692`	`debugMsg( QStringLiteral( "sqlite3_open_v2" ), database.get() );`
`694`		`- return database;`
`695`	`693`	`}`
`696`		`-`
`697`		`- // activating Foreign Key constraints`
`698`		`- if ( !exec( QStringLiteral( "PRAGMA foreign_keys = 1" ), database.get() ) )`
`699`		`- return database;`
	`694`	`+ else`
	`695`	`+ // activating Foreign Key constraints`
	`696`	`+ exec( QStringLiteral( "PRAGMA foreign_keys = 1" ), database.get() );`
`700`	`697`
`701`	`698`	`return database;`
`702`	`699`	`}`