Undone rename of compareWithMapcodeFormat

Author: rijnb

mapcodelib/mapcoder.c

@@ -1940,7 +1940,7 @@ UWORD *convertToAlphabet(UWORD *utf16String, int maxLength, const char *asciiStr
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //
-//  hasMapcodeFormat & parseMapcode
+//  compareWithMapcodeFormat & parseMapcode
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -2101,7 +2101,7 @@ int parseMapcodeString(MapcodeElements *mapcodeFormat, const char *asciiString,
     }
 }
 
-int hasMapcodeFormat(const char *asciiString, int includesTerritory) {
+int compareWithMapcodeFormat(const char *asciiString, int includesTerritory) {
     return parseMapcodeString(NULL, asciiString, includesTerritory, 0);
 }
 

mapcodelib/mapcoder.h

@@ -174,7 +174,7 @@ int decodeMapcodeToLatLon(
  *      Special value COMPARE_MAPCODE_MISSING_CHARACTERS (-999) indicates the string could be a Mapcode, but it seems
  *      to lack some characters.
  */
-int hasMapcodeFormat(
+int compareWithMapcodeFormat(
         const char *asciiString,
         int includesTerritory);
 

unittest/unittest.c

@@ -394,12 +394,12 @@ static int test_mapcode_formats(void) {
         char str[MAX_MAPCODE_RESULT_LEN + 16];
         MapcodeElements mapcodeElements;
         int result = parseMapcodeString(&mapcodeElements, testpairs[i], 1, 0);
-        int format = hasMapcodeFormat(testpairs[i], 1);
+        int format = compareWithMapcodeFormat(testpairs[i], 1);
 
         nrTests++;
         if ((!result && format) || (result && !format)) {
             found_error();
-            printf("*** ERROR *** parseMapcodeString=%d, hasMapcodeFormat=%d\n", result, format);
+            printf("*** ERROR *** parseMapcodeString=%d, compareWithMapcodeFormat=%d\n", result, format);
         }
 
         nrTests++;
@@ -421,7 +421,7 @@ static int test_mapcode_formats(void) {
             sprintf(str, "%d", result);
             if (testpairs[i + 1][0] != 0 && strcmp(str, testpairs[i + 1]) != 0) {
                 found_error();
-                printf("*** ERROR *** hasMapcodeFormat(\"%s\") failed unexpectedly %d\n", testpairs[i], result);
+                printf("*** ERROR *** compareWithMapcodeFormat(\"%s\") failed unexpectedly %d\n", testpairs[i], result);
             }
         }
     }