naming convention + solving an error + OGRMiraMonDriverIdentify() ins…

…tead of poOpenInfo->bStatOK
rouault · Apr 4, 2024 · d6525fe · d6525fe
1 parent 9679657
commit d6525fe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -2850,7 +2850,7 @@ static void MMGetOffsetAlignedTo8(MM_FILE_OFFSET *Offset)
 // Reading integers depending on the version being read.
 int MMReadGUInt64DependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
                                     struct MM_FLUSH_INFO *FlushInfo,
-                                    GUInt64 *nUI64)
+                                    GUInt64 *pnUI64)
 {
     uint32_t nUL32;
 
@@ -2866,12 +2866,12 @@ int MMReadGUInt64DependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
             FlushInfo->pBlockToBeSaved = nullptr;
             return 1;
         }
-        *nUI64 = (GUInt64)nUL32;
+        *pnUI64 = (GUInt64)nUL32;
     }
     else
     {
-        FlushInfo->pBlockToBeSaved = (void *)nUI64;
-        FlushInfo->SizeOfBlockToBeSaved = sizeof(&nUI64);
+        FlushInfo->pBlockToBeSaved = (void *)pnUI64;
+        FlushInfo->SizeOfBlockToBeSaved = sizeof(*pnUI64);
         if (MMReadBlockFromBuffer(FlushInfo))
         {
             FlushInfo->pBlockToBeSaved = nullptr;
@@ -2885,7 +2885,7 @@ int MMReadGUInt64DependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
 // Reading offsets depending on the version is being read.
 int MMReadOffsetDependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
                                    struct MM_FLUSH_INFO *FlushInfo,
-                                   MM_FILE_OFFSET *nUI64)
+                                   MM_FILE_OFFSET *pnUI64)
 {
     uint32_t nUL32;
 
@@ -2901,12 +2901,12 @@ int MMReadOffsetDependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
             FlushInfo->pBlockToBeSaved = nullptr;
             return 1;
         }
-        *nUI64 = (MM_FILE_OFFSET)nUL32;
+        *pnUI64 = (MM_FILE_OFFSET)nUL32;
     }
     else
     {
-        FlushInfo->pBlockToBeSaved = (void *)nUI64;
-        FlushInfo->SizeOfBlockToBeSaved = sizeof(&nUI64);
+        FlushInfo->pBlockToBeSaved = (void *)pnUI64;
+        FlushInfo->SizeOfBlockToBeSaved = sizeof(*pnUI64);
         if (MMReadBlockFromBuffer(FlushInfo))
         {
             FlushInfo->pBlockToBeSaved = nullptr;

diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.h b/ogr/ogrsf_frmts/miramon/mm_wrlayr.h
@@ -152,7 +152,7 @@ int MMReadFlush(struct MM_FLUSH_INFO *pFlush);
 int MMReadBlockFromBuffer(struct MM_FLUSH_INFO *FlushInfo);
 int MMReadGUInt64DependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
                                     struct MM_FLUSH_INFO *FlushInfo,
-                                    GUInt64 *nUI64);
+                                    GUInt64 *pnUI64);
 int MMReadOffsetDependingOnVersion(struct MiraMonVectLayerInfo *hMiraMonLayer,
                                    struct MM_FLUSH_INFO *FlushInfo,
                                    MM_FILE_OFFSET *nUI64);

diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp
@@ -76,7 +76,7 @@ static int OGRMiraMonDriverIdentify(GDALOpenInfo *poOpenInfo)
 static GDALDataset *OGRMiraMonDriverOpen(GDALOpenInfo *poOpenInfo)
 
 {
-    if (!poOpenInfo->bStatOK)
+    if (OGRMiraMonDriverIdentify(poOpenInfo) == FALSE)
         return nullptr;
 
     OGRMiraMonDataSource *poDS = new OGRMiraMonDataSource();