More sqlite3_finalize

mhugent · mhugent · commit 40a8cb9fc372 · 2013-11-25T14:38:51.000+01:00
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -865,7 +865,7 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in
   int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );
   if ( prepareRes != SQLITE_OK )
   {
-    sqlite3_close( db );
+    sqlite3_finalize( stmt ); sqlite3_close( db );
     return;
   }
 
@@ -875,8 +875,7 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in
     cOpCode = ( const char * ) sqlite3_column_text( stmt, 0 );
     transforms.push_back( cOpCode.toInt() );
   }
-  sqlite3_finalize( stmt );
-  sqlite3_close( db );
+  sqlite3_finalize( stmt ); sqlite3_close( db );
 }
 
 QString QgsCoordinateTransform::datumTransformString( int datumTransform )
@@ -896,7 +895,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
   int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );
   if ( prepareRes != SQLITE_OK )
   {
-    sqlite3_close( db );
+    sqlite3_finalize( stmt ); sqlite3_close( db );
     return transformString;
   }
 
@@ -929,8 +928,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
     }
   }
 
-  sqlite3_finalize( stmt );
-  sqlite3_close( db );
+  sqlite3_finalize( stmt ); sqlite3_close( db );
   return transformString;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in`
`865`	`865`	`int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );`
`866`	`866`	`if ( prepareRes != SQLITE_OK )`
`867`	`867`	`{`
`868`		`- sqlite3_close( db );`
	`868`	`+ sqlite3_finalize( stmt ); sqlite3_close( db );`
`869`	`869`	`return;`
`870`	`870`	`}`
`871`	`871`
`@@ -875,8 +875,7 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in`
`875`	`875`	`cOpCode = ( const char * ) sqlite3_column_text( stmt, 0 );`
`876`	`876`	`transforms.push_back( cOpCode.toInt() );`
`877`	`877`	`}`
`878`		`- sqlite3_finalize( stmt );`
`879`		`- sqlite3_close( db );`
	`878`	`+ sqlite3_finalize( stmt ); sqlite3_close( db );`
`880`	`879`	`}`
`881`	`880`
`882`	`881`	`QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`@@ -896,7 +895,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`896`	`895`	`int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );`
`897`	`896`	`if ( prepareRes != SQLITE_OK )`
`898`	`897`	`{`
`899`		`- sqlite3_close( db );`
	`898`	`+ sqlite3_finalize( stmt ); sqlite3_close( db );`
`900`	`899`	`return transformString;`
`901`	`900`	`}`
`902`	`901`
`@@ -929,8 +928,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`929`	`928`	`}`
`930`	`929`	`}`
`931`	`930`
`932`		`- sqlite3_finalize( stmt );`
`933`		`- sqlite3_close( db );`
	`931`	`+ sqlite3_finalize( stmt ); sqlite3_close( db );`
`934`	`932`	`return transformString;`
`935`	`933`	`}`
`936`	`934`