mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-12 12:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'snprintf' into snprintfPR

Browse Source 
# Conflicts:
#	src/driver/drv_bl_shared.c
This commit is contained in:
btsimonh
2022-10-25 06:29:59 +01:00
parent 8b7ba20544 6516205d37
commit 449d66a2d0
15 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/httpserver/new_http.c
View File

@ -199,9 +199,9 @@ void http_html_end(http_request_t* request) {
WiFI_GetMacAddress((char*)mac);
sprintf(upTimeStr, "<br>Device MAC: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
snprintf(upTimeStr, sizeof(upTimeStr), "<br>Device MAC: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
poststr(request, upTimeStr);
sprintf(upTimeStr, "<br>Short name: %s, Chipset %s", CFG_GetShortDeviceName(), PLATFORM_MCU_NAME);
snprintf(upTimeStr, sizeof(upTimeStr), "<br>Short name: %s, Chipset %s", CFG_GetShortDeviceName(), PLATFORM_MCU_NAME);
poststr(request, upTimeStr);
poststr(request, htmlBodyEnd);

2
src/httpserver/rest_interface.c
View File

@ -698,7 +698,7 @@ static int http_rest_post_logconfig(http_request_t* request) {
else {
ADDLOG_ERROR(LOG_FEATURE_API, "Unexpected key: %.*s", t[i].end - t[i].start,
json_str + t[i].start);
sprintf(tmp, "Unexpected key: %.*s\n", t[i].end - t[i].start,
snprintf(tmp, sizeof(tmp), "Unexpected key: %.*s\n", t[i].end - t[i].start,
json_str + t[i].start);
poststr(request, tmp);
}