Merge pull request #3290 from rouault/fix_3233

Remove unused variable assignments (fixes #3233)
OSGeo · Dec 15, 2020 · c375f75 · c375f75
2 parents 3c2a318 + 044a11e
commit c375f75
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/gdal/alg/internal_libqhull/merge.c b/gdal/alg/internal_libqhull/merge.c
@@ -1148,7 +1148,7 @@ void qh_getmergeset(facetT *facetlist) {
   ridgeT *ridge, **ridgep;
   int nummerges;
 
-  nummerges= qh_setsize(qh facet_mergeset);
+  /* nummerges= qh_setsize(qh facet_mergeset); */
   trace4((qh ferr, 4026, "qh_getmergeset: started.\n"));
   qh visit_id++;
   FORALLfacet_(facetlist) {

diff --git a/gdal/frmts/aigrid/aigccitt.c b/gdal/frmts/aigrid/aigccitt.c
@@ -1539,8 +1539,9 @@ typedef struct {
     sp->bit = BitsAvail;						\
     sp->data = BitAcc;							\
     sp->EOLcnt = EOLcnt;						\
-    rawcc -= (int)((unsigned char *) cp - rawcp);			\
-    rawcp = (unsigned char *) cp;					\
+    /* below updates not needed in AIG case */                          \
+    /* rawcc -= (int)((unsigned char *) cp - rawcp); */			\
+    /* rawcp = (unsigned char *) cp; */					\
 } while (0)
 
 /*

diff --git a/gdal/frmts/grib/degrib/g2clib/reduce.c b/gdal/frmts/grib/degrib/g2clib/reduce.c
@@ -192,7 +192,7 @@
 /*                 NO SPLITS OR NEW BOXES. */
 		goto L190;
 	    } else {
-		novl = nov[l];
+		// novl = nov[l];
 
 		m = (nov[l] - 1) / (ibxx2[j] - 1) + 1;
 /*                 M IS FOUND BY SOLVING THE EQUATION BELOW FOR M: */

diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -2705,23 +2705,14 @@ lh_entry* OGRGeoJSONFindMemberEntryByName( json_object* poObj,
     if( nullptr == pszName || nullptr == poObj)
         return nullptr;
 
-    json_object* poTmp = poObj;
-
-    json_object_iter it;
-    it.key = nullptr;
-    it.val = nullptr;
-    it.entry = nullptr;
-    if( nullptr != json_object_get_object(poTmp) &&
-        nullptr != json_object_get_object(poTmp)->head )
+    if( nullptr != json_object_get_object(poObj) )
     {
-        it.entry = json_object_get_object(poTmp)->head;
-        while( it.entry != nullptr )
+        lh_entry* entry = json_object_get_object(poObj)->head;
+        while( entry != nullptr )
         {
-            it.key = (char*)it.entry->k;
-            it.val = (json_object*)it.entry->v;
-            if( EQUAL( it.key, pszName ) )
-                return it.entry;
-            it.entry = it.entry->next;
+            if( EQUAL( static_cast<const char*>(entry->k), pszName ) )
+                return entry;
+            entry = entry->next;
         }
     }
 

diff --git a/gdal/port/cpl_cpu_features.cpp b/gdal/port/cpl_cpu_features.cpp
@@ -156,6 +156,7 @@ static bool CPLDetectRuntimeAVX()
     {
         return false;
     }
+    CPL_IGNORE_RET_VAL(nXCRHigh); // unused
 
     return true;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,6 +156,7 @@ static bool CPLDetectRuntimeAVX() @@
         {
             return false;
         }
+        CPL_IGNORE_RET_VAL(nXCRHigh); // unused
         return true;
     }
@@ Expand Down @@