From f84d90d06d68fd6b6e07cafa951c3b4e99541ca9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 20 Jan 2020 20:50:40 +0100
Subject: [PATCH] Oracle provider: fix compiler warnings

- Remove use of surfaceType variable that is never read
- Avoid self assignment of nRings variable
---
 src/providers/oracle/qgsoracleprovider.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
index f6b37f1eef6..896144b7f17 100644
--- a/src/providers/oracle/qgsoracleprovider.cpp
+++ b/src/providers/oracle/qgsoracleprovider.cpp
@@ -2180,19 +2180,18 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry &geom, QSqlQuery &qry
       {
         g.gtype = SDO_GTYPE( dim, GtPolygon );
         int nSurfaces = 1;
-        QgsWkbTypes::Type surfaceType = type;
         if ( type == QgsWkbTypes::MultiSurface || type == QgsWkbTypes::MultiSurfaceZ )
         {
           g.gtype = SDO_GTYPE( dim, GtMultiPolygon );
           nSurfaces = *ptr.iPtr++;
 
           ptr.ucPtr++; // Skip endianness of first surface
-          surfaceType = ( QgsWkbTypes::Type ) * ptr.iPtr++; // type of first surface
+          ptr.iPtr++; // Skip type of first surface
         }
 
         for ( int iSurface = 0; iSurface < nSurfaces; iSurface++ )
         {
-          int nRings = nRings = *ptr.iPtr++;
+          const int nRings = *ptr.iPtr++;
 
           ptr.ucPtr++; // Skip endianness of first ring
           QgsWkbTypes::Type ringType = ( QgsWkbTypes::Type ) * ptr.iPtr++; // type of first ring
@@ -2245,8 +2244,6 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry &geom, QSqlQuery &qry
 
             ringType = lineType; // type of next curve
           }
-
-          surfaceType = lineType;
         }
       }
       break;