mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-21 19:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

ams: use util::SNPrintf over std:: (size/linker improvements)

Browse Source
This commit is contained in:
Michael Scire 2021-01-12 02:59:41 -08:00
parent 128884fb56
commit 26369e34f1
26 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstratosphere/include/stratosphere/fs/fs_path_utils.hpp
View File

@ -75,7 +75,7 @@ namespace ams::fs {
/* Format the path. */ /* Format the path. */
std::va_list va_list; std::va_list va_list;
va_start(va_list, format); va_start(va_list, format);
const size_t len = std::vsnprintf(dst->str, sizeof(dst->str), format, va_list); const size_t len = util::VSNPrintf(dst->str, sizeof(dst->str), format, va_list);
va_end(va_list); va_end(va_list);
/* Validate length. */ /* Validate length. */

6
libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp
View File

@ -49,7 +49,7 @@ namespace ams::kvdb {
std::va_list args; std::va_list args;
va_start(args, format); va_start(args, format);
CheckLength(std::vsnprintf(string.buffer, N, format, args)); CheckLength(util::VSNPrintf(string.buffer, N, format, args));
string.buffer[N - 1] = 0; string.buffer[N - 1] = 0;
va_end(args); va_end(args);
@ -81,7 +81,7 @@ namespace ams::kvdb {
/* Format into the buffer, abort if too large. */ /* Format into the buffer, abort if too large. */
std::va_list args; std::va_list args;
va_start(args, format); va_start(args, format);
CheckLength(std::vsnprintf(this->buffer, N, format, args)); CheckLength(util::VSNPrintf(this->buffer, N, format, args));
va_end(args); va_end(args);
} }
@ -103,7 +103,7 @@ namespace ams::kvdb {
const size_t length = GetLength(); const size_t length = GetLength();
std::va_list args; std::va_list args;
va_start(args, format); va_start(args, format);
CheckLength(std::vsnprintf(this->buffer + length, N - length, format, args) + length); CheckLength(util::VSNPrintf(this->buffer + length, N - length, format, args) + length);
va_end(args); va_end(args);
} }

6
libstratosphere/source/ams/ams_emummc_api.cpp
View File

@ -88,14 +88,14 @@ namespace ams::emummc {
/* Format paths. */ /* Format paths. */
if (storage == Storage_SdFile) { if (storage == Storage_SdFile) {
std::snprintf(g_exo_config.file_cfg.path, sizeof(g_exo_config.file_cfg.path), "/%s", paths->file_path); util::SNPrintf(g_exo_config.file_cfg.path, sizeof(g_exo_config.file_cfg.path), "/%s", paths->file_path);
} }
std::snprintf(g_exo_config.emu_dir_path, sizeof(g_exo_config.emu_dir_path), "/%s", paths->nintendo_path); util::SNPrintf(g_exo_config.emu_dir_path, sizeof(g_exo_config.emu_dir_path), "/%s", paths->nintendo_path);
/* If we're emummc, implement default nintendo redirection path. */ /* If we're emummc, implement default nintendo redirection path. */
if (g_is_emummc && std::strcmp(g_exo_config.emu_dir_path, "/") == 0) { if (g_is_emummc && std::strcmp(g_exo_config.emu_dir_path, "/") == 0) {
std::snprintf(g_exo_config.emu_dir_path, sizeof(g_exo_config.emu_dir_path), "/emummc/Nintendo_%04x", g_exo_config.base_cfg.id); util::SNPrintf(g_exo_config.emu_dir_path, sizeof(g_exo_config.emu_dir_path), "/emummc/Nintendo_%04x", g_exo_config.base_cfg.id);
} }
} }

2
libstratosphere/source/boot2/boot2_api.cpp
View File

