Skip to content

Commit 757ce51

Browse files
committed
remove function to tweak format spec for srtings
1 parent a22a100 commit 757ce51

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

cprintf.cpp

-21
Original file line numberDiff line numberDiff line change
@@ -1112,27 +1112,6 @@ unicode_string_t ascii_to_unicode_string_conversion(unicode_string_t&& src)
11121112
return std::move(src);
11131113
}
11141114

1115-
// printing strings with lower case 's' as format specifier leads
1116-
// to undefined behaviour when using wide character strings .
1117-
unicode_string_t resolve_string_type_format_specifier(
1118-
const unicode_string_t& fs)
1119-
{
1120-
unicode_string_t f = fs;
1121-
// seems like msvc does not conform to wide character
1122-
// format specifier rules
1123-
#ifndef CPF_WINDOWS_BUILD
1124-
if (fs.find('s') != unicode_string_t::npos)
1125-
{
1126-
f.clear();
1127-
for (std::wint_t i(0); i < fs.size(); ++i)
1128-
{
1129-
f.append({ std::isalpha(fs[i]) ? (char)std::toupper(fs[i]) : fs[i] });
1130-
}
1131-
}
1132-
#endif
1133-
return f;
1134-
}
1135-
11361115
template <>
11371116
void write_variadic_argument_to_file_stream<unicode_string_t>(
11381117
file_stream_t file_stream,

cprintf/cprintf.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,11 @@ CPF_API void write_substring_without_format_specifier(
408408
file_stream_t file_stream, unicode_string_t &printed_string_, int &ssp_,
409409
format_string_layout_t::const_iterator &format_string_layout_iterator);
410410

411-
CPF_API unicode_string_t
412-
resolve_string_type_format_specifier(const unicode_string_t &fs);
413-
414411
template <typename T>
415412
void write_variadic_argument_to_file_stream(file_stream_t file_stream,
416413
unicode_string_t const &format,
417414
T &&arg) {
418-
const unicode_string_t f = resolve_string_type_format_specifier(format);
419-
std::fprintf(file_stream, f.c_str(), arg);
415+
std::fprintf(file_stream, format.c_str(), arg);
420416
}
421417

422418
template <>

0 commit comments

Comments
 (0)