From 9c60bb041b4cbf9e72353e8a30a2bc973baec77a Mon Sep 17 00:00:00 2001 From: Dmtiriy Gerasimov <naeper@demlabs.net> Date: Thu, 25 Apr 2019 10:25:05 +0700 Subject: [PATCH] [*] renamed _dap_string_t to dap_string_t [*] Replaced strtok() to strtok_r() for MT safe --- core/dap_config.c | 5 +++-- core/dap_string.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/dap_config.c b/core/dap_config.c index ad57537..e30c286 100755 --- a/core/dap_config.c +++ b/core/dap_config.c @@ -236,7 +236,8 @@ dap_config_t * dap_config_open(const char * a_name) l_item->data_str_array = (char**) malloc (sizeof(char*) * l_item->array_length); // parsing items in array int j = 0; - char *token = strtok(values, ","); + char * l_tmp = NULL; + char *token = strtok_r(values, ",",&l_tmp); while(token) { // trim token whitespace @@ -248,7 +249,7 @@ dap_config_t * dap_config_open(const char * a_name) l_item->data_str_array[j] = strdup(token); - token = strtok(NULL, ","); + token = strtok_r(NULL, ",",&l_tmp); j++; } diff --git a/core/dap_string.h b/core/dap_string.h index 6519f6a..cacb8d0 100755 --- a/core/dap_string.h +++ b/core/dap_string.h @@ -5,6 +5,7 @@ #include <stdbool.h> #include <stdio.h> +#include <stdint.h> typedef struct _dap_string dap_string_t; -- GitLab