diff options
author | Umesh Vats <uvats@codeaurora.org> | 2015-10-28 14:01:35 -0700 |
---|---|---|
committer | Umesh Vats <uvats@codeaurora.org> | 2015-10-28 14:01:35 -0700 |
commit | d6ae28c563b2f91f3b62ac784713f7a7aefa2f82 (patch) | |
tree | 1f322aec5ad8e35558f54518552ab3bdfd9e653e /jni | |
parent | e4643d19aff6978f05b0050758ec38b3b9c53f3e (diff) | |
download | android_hardware_qcom_fm-d6ae28c563b2f91f3b62ac784713f7a7aefa2f82.tar.gz android_hardware_qcom_fm-d6ae28c563b2f91f3b62ac784713f7a7aefa2f82.tar.bz2 android_hardware_qcom_fm-d6ae28c563b2f91f3b62ac784713f7a7aefa2f82.zip |
Bluetooth: KW fixes for banned API strtok
All occurrences of strtok replaced with corresponding
reentrant verson, strtok_r
Change-Id: Ie38c512242fba3664d1da549c6eb696eb0fdcde1
Diffstat (limited to 'jni')
-rw-r--r-- | jni/ConfigFmThs.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jni/ConfigFmThs.cpp b/jni/ConfigFmThs.cpp index 09529c5..3845dfd 100644 --- a/jni/ConfigFmThs.cpp +++ b/jni/ConfigFmThs.cpp @@ -412,12 +412,13 @@ unsigned int ConfigFmThs :: extract_comma_sep_freqs ) { char *next_freq; + char *saveptr = NULL; unsigned int freq; unsigned int *freqs_new_arr; unsigned int size = 0; unsigned int len = 0; - next_freq = strtok(freqs, str); + next_freq = strtok_r(freqs, str, &saveptr); while(next_freq != NULL) { freq = atoi(next_freq); ALOGD("HYBRID_SRCH freq: %u\n", freq); @@ -436,7 +437,7 @@ unsigned int ConfigFmThs :: extract_comma_sep_freqs } (*freqs_arr)[len] = freq; len++; - next_freq = strtok(NULL, str); + next_freq = strtok_r(NULL, str, &saveptr); } return len; } @@ -449,12 +450,13 @@ unsigned int ConfigFmThs :: extract_comma_sep_sinrs ) { char *next_sinr; + char *saveptr = NULL; signed char *sinrs_new_arr; unsigned int size = 0; unsigned int len = 0; signed char sinr; - next_sinr = strtok(sinrs, str); + next_sinr = strtok_r(sinrs, str, &saveptr); while(next_sinr != NULL) { sinr = atoi(next_sinr); ALOGD("HYBRID_SRCH sinr: %d\n", sinr); @@ -473,7 +475,7 @@ unsigned int ConfigFmThs :: extract_comma_sep_sinrs } (*sinrs_arr)[len] = sinr; len++; - next_sinr = strtok(NULL, str); + next_sinr = strtok_r(NULL, str, &saveptr); } return len; } |