hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #632 from melvyn-sopacua/libxml2-fixes

Browse Source 
Fix warnings:
This commit is contained in:
Sarah Hoffmann
2017-02-15 21:31:42 +01:00
committed by GitHub
parent 56962deb30 13ab03a03a
commit 679e4c47ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nominatim/import.c
View File

@@ -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"; paramValues[8] = "0";
else else
paramValues[8] = (const char *)feature.parentPlaceID; 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]); 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); res = PQexecPrepared(conn, "search_name_from_parent_insert", 2, paramValues, NULL, NULL, 0);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)