MiramonVector: Cleaning the code and reunification of 3 functions (#12109)

Cleans up the code:
* Removes the use of GDAL_COMPILATION.
* Rewrites certain wrapper functions to use native GDAL-style implementations.
* Moves the following functions from mm_wrlayr.c/h to mm_gdal_functions.c/h:
** MMReturnValueFromSectionINIFile
** MMReturnCodeFromMM_m_idofic
** MMCheck_REL_FILE

Author: AbelPau

ogr/ogrsf_frmts/miramon/mm_constants.h

@@ -3,13 +3,7 @@
 /* -------------------------------------------------------------------- */
 /*      Constants used in GDAL and in MiraMon                           */
 /* -------------------------------------------------------------------- */
-#ifdef GDAL_COMPILATION
 CPL_C_START  // Necessary for compiling C in GDAL project
-#else
-#ifndef UINT32_MAX
-#define UINT32_MAX _UI32_MAX
-#endif
-#endif  // GDAL_COMPILATION
 
 #define MM_OFFSET_BYTESxCAMP_CAMP_CLASSIC 16
 #define MM_OFFSET_BYTESxCAMP_CAMP_ESPECIAL 21
@@ -78,11 +72,6 @@ CPL_C_START  // Necessary for compiling C in GDAL project
 
 #define MM_MAX_ID_SNY 41
 
-#ifndef GDAL_COMPILATION
-    typedef unsigned int uint32_t;
-typedef int int32_t;
-#endif
-
 // Extended DBF
 // Type of the number of records of an extended DBF
 #define MM_MAX_N_CAMPS_DBF_CLASSICA 255
@@ -141,7 +130,7 @@ typedef int int32_t;
 #define MM_JOC_CARAC_UTF8_DBF 0xFF
 #define MM_JOC_CARAC_UTF8_MM 8
 
-typedef unsigned char MM_BYTE;
+    typedef unsigned char MM_BYTE;
 
 #define MM_PRIMER_OFFSET_a_OFFSET_1a_FITXA 8
 #define MM_SEGON_OFFSET_a_OFFSET_1a_FITXA 30
@@ -163,7 +152,5 @@ typedef unsigned char MM_BYTE;
 
 #define MM_CHARACTERS_DOUBLE 40
 
-#ifdef GDAL_COMPILATION
 CPL_C_END  // Necessary for compiling in GDAL project
-#endif
-#endif  //__MM_CONSTANTS_H
+#endif     //__MM_CONSTANTS_H

ogr/ogrsf_frmts/miramon/mm_gdal_constants.h

@@ -3,16 +3,8 @@
 /* -------------------------------------------------------------------- */
 /*      Constants used in GDAL and in MiraMon                           */
 /* -------------------------------------------------------------------- */
-#ifndef GDAL_COMPILATION
-#ifdef _WIN64
-#include "gdal\release-1911-x64\cpl_port.h"  // For GUInt64
-#else
-#include "gdal\release-1911-32\cpl_port.h"  // For GUInt64
-#endif
-#else
 #include "cpl_port.h"  // For GUInt64
-CPL_C_START  // Necessary for compiling C in GDAL project
-#endif                 // GDAL_COMPILATION
+CPL_C_START            // Necessary for compiling C in GDAL project
 
 #if defined(_WIN32) && !defined(strcasecmp)
 #define strcasecmp stricmp
@@ -22,8 +14,8 @@ CPL_C_START  // Necessary for compiling C in GDAL project
 
 #define sprintf_UINT64 "%llu"
 
-// Type of the Feature ID: determines the maximum number of features in a layer.
-typedef GUInt64 MM_INTERNAL_FID;
+    // Type of the Feature ID: determines the maximum number of features in a layer.
+    typedef GUInt64 MM_INTERNAL_FID;
 // Offset to the coordinates of the Features.
 typedef GUInt64 MM_FILE_OFFSET;
 
@@ -91,7 +83,5 @@ enum MM_TipusNomCamp
 #define MM_DonaBytesNomEstesCamp(camp)                                         \
     ((MM_BYTE)((camp)->reserved_2[MM_OFFSET_RESERVED2_EXTENDED_NAME_SIZE]))
 
-#ifdef GDAL_COMPILATION
 CPL_C_END  // Necessary for compiling in GDAL project
-#endif
-#endif  //__MM_GDAL_CONSTANTS_H
+#endif     //__MM_GDAL_CONSTANTS_H

ogr/ogrsf_frmts/miramon/mm_gdal_driver_structs.h

@@ -4,16 +4,10 @@
 /*      Necessary functions to read/write a MiraMon Vector File         */
 /* -------------------------------------------------------------------- */
 
-#ifdef GDAL_COMPILATION
 #include "mm_gdal_constants.h"
 #include "mm_gdal_structures.h"
 
 CPL_C_START  // Necessary for compiling in GDAL project
-#else
-#include <stdio.h>  // For FILE
-#include "mm_constants.h"
-#include "mm_gdal\mm_gdal_structures.h"
-#endif
 
 // For MetaData
 #define SECTION_VERSIO "VERSIO"
@@ -259,7 +253,7 @@ struct MM_FLUSH_INFO
     GUInt64 NTimesFlushed;
 
     // Pointer to an OPEN file where to flush.
-    FILE_TYPE *pF;
+    VSILFILE *pF;
     // Offset in the disk where to flush
     MM_FILE_OFFSET OffsetWhereToFlush;
 
@@ -493,19 +487,19 @@ struct MiraMonPointLayer
 {
     // Name of the layer with extension
     char pszLayerName[MM_CPL_PATH_BUF_SIZE];
-    FILE_TYPE *pF;
+    VSILFILE *pF;
 
     // Coordinates x,y of the points
     struct MM_FLUSH_INFO FlushTL;
     char *pTL;                             // (II mode)
     char pszTLName[MM_CPL_PATH_BUF_SIZE];  // Temporary file where to flush
-    FILE_TYPE *pFTL;  // Pointer to temporary file where to flush
+    VSILFILE *pFTL;  // Pointer to temporary file where to flush
 
     // Z section
     // Temporary file where the Z coordinates are stored
     // if necessary
     char psz3DLayerName[MM_CPL_PATH_BUF_SIZE];
-    FILE_TYPE *pF3d;
+    VSILFILE *pF3d;
     struct MM_ZSection pZSection;
 
     // MiraMon table (extended DBF)
@@ -519,7 +513,7 @@ struct MiraMonNodeLayer
 {
     char
         pszLayerName[MM_CPL_PATH_BUF_SIZE];  // Name of the layer with extension
-    FILE_TYPE *pF;
+    VSILFILE *pF;
 
     // Header of every node
     GUInt32 nSizeNodeHeader;
@@ -530,7 +524,7 @@ struct MiraMonNodeLayer
     struct MM_FLUSH_INFO FlushNL;          // (II mode)
     char *pNL;                             //
     char pszNLName[MM_CPL_PATH_BUF_SIZE];  // Temporary file where to flush
-    FILE_TYPE *pFNL;  // Pointer to temporary file where to flush
+    VSILFILE *pFNL;  // Pointer to temporary file where to flush
 
     struct MMAdmDatabase MMAdmDB;
 
@@ -542,12 +536,12 @@ struct MiraMonArcLayer
 {
     char
         pszLayerName[MM_CPL_PATH_BUF_SIZE];  // Name of the layer with extension
-    FILE_TYPE *pF;
+    VSILFILE *pF;
 
     // Temporal file where the Z coordinates are stored
     // if necessary
     char psz3DLayerName[MM_CPL_PATH_BUF_SIZE];
-    FILE_TYPE *pF3d;
+    VSILFILE *pF3d;
 
     // Header of every arc
     GUInt32 nSizeArcHeader;
@@ -559,7 +553,7 @@ struct MiraMonArcLayer
     unsigned short int nALElementSize;     // 16 bytes: 2 doubles (coordinates)
     char *pAL;                             // Arc List  // (II mode)
     char pszALName[MM_CPL_PATH_BUF_SIZE];  // Temporary file where to flush
-    FILE_TYPE *pFAL;  // Pointer to temporary file where to flush
+    VSILFILE *pFAL;  // Pointer to temporary file where to flush
 
     // Z section
     struct MM_ZSection pZSection;
@@ -583,14 +577,14 @@ struct MiraMonPolygonLayer
 {
     char
         pszLayerName[MM_CPL_PATH_BUF_SIZE];  // Name of the layer with extension
-    FILE_TYPE *pF;
+    VSILFILE *pF;
 
     // PS part
     struct MM_FLUSH_INFO FlushPS;
     unsigned short int nPSElementSize;
     char *pPS;                             // Polygon side (II mode)
     char pszPSName[MM_CPL_PATH_BUF_SIZE];  // Temporary file where to flush
-    FILE_TYPE *pFPS;  // Pointer to temporary file where to flush
+    VSILFILE *pFPS;  // Pointer to temporary file where to flush
 
     // Header of every polygon
     MM_INTERNAL_FID nMaxPolHeader;  // Number of pPolHeader allocated
@@ -602,7 +596,7 @@ struct MiraMonPolygonLayer
     unsigned short int nPALElementSize;
     char *pPAL;                             // Polygon Arc List  // (II mode)
     char pszPALName[MM_CPL_PATH_BUF_SIZE];  // Temporary file where to flush
-    FILE_TYPE *pFPAL;  // Pointer to temporary file where to flush
+    VSILFILE *pFPAL;  // Pointer to temporary file where to flush
 
     // Arc layer associated to the arc layer
     struct MM_TH TopArcHeader;
@@ -676,7 +670,7 @@ struct MiraMonFeature
 struct MiraMonVectMapInfo
 {
     char pszMapName[MM_CPL_PATH_BUF_SIZE];
-    FILE_TYPE *fMMMap;
+    VSILFILE *fMMMap;
     int nNumberOfLayers;
 };
 
@@ -832,7 +826,5 @@ enum TreatmentVariable
     MMTVCategorical
 };
 
-#ifdef GDAL_COMPILATION
 CPL_C_END  // Necessary for compiling in GDAL project
-#endif
-#endif  //__MM_GDAL_DRIVER_STRUCTS_H
+#endif     //__MM_GDAL_DRIVER_STRUCTS_H