fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-10 12:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

migrate remaining sprintf usage -> snprintf

Browse Source
This commit is contained in:
Daniel Agar
2022-12-06 21:09:02 -05:00
parent b3cebc6686
commit 5d2443c390
19 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/common/px4_log.cpp
+9 -9
View File
@@ -103,7 +103,7 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
#if defined(PX4_LOG_COLORIZED_OUTPUT)
if (use_color) {
pos += sprintf(buf + pos, "%s", __px4_log_level_color[level]);
pos += snprintf(buf + pos, math::max(max_length - pos, (ssize_t)0), "%s", __px4_log_level_color[level]);
}
#endif // PX4_LOG_COLORIZED_OUTPUT
@@ -137,13 +137,14 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
if (use_color) {
// alway reset color
const ssize_t sz = math::min(pos, max_length - (ssize_t)strlen(PX4_ANSI_COLOR_RESET) - (ssize_t)1);
pos += sprintf(buf + sz, "%s\n", PX4_ANSI_COLOR_RESET);
const ssize_t sz = math::min(pos, (ssize_t)(max_length - strlen(PX4_ANSI_COLOR_RESET) - 1));
pos += snprintf(buf + sz, math::max(max_length - sz, (ssize_t)0), "%s\n", PX4_ANSI_COLOR_RESET);
} else
#endif // PX4_LOG_COLORIZED_OUTPUT
{
pos += sprintf(buf + math::min(pos, max_length - (ssize_t)1), "\n");
const ssize_t sz = math::min(pos, max_length - 1);
pos += snprintf(buf + sz, math::max(max_length - sz, (ssize_t)0), "\n");
}
// ensure NULL termination (buffer is max_length + 1)
@@ -162,7 +163,7 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
va_start(argptr, fmt);
pos += vsnprintf(buf + pos, math::max(max_length - pos, (ssize_t)0), fmt, argptr);
va_end(argptr);
pos += sprintf(buf + math::min(pos, max_length - (ssize_t)1), "\n");
pos += snprintf(buf + math::min(pos, max_length - (ssize_t)1), math::max(max_length - pos, (ssize_t)0), "\n");
buf[max_length] = 0; // ensure NULL termination
}
@@ -197,6 +198,7 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
va_start(argptr, fmt);
pos += vsnprintf((char *)log_message.text + pos, math::max(max_length - pos, (ssize_t)0), fmt, argptr);
va_end(argptr);
log_message.text[max_length - 1] = 0; //ensure 0-termination
log_message.timestamp = hrt_absolute_time();
orb_publish(ORB_ID(log_message), orb_log_message_pub, &log_message);
@@ -220,7 +222,7 @@ __EXPORT void px4_log_raw(int level, const char *fmt, ...)
#if defined(PX4_LOG_COLORIZED_OUTPUT)
if (use_color) {
pos += sprintf(buf + pos, "%s", __px4_log_level_color[level]);
pos += snprintf(buf + pos, math::max(max_length - pos, (ssize_t)0), "%s", __px4_log_level_color[level]);
}
#endif // PX4_LOG_COLORIZED_OUTPUT
@@ -235,7 +237,7 @@ __EXPORT void px4_log_raw(int level, const char *fmt, ...)
if (use_color) {
// alway reset color
const ssize_t sz = math::min(pos, max_length - (ssize_t)strlen(PX4_ANSI_COLOR_RESET));
pos += sprintf(buf + sz, "%s", PX4_ANSI_COLOR_RESET);
pos += snprintf(buf + sz, math::max(max_length - sz, (ssize_t)0), "%s", PX4_ANSI_COLOR_RESET);
}
#endif // PX4_LOG_COLORIZED_OUTPUT
@@ -280,9 +282,7 @@ __EXPORT void px4_log_raw(int level, const char *fmt, ...)
__EXPORT void px4_log_history(FILE *out)
{
#if defined(BOARD_ENABLE_LOG_HISTORY)
g_log_history.print(out);
#endif // BOARD_ENABLE_LOG_HISTORY
}
platforms/common/px4_work_queue/WorkQueueManager.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ WorkQueueManagerRun(int, char **)
// pack wq struct pointer into string, this is compatible with px4_task_spawn_cmd
char arg1[sizeof(void *) * 3];
sprintf(arg1, "%lx", (long unsigned)wq);
snprintf(arg1, sizeof(arg1), "%lx", (long unsigned)wq);
const char *arg[2] = {arg1, nullptr};
int pid = px4_task_spawn_cmd(wq->name,
platforms/common/uORB/uORB_tests/uORBTest_UnitTest.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ int uORBTest::UnitTest::pubsublatency_main()
if (pubsubtest_print && timings) {
char fname[32] {};
sprintf(fname, PX4_STORAGEDIR"/uorb_timings%u.txt", timingsgroup);
snprintf(fname, sizeof(fname), PX4_STORAGEDIR"/uorb_timings%u.txt", timingsgroup);
FILE *f = fopen(fname, "w");
if (f == nullptr) {