From 5faa116681230b65321a927fad251089e07123a6 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 22 Apr 2021 06:27:07 -0700 Subject: [PATCH] logger:Use inttypes --- src/modules/logger/logged_topics.cpp | 10 +++++----- src/modules/logger/logger.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/logger/logged_topics.cpp b/src/modules/logger/logged_topics.cpp index ed5eedb3b1..b668559a8e 100644 --- a/src/modules/logger/logged_topics.cpp +++ b/src/modules/logger/logged_topics.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * Copyright (c) 2019, 2021 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -310,7 +310,7 @@ int LoggedTopics::add_topics_from_file(const char *fname) char topic_name[80]; uint32_t interval_ms = 0; uint32_t instance = 0; - int nfields = sscanf(line, "%s %u %u", topic_name, &interval_ms, &instance); + int nfields = sscanf(line, "%s %" PRIu32 " %" PRIu32, topic_name, &interval_ms, &instance); if (nfields > 0) { int name_len = strlen(topic_name); @@ -366,7 +366,7 @@ bool LoggedTopics::add_topic(const orb_metadata *topic, uint16_t interval_ms, ui } if (_subscriptions.count >= MAX_TOPICS_NUM) { - PX4_WARN("Too many subscriptions, failed to add: %s %d", topic->o_name, instance); + PX4_WARN("Too many subscriptions, failed to add: %s %" PRIu8, topic->o_name, instance); return false; } @@ -391,7 +391,7 @@ bool LoggedTopics::add_topic(const char *name, uint16_t interval_ms, uint8_t ins if (_subscriptions.sub[j].id == static_cast(topics[i]->o_id) && _subscriptions.sub[j].instance == instance) { - PX4_DEBUG("logging topic %s(%d), interval: %i, already added, only setting interval", + PX4_DEBUG("logging topic %s(%" PRUu8 "), interval: %" PRUu16 ", already added, only setting interval", topics[i]->o_name, instance, interval_ms); _subscriptions.sub[j].interval_ms = interval_ms; @@ -403,7 +403,7 @@ bool LoggedTopics::add_topic(const char *name, uint16_t interval_ms, uint8_t ins if (!already_added) { success = add_topic(topics[i], interval_ms, instance); - PX4_DEBUG("logging topic: %s(%d), interval: %i", topics[i]->o_name, instance, interval_ms); + PX4_DEBUG("logging topic: %s(%" PRUu8 "), interval: %" PRUu16, topics[i]->o_name, instance, interval_ms); break; } } diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp index fc5c4eb6e3..e748dd5b25 100644 --- a/src/modules/logger/logger.cpp +++ b/src/modules/logger/logger.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2016 PX4 Development Team. All rights reserved. + * Copyright (c) 2016, 2021 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1121,7 +1121,7 @@ int Logger::create_log_dir(LogType type, tm *tt, char *log_dir, int log_dir_len) /* look for the next dir that does not exist */ while (!file_name.has_log_dir) { /* format log dir: e.g. /fs/microsd/log/sess001 */ - int n2 = snprintf(file_name.log_dir, sizeof(LogFileName::log_dir), "sess%03u", dir_number); + int n2 = snprintf(file_name.log_dir, sizeof(LogFileName::log_dir), "sess%03" PRIu16, dir_number); if (n2 >= (int)sizeof(LogFileName::log_dir)) { PX4_ERR("log path too long (%i)", n); @@ -1192,7 +1192,7 @@ int Logger::get_log_file_name(LogType type, char *file_name, size_t file_name_si /* look for the next file that does not exist */ while (file_number <= MAX_NO_LOGFILE) { /* format log file path: e.g. /fs/microsd/log/sess001/log001.ulg */ - snprintf(log_file_name, sizeof(LogFileName::log_file_name), "log%03u%s.ulg", file_number, replay_suffix); + snprintf(log_file_name, sizeof(LogFileName::log_file_name), "log%03" PRIu16 "%s.ulg", file_number, replay_suffix); snprintf(file_name + n, file_name_size - n, "/%s", log_file_name); if (!util::file_exist(file_name)) { @@ -1682,7 +1682,7 @@ void Logger::write_info_multiple(LogType type, const char *name, const char *val write_message(type, buffer, msg_size); } else { - PX4_ERR("info_multiple str too long (%i), key=%s", msg.key_len, msg.key); + PX4_ERR("info_multiple str too long (%" PRIu8 "), key=%s", msg.key_len, msg.key); } _writer.unlock(); @@ -1809,7 +1809,7 @@ void Logger::write_version(LogType type) // data versioning: increase this on every larger data change (format/semantic) // 1: switch to FIFO drivers (disabled on-chip DLPF) - write_info(type, "ver_data_format", 1); + write_info(type, "ver_data_format", static_cast(1)); #ifndef BOARD_HAS_NO_UUID