From 76bf5ec69b0d675fd8fa4baeaaf14e2f5500800c Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sun, 2 Oct 2022 12:37:55 +0200 Subject: [PATCH] Fix cpplint: Replace strtok by strtok_r --- src/MqttSettings.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp index f3cbb52c..e571d6ec 100644 --- a/src/MqttSettings.cpp +++ b/src/MqttSettings.cpp @@ -90,10 +90,11 @@ void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessagePropertie char* serial_str; char* subtopic; char* setting; + char* rest = &token_topic[strlen(config.Mqtt_Topic)]; - serial_str = strtok(&token_topic[strlen(config.Mqtt_Topic)], "/"); - subtopic = strtok(NULL, "/"); - setting = strtok(NULL, "/"); + serial_str = strtok_r(rest, "/", &rest); + subtopic = strtok_r(rest, "/", &rest); + setting = strtok_r(rest, "/", &rest); if (serial_str == NULL || subtopic == NULL || setting == NULL) { return;