Fix warnings:

- be consistent with (const char *) casts when assigning
- use xmlStrlen instead of strlen when dealing with xmlChar *

diff --git a/nominatim/import.c b/nominatim/import.c
index b9341608a42346884ccb89aeb179805dc4a89c45..419ab6a5db3ab9c43d2af7f87148f73347ad9627 100644 (file)
--- a/nominatim/import.c
+++ b/nominatim/import.c
@@ -486,7 +486,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name)
             }
             paramValues[7] = (const char *)featureExtraTagString;
 
             }
             paramValues[7] = (const char *)featureExtraTagString;
 

-            if (strlen(feature.parentPlaceID) == 0)
+            if (xmlStrlen(feature.parentPlaceID) == 0)

                 paramValues[8] = "0";
             else
                 paramValues[8] = (const char *)feature.parentPlaceID;
                 paramValues[8] = "0";
             else
                 paramValues[8] = (const char *)feature.parentPlaceID;


@@ -541,10 +541,10 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name)
 
             if (featureNameLines)
             {
 
             if (featureNameLines)
             {

-                if (strlen(feature.parentPlaceID) > 0 && featureAddressLines == 0)
+                if (xmlStrlen(feature.parentPlaceID) > 0 && featureAddressLines == 0)

                {
                     paramValues[0] = (const char *)place_id;
                {
                     paramValues[0] = (const char *)place_id;

-                    paramValues[1] = feature.parentPlaceID;
+                    paramValues[1] = (const char *)feature.parentPlaceID;

                     if (verbose) fprintf(stderr, "search_name_from_parent_insert: INSERT %s %s\n", paramValues[0], paramValues[1]);
                     res = PQexecPrepared(conn, "search_name_from_parent_insert", 2, paramValues, NULL, NULL, 0);
                     if (PQresultStatus(res) != PGRES_COMMAND_OK)
                     if (verbose) fprintf(stderr, "search_name_from_parent_insert: INSERT %s %s\n", paramValues[0], paramValues[1]);
                     res = PQexecPrepared(conn, "search_name_from_parent_insert", 2, paramValues, NULL, NULL, 0);
                     if (PQresultStatus(res) != PGRES_COMMAND_OK)