From 2f2905762b9c7b0468b56f122fef22c7ccfffeea Mon Sep 17 00:00:00 2001 From: Andrzej Popowski Date: Thu, 11 Jun 2015 11:16:06 +0200 Subject: [PATCH] [Callhistory] - replacing strtok to strtok_r Change-Id: I4b9aa725999a361b55d144b30a2a9b18b5879ab8 Signed-off-by: Andrzej Popowski --- src/callhistory/callhistory.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/callhistory/callhistory.cc b/src/callhistory/callhistory.cc index 680b9d6d..87a9a511 100755 --- a/src/callhistory/callhistory.cc +++ b/src/callhistory/callhistory.cc @@ -556,9 +556,11 @@ void CallHistory::changeListenerCB(const char* view_uri, char *changes, void* us picojson::array& removed_array = removed_obj.insert(std::make_pair(STR_DATA, picojson::value( picojson::array()))).first->second.get(); - token_type = strtok(changes, seps); + char* saveptr = nullptr; + + token_type = strtok_r(changes, seps, &saveptr); while (NULL != token_type) { - token_id = strtok(NULL, seps); + token_id = strtok_r(NULL, seps, &saveptr); change_type = atoi((const char*)token_type); if (NULL != token_id) { @@ -604,7 +606,7 @@ void CallHistory::changeListenerCB(const char* view_uri, char *changes, void* us contacts_query_destroy(query); contacts_filter_destroy(filter); - token_type = strtok( NULL, seps); + token_type = strtok_r( NULL, seps, &saveptr); } if (added_array.size() > 0) { -- 2.34.1