cppcheck fixes

OSGeo · Nov 6, 2022 · 58d46fd · 58d46fd
1 parent 368e1e0
commit 58d46fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
@@ -1193,7 +1193,7 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
             else
             {
                 inv_[i].subgNum =
-                    static_cast<unsigned short>(strtol(aosNum[1], &endptr, 10));
+                    static_cast<int>(strtol(aosNum[1], &endptr, 10));
                 if (*endptr != 0) goto err_sidecar;
                 if( inv_[i].subgNum <= 0 )
                     goto err_sidecar;

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -6338,7 +6338,8 @@ OGRGeometryTypeCounter* OGRGeoPackageTableLayer::GetGeometryTypes(
         static int ProgressHandler(void* pData)
         {
             CancelCallback* psCancelCallback = static_cast<CancelCallback*>(pData);
-            return psCancelCallback->m_pfnProgress(0.0, "", psCancelCallback->m_pProgressData) ? 0 : 1;
+            return psCancelCallback->m_pfnProgress != nullptr &&
+                   psCancelCallback->m_pfnProgress(0.0, "", psCancelCallback->m_pProgressData) ? 0 : 1;
         }
     };