Fixed svace defects

[platform/core/location/maps-plugin-mapquest.git] / src / mapquest_plugin.c

diff --git a/src/mapquest_plugin.c b/src/mapquest_plugin.c
index 9b119f2..e08d4d1 100644 (file)
--- a/src/mapquest_plugin.c
+++ b/src/mapquest_plugin.c
@@ -19,6 +19,7 @@
 #include "mapquest_plugin.h"
 #include "mapquest_plugin_internal.h"
 #include "mapquest_api.h"
+#include "mapquest_util.h"
 #include <maps_error.h>
 #include <maps_route_plugin.h>
 #include <maps_route_segment_plugin.h>
@@ -457,71 +458,70 @@ EXPORT_API int maps_plugin_geocode_by_structured_address(const maps_address_h ad
                MAPS_PRINT_ERROR_CODE_RETURN(MAPS_ERROR_OUT_OF_MEMORY);
        }
 
-       char resultAddressQuery[1024];
-       strcpy(resultAddressQuery, "");
+       char resultAddressQuery[1024] = "";
 
        char *street = NULL;
        maps_address_get_street(address, &street);
        if (street != NULL)
-               strcat(resultAddressQuery, street);
+               STRCAT(resultAddressQuery, street);
 
        char *city = NULL;
        maps_address_get_city(address, &city);
        if ((strlen(resultAddressQuery) > 0) && (city != NULL)) {
-               strcat(resultAddressQuery, ",");
-               strcat(resultAddressQuery, city);
+               STRCAT(resultAddressQuery, ",");
+               STRCAT(resultAddressQuery, city);
        } else if (city != NULL) {
-               strcat(resultAddressQuery, city);
+               STRCAT(resultAddressQuery, city);
        }
 
        char *state = NULL;
        maps_address_get_state(address, &state);
        if ((strlen(resultAddressQuery) > 0) && (state != NULL)) {
-               strcat(resultAddressQuery, ",");
-               strcat(resultAddressQuery, state);
+               STRCAT(resultAddressQuery, ",");
+               STRCAT(resultAddressQuery, state);
        } else if (state != NULL) {
-               strcat(resultAddressQuery, state);
+               STRCAT(resultAddressQuery, state);
        }
 
 #if 0
        char *district = NULL;
        maps_address_get_district(address, &district);
        if ((strlen(resultAddressQuery) > 0) && (district != NULL)) {
-               strcat(resultAddressQuery, ", ");
-               strcat(resultAddressQuery, district);
+               STRCAT(resultAddressQuery, ", ");
+               STRCAT(resultAddressQuery, district);
        }
 
        char *country = NULL;
        maps_address_get_country(address, &country);
        if ((strlen(resultAddressQuery) > 0) && (country != NULL)) {
-               strcat(resultAddressQuery, ", ");
-               strcat(resultAddressQuery, country);
+               STRCAT(resultAddressQuery, ", ");
+               STRCAT(resultAddressQuery, country);
        }
 
        char *country_code = NULL;
        maps_address_get_country_code(address, &country_code);
        if ((strlen(resultAddressQuery) > 0) && (country_code != NULL)) {
-               strcat(resultAddressQuery, ", ");
-               strcat(resultAddressQuery, country_code);
+               STRCAT(resultAddressQuery, ", ");
+               STRCAT(resultAddressQuery, country_code);
        } else if (country_code != NULL) {
-               strcat(resultAddressQuery, country_code);
+               STRCAT(resultAddressQuery, country_code);
        }
 
        char *county = NULL;
        maps_address_get_county(address, &county);
        if ((strlen(resultAddressQuery) > 0) && (county != NULL)) {
-               strcat(resultAddressQuery, ", ");
-               strcat(resultAddressQuery, county);
+               STRCAT(resultAddressQuery, ", ");
+               STRCAT(resultAddressQuery, county);
        }
 #endif
 
        char *postal_code = NULL;
        maps_address_get_postal_code(address, &postal_code);
        if ((strlen(resultAddressQuery) > 0) && (postal_code != NULL)) {
-               strcat(resultAddressQuery, ",");
-               strcat(resultAddressQuery, postal_code);
+               STRCAT(resultAddressQuery, ",");
+               STRCAT(resultAddressQuery, postal_code);
        } else if (postal_code != NULL) {
-               strcat(resultAddressQuery, postal_code);
+               STRCAT(resultAddressQuery, postal_code);
        }
 
        char *modified_address = NULL;