@ -238,7 +238,7 @@ namespace ams::boot2 {
/* Read the mitm list off the SD card. */ /* Read the mitm list off the SD card. */
{ {
char path[fs::EntryNameLengthMax]; char path[fs::EntryNameLengthMax];
std::snprintf(path, sizeof(path), "sdmc:/atmosphere/contents/%016lx/mitm.lst", static_cast<u64>(program_id)); util::SNPrintf(path, sizeof(path), "sdmc:/atmosphere/contents/%016lx/mitm.lst", static_cast<u64>(program_id));
fs::FileHandle f; fs::FileHandle f;
if (R_FAILED(fs::OpenFile(&f, path, fs::OpenMode_Read))) { if (R_FAILED(fs::OpenFile(&f, path, fs::OpenMode_Read))) {

10
libstratosphere/source/cfg/cfg_flags.cpp
View File

@ -23,7 +23,7 @@ namespace ams::cfg {
/* Helper. */ /* Helper. */
void GetFlagMountName(char *dst) { void GetFlagMountName(char *dst) {
std::snprintf(dst, fs::MountNameLengthMax + 1, "#flag%08x", g_flag_mount_count.fetch_add(1)); util::SNPrintf(dst, fs::MountNameLengthMax + 1, "#flag%08x", g_flag_mount_count.fetch_add(1));
} }
bool HasFlagFile(const char *flag_path) { bool HasFlagFile(const char *flag_path) {
@ -42,7 +42,7 @@ namespace ams::cfg {
/* Check if the entry exists. */ /* Check if the entry exists. */
char full_path[fs::EntryNameLengthMax + 1]; char full_path[fs::EntryNameLengthMax + 1];
std::snprintf(full_path, sizeof(full_path), "%s:/%s", mount_name, flag_path[0] == '/' ? flag_path + 1 : flag_path); util::SNPrintf(full_path, sizeof(full_path), "%s:/%s", mount_name, flag_path[0] == '/' ? flag_path + 1 : flag_path);
bool has_file; bool has_file;
if (R_FAILED(fs::HasFile(std::addressof(has_file), full_path))) { if (R_FAILED(fs::HasFile(std::addressof(has_file), full_path))) {
@ -61,19 +61,19 @@ namespace ams::cfg {
bool HasContentSpecificFlag(ncm::ProgramId program_id, const char *flag) { bool HasContentSpecificFlag(ncm::ProgramId program_id, const char *flag) {
char content_flag[fs::EntryNameLengthMax + 1]; char content_flag[fs::EntryNameLengthMax + 1];
std::snprintf(content_flag, sizeof(content_flag) - 1, "/atmosphere/contents/%016lx/flags/%s.flag", static_cast<u64>(program_id), flag); util::SNPrintf(content_flag, sizeof(content_flag) - 1, "/atmosphere/contents/%016lx/flags/%s.flag", static_cast<u64>(program_id), flag);
return HasFlagFile(content_flag); return HasFlagFile(content_flag);
} }
bool HasGlobalFlag(const char *flag) { bool HasGlobalFlag(const char *flag) {
char global_flag[fs::EntryNameLengthMax + 1]; char global_flag[fs::EntryNameLengthMax + 1];
std::snprintf(global_flag, sizeof(global_flag) - 1, "/atmosphere/flags/%s.flag", flag); util::SNPrintf(global_flag, sizeof(global_flag) - 1, "/atmosphere/flags/%s.flag", flag);
return HasFlagFile(global_flag); return HasFlagFile(global_flag);
} }
bool HasHblFlag(const char *flag) { bool HasHblFlag(const char *flag) {
char hbl_flag[0x100]; char hbl_flag[0x100];
std::snprintf(hbl_flag, sizeof(hbl_flag) - 1, "hbl_%s", flag); util::SNPrintf(hbl_flag, sizeof(hbl_flag) - 1, "hbl_%s", flag);
return HasGlobalFlag(hbl_flag); return HasGlobalFlag(hbl_flag);
} }

8
libstratosphere/source/cfg/cfg_override.cpp
View File

@ -252,7 +252,7 @@ namespace ams::cfg {
while (*value == '/' || *value == '\\') { while (*value == '/' || *value == '\\') {
value++; value++;
} }
std::snprintf(g_hbl_sd_path, sizeof(g_hbl_sd_path) - 1, "/%s", value); util::SNPrintf(g_hbl_sd_path, sizeof(g_hbl_sd_path) - 1, "/%s", value);
g_hbl_sd_path[sizeof(g_hbl_sd_path) - 1] = '\0'; g_hbl_sd_path[sizeof(g_hbl_sd_path) - 1] = '\0';
for (size_t i = 0; i < sizeof(g_hbl_sd_path); i++) { for (size_t i = 0; i < sizeof(g_hbl_sd_path); i++) {
@ -332,7 +332,7 @@ namespace ams::cfg {
std::atomic<u32> g_ini_mount_count; std::atomic<u32> g_ini_mount_count;
void GetIniMountName(char *dst) { void GetIniMountName(char *dst) {
std::snprintf(dst, fs::MountNameLengthMax + 1, "#ini%08x", g_ini_mount_count.fetch_add(1)); util::SNPrintf(dst, fs::MountNameLengthMax + 1, "#ini%08x", g_ini_mount_count.fetch_add(1));
} }
void ParseIniFile(util::ini::Handler handler, const char *path, void *user_ctx) { void ParseIniFile(util::ini::Handler handler, const char *path, void *user_ctx) {
@ -348,7 +348,7 @@ namespace ams::cfg {
fs::FileHandle file; fs::FileHandle file;
{ {
char full_path[fs::EntryNameLengthMax + 1]; char full_path[fs::EntryNameLengthMax + 1];
std::snprintf(full_path, sizeof(full_path), "%s:/%s", mount_name, path[0] == '/' ? path + 1 : path); util::SNPrintf(full_path, sizeof(full_path), "%s:/%s", mount_name, path[0] == '/' ? path + 1 : path);
if (R_FAILED(fs::OpenFile(std::addressof(file), full_path, fs::OpenMode_Read))) { if (R_FAILED(fs::OpenFile(std::addressof(file), full_path, fs::OpenMode_Read))) {
return; return;
} }
@ -365,7 +365,7 @@ namespace ams::cfg {
ContentSpecificOverrideConfig GetContentOverrideConfig(ncm::ProgramId program_id) { ContentSpecificOverrideConfig GetContentOverrideConfig(ncm::ProgramId program_id) {
char path[fs::EntryNameLengthMax + 1]; char path[fs::EntryNameLengthMax + 1];
std::snprintf(path, sizeof(path), "/atmosphere/contents/%016lx/config.ini", static_cast<u64>(program_id)); util::SNPrintf(path, sizeof(path), "/atmosphere/contents/%016lx/config.ini", static_cast<u64>(program_id));
ContentSpecificOverrideConfig config = { ContentSpecificOverrideConfig config = {
.override_key = g_default_override_key, .override_key = g_default_override_key,

2
libstratosphere/source/diag/diag_assertion_impl.cpp
View File

@ -50,7 +50,7 @@ namespace ams::diag {
void DebugLogImpl(const char *format, ::std::va_list vl) { void DebugLogImpl(const char *format, ::std::va_list vl) {
std::scoped_lock lk(g_debug_log_lock); std::scoped_lock lk(g_debug_log_lock);
std::vsnprintf(g_debug_buffer, sizeof(g_debug_buffer), format, vl); util::VSNPrintf(g_debug_buffer, sizeof(g_debug_buffer), format, vl);
svc::OutputDebugString(g_debug_buffer, strlen(g_debug_buffer)); svc::OutputDebugString(g_debug_buffer, strlen(g_debug_buffer));
} }

2
libstratosphere/source/erpt/srv/erpt_srv_attachment.cpp
View File

@ -24,7 +24,7 @@ namespace ams::erpt::srv {
attachment_id.uuid.ToString(uuid_str, sizeof(uuid_str)); attachment_id.uuid.ToString(uuid_str, sizeof(uuid_str));
AttachmentFileName attachment_name; AttachmentFileName attachment_name;
std::snprintf(attachment_name.name, sizeof(attachment_name.name), "%s:/%s.att", ReportStoragePath, uuid_str); util::SNPrintf(attachment_name.name, sizeof(attachment_name.name), "%s:/%s.att", ReportStoragePath, uuid_str);
return attachment_name; return attachment_name;
} }

2
libstratosphere/source/erpt/srv/erpt_srv_report.cpp
View File

@ -21,7 +21,7 @@ namespace ams::erpt::srv {
ReportFileName Report::FileName(ReportId report_id, bool redirect_to_sd) { ReportFileName Report::FileName(ReportId report_id, bool redirect_to_sd) {
ReportFileName report_name; ReportFileName report_name;
std::snprintf(report_name.name, sizeof(report_name.name), util::SNPrintf(report_name.name, sizeof(report_name.name),
"%s:/%08x-%04x-%04x-%02x%02x-%04x%08x", "%s:/%08x-%04x-%04x-%02x%02x-%04x%08x",
(redirect_to_sd ? ReportOnSdStoragePath : ReportStoragePath), (redirect_to_sd ? ReportOnSdStoragePath : ReportStoragePath),
report_id.uuid_data.time_low, report_id.uuid_data.time_low,

10
libstratosphere/source/fs/fs_access_log.cpp
View File

@ -80,7 +80,7 @@ namespace ams::fs {
namespace ams::fs::impl { namespace ams::fs::impl {
const char *IdString::ToValueString(int id) { const char *IdString::ToValueString(int id) {
const int len = std::snprintf(this->buffer, sizeof(this->buffer), "%d", id); const int len = util::SNPrintf(this->buffer, sizeof(this->buffer), "%d", id);
AMS_ASSERT(static_cast<size_t>(len) < sizeof(this->buffer)); AMS_ASSERT(static_cast<size_t>(len) < sizeof(this->buffer));
return this->buffer; return this->buffer;
} }
@ -202,7 +202,7 @@ namespace ams::fs::impl {
return; return;
} }
const auto size = std::vsnprintf(log_buffer.get(), log_buffer_size, format, vl); const auto size = util::VSNPrintf(log_buffer.get(), log_buffer_size, format, vl);
if (size < log_buffer_size) { if (size < log_buffer_size) {
break; break;
} }
@ -233,7 +233,7 @@ namespace ams::fs::impl {
return; return;
} }
const auto size = std::vsnprintf(str_buffer.get(), str_buffer_size, format, vl); const auto size = util::VSNPrintf(str_buffer.get(), str_buffer_size, format, vl);
if (size < str_buffer_size) { if (size < str_buffer_size) {
break; break;
} }
@ -269,7 +269,7 @@ namespace ams::fs::impl {
return; return;
} }
log_buffer_size = 1 + std::snprintf(log_buffer.get(), try_size, FormatString, start_ms, end_ms, result.GetValue(), handle, priority, name, str_buffer.get()); log_buffer_size = 1 + util::SNPrintf(log_buffer.get(), try_size, FormatString, start_ms, end_ms, result.GetValue(), handle, priority, name, str_buffer.get());
if (log_buffer_size <= try_size) { if (log_buffer_size <= try_size) {
break; break;
} }
@ -312,7 +312,7 @@ namespace ams::fs::impl {
" }\n"; " }\n";
char log_buffer[0x80]; char log_buffer[0x80];
const int len = 1 + std::snprintf(log_buffer, sizeof(log_buffer), StartLog, static_cast<int>(program_index)); const int len = 1 + util::SNPrintf(log_buffer, sizeof(log_buffer), StartLog, static_cast<int>(program_index));
if (static_cast<size_t>(len) <= sizeof(log_buffer)) { if (static_cast<size_t>(len) <= sizeof(log_buffer)) {
OutputAccessLogImpl(log_buffer, len); OutputAccessLogImpl(log_buffer, len);
} }

2
libstratosphere/source/fs/fs_bis.cpp
View File

@ -33,7 +33,7 @@ namespace ams::fs {
AMS_ABORT_UNLESS(dst_size >= needed_size); AMS_ABORT_UNLESS(dst_size >= needed_size);
/* Generate the name. */ /* Generate the name. */
auto size = std::snprintf(dst, dst_size, "%s:", bis_mount_name); auto size = util::SNPrintf(dst, dst_size, "%s:", bis_mount_name);
AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1); AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1);
return ResultSuccess(); return ResultSuccess();

4
libstratosphere/source/fs/fs_code.cpp
View File

@ -172,7 +172,7 @@ namespace ams::fs {
/* Create a redirection filesystem to the relevant content folder. */ /* Create a redirection filesystem to the relevant content folder. */
char path[fs::EntryNameLengthMax + 1]; char path[fs::EntryNameLengthMax + 1];
std::snprintf(path, sizeof(path), "/atmosphere/contents/%016lx/exefs", program_id.value); util::SNPrintf(path, sizeof(path), "/atmosphere/contents/%016lx/exefs", program_id.value);
auto subdir_fs = std::make_unique<fssystem::SubDirectoryFileSystem>(std::move(sd_fs), path); auto subdir_fs = std::make_unique<fssystem::SubDirectoryFileSystem>(std::move(sd_fs), path);
if (subdir_fs == nullptr) { if (subdir_fs == nullptr) {
@ -190,7 +190,7 @@ namespace ams::fs {
/* Create a path representing the stub. */ /* Create a path representing the stub. */
char stub_path[fs::EntryNameLengthMax + 1]; char stub_path[fs::EntryNameLengthMax + 1];
std::snprintf(stub_path, sizeof(stub_path), "%s.stub", path); util::SNPrintf(stub_path, sizeof(stub_path), "%s.stub", path);
/* Query whether we have the file. */ /* Query whether we have the file. */
bool has_file; bool has_file;

2
libstratosphere/source/fs/fs_content_storage.cpp
View File

@ -32,7 +32,7 @@ namespace ams::fs {
AMS_ABORT_UNLESS(dst_size >= needed_size); AMS_ABORT_UNLESS(dst_size >= needed_size);
/* Generate the name. */ /* Generate the name. */
auto size = std::snprintf(dst, dst_size, "%s:", GetContentStorageMountName(id)); auto size = util::SNPrintf(dst, dst_size, "%s:", GetContentStorageMountName(id));
AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1); AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1);
return ResultSuccess(); return ResultSuccess();

2
libstratosphere/source/fs/fs_game_card.cpp
View File

@ -42,7 +42,7 @@ namespace ams::fs {
AMS_ABORT_UNLESS(dst_size >= needed_size); AMS_ABORT_UNLESS(dst_size >= needed_size);
/* Generate the name. */ /* Generate the name. */
auto size = std::snprintf(dst, dst_size, "%s%s%08x:", impl::GameCardFileSystemMountName, GetGameCardMountNameSuffix(this->partition), this->handle); auto size = util::SNPrintf(dst, dst_size, "%s%s%08x:", impl::GameCardFileSystemMountName, GetGameCardMountNameSuffix(this->partition), this->handle);
AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1); AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1);
return ResultSuccess(); return ResultSuccess();

2
libstratosphere/source/fs/fs_sd_card.cpp
View File

@ -34,7 +34,7 @@ namespace ams::fs {
AMS_ABORT_UNLESS(dst_size >= needed_size); AMS_ABORT_UNLESS(dst_size >= needed_size);
/* Generate the name. */ /* Generate the name. */
auto size = std::snprintf(dst, dst_size, "%s:", impl::SdCardFileSystemMountName); auto size = util::SNPrintf(dst, dst_size, "%s:", impl::SdCardFileSystemMountName);
AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1); AMS_ASSERT(static_cast<size_t>(size) == needed_size - 1);
return ResultSuccess(); return ResultSuccess();

2
libstratosphere/source/fs/fsa/fs_mount_utils.cpp
View File

@ -151,7 +151,7 @@ namespace ams::fs {
AMS_FS_R_TRY(accessor->GetCommonMountName(dst, dst_size)); AMS_FS_R_TRY(accessor->GetCommonMountName(dst, dst_size));
const auto mount_name_len = strnlen(dst, dst_size); const auto mount_name_len = strnlen(dst, dst_size);
const auto common_path_len = std::snprintf(dst + mount_name_len, dst_size - mount_name_len, "%s", sub_path); const auto common_path_len = util::SNPrintf(dst + mount_name_len, dst_size - mount_name_len, "%s", sub_path);
AMS_FS_R_UNLESS(static_cast<size_t>(common_path_len) < dst_size - mount_name_len, fs::ResultTooLongPath()); AMS_FS_R_UNLESS(static_cast<size_t>(common_path_len) < dst_size - mount_name_len, fs::ResultTooLongPath());
return ResultSuccess(); return ResultSuccess();

4
libstratosphere/source/fssystem/fssystem_utility.cpp
View File

@ -78,7 +78,7 @@ namespace ams::fssystem {
std::unique_ptr<fs::fsa::IFile> dst_file; std::unique_ptr<fs::fsa::IFile> dst_file;
{ {
char dst_path[fs::EntryNameLengthMax + 1]; char dst_path[fs::EntryNameLengthMax + 1];
const size_t original_size = static_cast<size_t>(std::snprintf(dst_path, sizeof(dst_path), "%s%s", dst_parent_path, entry->name)); const size_t original_size = static_cast<size_t>(util::SNPrintf(dst_path, sizeof(dst_path), "%s%s", dst_parent_path, entry->name));
/* TODO: Error code? N aborts here. */ /* TODO: Error code? N aborts here. */
AMS_ABORT_UNLESS(original_size < sizeof(dst_path)); AMS_ABORT_UNLESS(original_size < sizeof(dst_path));
@ -103,7 +103,7 @@ namespace ams::fssystem {
Result CopyDirectoryRecursively(fs::fsa::IFileSystem *dst_fs, fs::fsa::IFileSystem *src_fs, const char *dst_path, const char *src_path, void *work_buf, size_t work_buf_size) { Result CopyDirectoryRecursively(fs::fsa::IFileSystem *dst_fs, fs::fsa::IFileSystem *src_fs, const char *dst_path, const char *src_path, void *work_buf, size_t work_buf_size) {
char dst_path_buf[fs::EntryNameLengthMax + 1]; char dst_path_buf[fs::EntryNameLengthMax + 1];
const size_t original_size = static_cast<size_t>(std::snprintf(dst_path_buf, sizeof(dst_path_buf), "%s", dst_path)); const size_t original_size = static_cast<size_t>(util::SNPrintf(dst_path_buf, sizeof(dst_path_buf), "%s", dst_path));
AMS_ABORT_UNLESS(original_size < sizeof(dst_path_buf)); AMS_ABORT_UNLESS(original_size < sizeof(dst_path_buf));
return IterateDirectoryRecursively(src_fs, src_path, return IterateDirectoryRecursively(src_fs, src_path,

6
libstratosphere/source/ncm/ncm_content_id_utils.cpp
View File

@ -21,7 +21,7 @@ namespace ams::ncm {
void GetStringFromBytes(char *dst, const void *src, size_t count) { void GetStringFromBytes(char *dst, const void *src, size_t count) {
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
std::snprintf(dst + 2 * i, 3, "%02x", static_cast<const u8 *>(src)[i]); util::SNPrintf(dst + 2 * i, 3, "%02x", static_cast<const u8 *>(src)[i]);
} }
} }
@ -68,14 +68,14 @@ namespace ams::ncm {
AMS_ABORT_UNLESS(dst_size > TicketFileStringLength); AMS_ABORT_UNLESS(dst_size > TicketFileStringLength);
ContentIdString str; ContentIdString str;
GetStringFromRightsId(str.data, sizeof(str), id); GetStringFromRightsId(str.data, sizeof(str), id);
std::snprintf(dst, dst_size, "%s.tik", str.data); util::SNPrintf(dst, dst_size, "%s.tik", str.data);
} }
void GetCertificateFileStringFromRightsId(char *dst, size_t dst_size, fs::RightsId id) { void GetCertificateFileStringFromRightsId(char *dst, size_t dst_size, fs::RightsId id) {
AMS_ABORT_UNLESS(dst_size > CertFileStringLength); AMS_ABORT_UNLESS(dst_size > CertFileStringLength);
ContentIdString str; ContentIdString str;
GetStringFromRightsId(str.data, sizeof(str), id); GetStringFromRightsId(str.data, sizeof(str), id);
std::snprintf(dst, dst_size, "%s.cert", str.data); util::SNPrintf(dst, dst_size, "%s.cert", str.data);
} }
std::optional<ContentId> GetContentIdFromString(const char *str, size_t len) { std::optional<ContentId> GetContentIdFromString(const char *str, size_t len) {

2
libstratosphere/source/ncm/ncm_content_management_utils.cpp
View File

@ -25,7 +25,7 @@ namespace ams::ncm {
Result ConvertToFsCommonPath(char *dst, size_t dst_size, const char *package_root_path, const char *entry_path) { Result ConvertToFsCommonPath(char *dst, size_t dst_size, const char *package_root_path, const char *entry_path) {
char package_path[MaxPackagePathLength]; char package_path[MaxPackagePathLength];
const size_t path_len = std::snprintf(package_path, sizeof(package_path), "%s%s", package_root_path, entry_path); const size_t path_len = util::SNPrintf(package_path, sizeof(package_path), "%s%s", package_root_path, entry_path);
AMS_ABORT_UNLESS(path_len < MaxPackagePathLength); AMS_ABORT_UNLESS(path_len < MaxPackagePathLength);
return fs::ConvertToFsCommonPath(dst, dst_size, package_path); return fs::ConvertToFsCommonPath(dst, dst_size, package_path);

8
libstratosphere/source/ncm/ncm_content_manager_impl.cpp
View File

@ -122,7 +122,7 @@ namespace ams::ncm {
/* This also works on < 4.0.0 (though the system partition will never be on-sd there), */ /* This also works on < 4.0.0 (though the system partition will never be on-sd there), */
/* and so this will always return false. */ /* and so this will always return false. */
char path[fs::MountNameLengthMax + 2 /* :/ */ + 1]; char path[fs::MountNameLengthMax + 2 /* :/ */ + 1];
std::snprintf(path, sizeof(path), "%s:/", bis_mount_name); util::SNPrintf(path, sizeof(path), "%s:/", bis_mount_name);
return fs::IsSignedSystemPartitionOnSdCardValid(path); return fs::IsSignedSystemPartitionOnSdCardValid(path);
} else { } else {
/* On 4.0.0-7.0.1, use the remote command to validate the system partition. */ /* On 4.0.0-7.0.1, use the remote command to validate the system partition. */
@ -203,7 +203,7 @@ namespace ams::ncm {
/* Create a new mount name and copy it to out. */ /* Create a new mount name and copy it to out. */
std::strcpy(out->mount_name, impl::CreateUniqueMountName().str); std::strcpy(out->mount_name, impl::CreateUniqueMountName().str);
std::snprintf(out->path, sizeof(out->path), "%s:/", out->mount_name); util::SNPrintf(out->path, sizeof(out->path), "%s:/", out->mount_name);
return ResultSuccess(); return ResultSuccess();
} }
@ -214,7 +214,7 @@ namespace ams::ncm {
/* Create a new mount name and copy it to out. */ /* Create a new mount name and copy it to out. */
std::strcpy(out->mount_name, impl::CreateUniqueMountName().str); std::strcpy(out->mount_name, impl::CreateUniqueMountName().str);
std::snprintf(out->path, sizeof(out->path), "%s:/", out->mount_name); util::SNPrintf(out->path, sizeof(out->path), "%s:/", out->mount_name);
return ResultSuccess(); return ResultSuccess();
} }
@ -230,7 +230,7 @@ namespace ams::ncm {
/* Create a new mount name and copy it to out. */ /* Create a new mount name and copy it to out. */
std::strcpy(out->mount_name, impl::CreateUniqueMountName().str); std::strcpy(out->mount_name, impl::CreateUniqueMountName().str);
out->mount_name[0] = '#'; out->mount_name[0] = '#';
std::snprintf(out->path, sizeof(out->path), "%s:/meta", out->mount_name); util::SNPrintf(out->path, sizeof(out->path), "%s:/meta", out->mount_name);
return ResultSuccess(); return ResultSuccess();
} }

4
libstratosphere/source/ncm/ncm_fs_utils.cpp
View File

@ -39,13 +39,13 @@ namespace ams::ncm::impl {
MountName CreateUniqueMountName() { MountName CreateUniqueMountName() {
MountName name = {}; MountName name = {};
std::snprintf(name.str, sizeof(name.str), "@ncm%08x", g_mount_name_count.fetch_add(1)); util::SNPrintf(name.str, sizeof(name.str), "@ncm%08x", g_mount_name_count.fetch_add(1));
return name; return name;
} }
RootDirectoryPath GetRootDirectoryPath(const MountName &mount_name) { RootDirectoryPath GetRootDirectoryPath(const MountName &mount_name) {
RootDirectoryPath path = {}; RootDirectoryPath path = {};
std::snprintf(path.str, sizeof(path.str), "%s:/", mount_name.str); util::SNPrintf(path.str, sizeof(path.str), "%s:/", mount_name.str);
return path; return path;
} }

2
libstratosphere/source/ncm/ncm_make_path.cpp
View File

@ -29,7 +29,7 @@ namespace ams::ncm {
/* Create a hex string from bytes. */ /* Create a hex string from bytes. */
for (size_t i = 0; i < sizeof(bytes); i++) { for (size_t i = 0; i < sizeof(bytes); i++) {
std::snprintf(tmp, util::size(tmp), "%02x", bytes[i]); util::SNPrintf(tmp, util::size(tmp), "%02x", bytes[i]);
out->Append(tmp); out->Append(tmp);
} }

6
libstratosphere/source/patcher/patcher_api.cpp
View File

@ -217,7 +217,7 @@ namespace ams::patcher {
/* Inspect all patches from /atmosphere/<patch_dir>/<*>/<*>.ips */ /* Inspect all patches from /atmosphere/<patch_dir>/<*>/<*>.ips */
char path[fs::EntryNameLengthMax + 1]; char path[fs::EntryNameLengthMax + 1];
std::snprintf(path, sizeof(path), "%s:/atmosphere/%s", mount_name, patch_dir_name); util::SNPrintf(path, sizeof(path), "%s:/atmosphere/%s", mount_name, patch_dir_name);
const size_t patches_dir_path_len = std::strlen(path); const size_t patches_dir_path_len = std::strlen(path);
/* Open the patch directory. */ /* Open the patch directory. */
@ -237,7 +237,7 @@ namespace ams::patcher {
} }
/* Print the path for this directory. */ /* Print the path for this directory. */
std::snprintf(path + patches_dir_path_len, sizeof(path) - patches_dir_path_len, "/%s", entry.name); util::SNPrintf(path + patches_dir_path_len, sizeof(path) - patches_dir_path_len, "/%s", entry.name);
const size_t patch_dir_path_len = patches_dir_path_len + 1 + std::strlen(entry.name); const size_t patch_dir_path_len = patches_dir_path_len + 1 + std::strlen(entry.name);
/* Open the patch directory. */ /* Open the patch directory. */
@ -259,7 +259,7 @@ namespace ams::patcher {
} }
/* Print the path for this file. */ /* Print the path for this file. */
std::snprintf(path + patch_dir_path_len, sizeof(path) - patch_dir_path_len, "/%s", entry.name); util::SNPrintf(path + patch_dir_path_len, sizeof(path) - patch_dir_path_len, "/%s", entry.name);
/* Open the file. */ /* Open the file. */
fs::FileHandle file; fs::FileHandle file;

6
libstratosphere/source/pgl/srv/pgl_srv_shell.cpp
View File

@ -124,9 +124,9 @@ namespace ams::pgl::srv {
const s32 dump_arg = ConvertDumpTypeToArgument(dump_type); const s32 dump_arg = ConvertDumpTypeToArgument(dump_type);
const s32 log_arg = GetSnapShotDumpOutputAllLog(process_id) ? 1 : 0; const s32 log_arg = GetSnapShotDumpOutputAllLog(process_id) ? 1 : 0;
if (str_arg != nullptr) { if (str_arg != nullptr) {
return std::snprintf(dst, dst_size, "D %010llu \"%s\" -log %d -dump %d", static_cast<unsigned long long>(static_cast<u64>(process_id)), str_arg, log_arg, dump_arg); return util::SNPrintf(dst, dst_size, "D %010llu \"%s\" -log %d -dump %d", static_cast<unsigned long long>(static_cast<u64>(process_id)), str_arg, log_arg, dump_arg);
} else { } else {
return std::snprintf(dst, dst_size, "D %010llu -log %d -dump %d", static_cast<unsigned long long>(static_cast<u64>(process_id)), log_arg, dump_arg); return util::SNPrintf(dst, dst_size, "D %010llu -log %d -dump %d", static_cast<unsigned long long>(static_cast<u64>(process_id)), log_arg, dump_arg);
} }
} }
@ -215,7 +215,7 @@ namespace ams::pgl::srv {
/* Generate arguments. */ /* Generate arguments. */
char arguments[0x40]; char arguments[0x40];
const size_t len = std::snprintf(arguments, sizeof(arguments), "%ld %d %d %d", static_cast<s64>(static_cast<u64>(process_id)), GetCrashReportDetailedArgument(data_flags), GetCrashReportScreenShotArgument(data_flags), g_enable_jit_debug); const size_t len = util::SNPrintf(arguments, sizeof(arguments), "%ld %d %d %d", static_cast<s64>(static_cast<u64>(process_id)), GetCrashReportDetailedArgument(data_flags), GetCrashReportScreenShotArgument(data_flags), g_enable_jit_debug);
if (R_FAILED(ldr::SetProgramArgument(ncm::SystemProgramId::Creport, arguments, len + 1))) { if (R_FAILED(ldr::SetProgramArgument(ncm::SystemProgramId::Creport, arguments, len + 1))) {
return; return;
} }

8
libstratosphere/source/pgl/srv/pgl_srv_shell_host_utils.cpp
View File

@ -174,7 +174,7 @@ namespace ams::pgl::srv {
/* Get the file name. */ /* Get the file name. */
char file_name[ncm::ContentIdStringLength + 5]; char file_name[ncm::ContentIdStringLength + 5];
const size_t len = std::snprintf(file_name, sizeof(file_name), "%s.nca", id_str.data); const size_t len = util::SNPrintf(file_name, sizeof(file_name), "%s.nca", id_str.data);
R_UNLESS(len + 1 == sizeof(file_name), pgl::ResultBufferNotEnough()); R_UNLESS(len + 1 == sizeof(file_name), pgl::ResultBufferNotEnough());
/* Ensure we have the content. */ /* Ensure we have the content. */
@ -199,7 +199,7 @@ namespace ams::pgl::srv {
/* Get the file name. */ /* Get the file name. */
/* NSPD does not support indexed content, so we always use 0 as the index. */ /* NSPD does not support indexed content, so we always use 0 as the index. */
char file_name[0x20]; char file_name[0x20];
const size_t len = std::snprintf(file_name, sizeof(file_name), "%s%d.ncd", content_name, 0); const size_t len = util::SNPrintf(file_name, sizeof(file_name), "%s%d.ncd", content_name, 0);
R_UNLESS(len + 1 <= sizeof(file_name), pgl::ResultBufferNotEnough()); R_UNLESS(len + 1 <= sizeof(file_name), pgl::ResultBufferNotEnough());
/* Ensure we have the content. */ /* Ensure we have the content. */
@ -267,7 +267,7 @@ namespace ams::pgl::srv {
Result SearchContent(bool *out, lr::Path *out_path, const char *extension, fs::OpenDirectoryMode mode) const { Result SearchContent(bool *out, lr::Path *out_path, const char *extension, fs::OpenDirectoryMode mode) const {
/* Generate the root directory path. */ /* Generate the root directory path. */
char root_dir[sizeof(this->mount_name) + 2]; char root_dir[sizeof(this->mount_name) + 2];
std::snprintf(root_dir, sizeof(root_dir), "%s:/", this->mount_name); util::SNPrintf(root_dir, sizeof(root_dir), "%s:/", this->mount_name);
/* Open the root directory. */ /* Open the root directory. */
fs::DirectoryHandle dir; fs::DirectoryHandle dir;
@ -287,7 +287,7 @@ namespace ams::pgl::srv {
if (HasSuffix(entry.name, extension)) { if (HasSuffix(entry.name, extension)) {
*out = true; *out = true;
if (out_path) { if (out_path) {
const size_t len = std::snprintf(out_path->str, sizeof(out_path->str), "%s/%s", this->content_path, entry.name); const size_t len = util::SNPrintf(out_path->str, sizeof(out_path->str), "%s/%s", this->content_path, entry.name);
R_UNLESS(len + 1 < sizeof(out_path->str), pgl::ResultBufferNotEnough()); R_UNLESS(len + 1 < sizeof(out_path->str), pgl::ResultBufferNotEnough());
if (entry.type == fs::DirectoryEntryType_Directory) { if (entry.type == fs::DirectoryEntryType_Directory) {
out_path->str[len] = '/'; out_path->str[len] = '/';

2
libvapours/include/vapours/util/util_uuid.hpp
View File

@ -35,7 +35,7 @@ namespace ams::util {
} }
const char *ToString(char *dst, size_t dst_size) const { const char *ToString(char *dst, size_t dst_size) const {
std::snprintf(dst, dst_size, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", util::SNPrintf(dst, dst_size, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
this->data[ 0], this->data[ 1], this->data[ 2], this->data[ 3], this->data[ 4], this->data[ 5], this->data[ 6], this->data[ 7], this->data[ 0], this->data[ 1], this->data[ 2], this->data[ 3], this->data[ 4], this->data[ 5], this->data[ 6], this->data[ 7],
this->data[ 8], this->data[ 9], this->data[10], this->data[11], this->data[12], this->data[13], this->data[14], this->data[15]); this->data[ 8], this->data[ 9], this->data[10], this->data[11], this->data[12], this->data[13], this->data[14], this->data[15]);