mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-05 02:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format null pointer as (nil) and null string as (null) in printf (#226)

Browse Source
This commit is contained in:
vitaut 2015-11-11 07:57:19 -08:00
parent e61c8d4cba
commit b5fda1c90d
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
format.cc
View File

@ -540,6 +540,20 @@ class PrintfArgFormatter :
*out = static_cast<Char>(value); *out = static_cast<Char>(value);
} }
void visit_cstring(const char *value) {
if (value)
BasicArgFormatter<PrintfArgFormatter<Char>, Char>::visit_cstring(value);
else
this->writer() << "(null)";
}
void visit_pointer(const void *value) {
if (value)
BasicArgFormatter<PrintfArgFormatter<Char>, Char>::visit_pointer(value);
else
this->writer() << "(nil)";
}
void visit_custom(Arg::CustomValue c) { void visit_custom(Arg::CustomValue c) {
BasicFormatter<Char> formatter(ArgList(), this->writer()); BasicFormatter<Char> formatter(ArgList(), this->writer());
const Char format_str[] = {'}', 0}; const Char format_str[] = {'}', 0};

4
test/printf-test.cc
View File

@ -418,6 +418,8 @@ TEST(PrintfTest, Char) {
TEST(PrintfTest, String) { TEST(PrintfTest, String) {
EXPECT_PRINTF("abc", "%s", "abc"); EXPECT_PRINTF("abc", "%s", "abc");
const char *null_str = 0;
EXPECT_PRINTF("(null)", "%s", null_str);
// TODO: wide string // TODO: wide string
} }
@ -425,6 +427,8 @@ TEST(PrintfTest, Pointer) {
int n; int n;
void *p = &n; void *p = &n;
EXPECT_PRINTF(fmt::format("{}", p), "%p", p); EXPECT_PRINTF(fmt::format("{}", p), "%p", p);
p = 0;
EXPECT_PRINTF("(nil)", "%p", p);
const char *s = "test"; const char *s = "test";
EXPECT_PRINTF(fmt::format("{:p}", s), "%p", s); EXPECT_PRINTF(fmt::format("{:p}", s), "%p", s);
} }