From 3b6ed7a52e9095f94bb2ea0b93c59c005792684a Mon Sep 17 00:00:00 2001 From: chanywa Date: Wed, 9 Mar 2016 08:13:17 +0900 Subject: [PATCH] Fixed build errors and warnings Change-Id: I7f7cff92f2f11b7849f0108d7ab54d8eb391ef57 --- src/here_manager.cpp | 7 ++++--- src/here_place.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/here_manager.cpp b/src/here_manager.cpp index 984d8ae..b855bad 100644 --- a/src/here_manager.cpp +++ b/src/here_manager.cpp @@ -536,9 +536,10 @@ bool HereManager::GetAgreement(void) MAPS_LOGD("UC was set No"); file.close(); } else { - char buff[256]; - strerror_r(errno, buff, sizeof(buff)); - MAPS_LOGD("UC file open fail. %s (%d)", buff, errno); + char buff[256], *p; + p = strerror_r(errno, buff, sizeof(buff)); + if (p) + MAPS_LOGD("UC file open fail. %s (%d)", p, errno); } return isAgree; diff --git a/src/here_place.cpp b/src/here_place.cpp index 69d3f95..db23915 100644 --- a/src/here_place.cpp +++ b/src/here_place.cpp @@ -1262,8 +1262,8 @@ void HerePlace::__flushReplies(int error) return; } - mapsPlace = m_PlaceList.front(); - m_PlaceList.pop_front(); + mapsPlace = m_PlaceList.front(); + m_PlaceList.pop_front(); ((maps_service_get_place_details_cb)m_pCbFunc)((maps_error_e)error, m_nReqId, mapsPlace, m_pUserData); } @@ -1272,7 +1272,7 @@ void HerePlace::__flushReplies(int error) int error = maps_item_list_create(&place_list); if (error != MAPS_ERROR_NONE) { - ((maps_service_search_place_list_cb)m_pCbFunc)((maps_error_e)error, m_nReqId, NULL, m_pUserData); + ((maps_service_search_place_list_cb)m_pCbFunc)((maps_error_e)error, 0, m_nReqId, NULL, m_pUserData); return; } @@ -1284,7 +1284,7 @@ void HerePlace::__flushReplies(int error) maps_item_list_append(place_list, mapsPlace, maps_place_clone); } - ((maps_service_search_place_list_cb)m_pCbFunc)((maps_error_e)error, m_nReqId, place_list, m_pUserData); + ((maps_service_search_place_list_cb)m_pCbFunc)((maps_error_e)error, maps_item_list_items(place_list), m_nReqId, place_list, m_pUserData); } else { -- 2.7.4