fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings.

Browse Source
This commit is contained in:
Victor Zverovich
2014-06-07 07:11:34 -07:00
parent 1ed23b9127
commit 80c99760fb
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
format.cc
View File

@ -594,7 +594,7 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
} }
writer.buffer_.append(start, s - 1); writer.buffer_.append(start, s - 1);
FormatSpec spec; FormatSpec spec(UINT_MAX);
spec.align_ = ALIGN_RIGHT; spec.align_ = ALIGN_RIGHT;
// Reporting errors is delayed till the format specification is // Reporting errors is delayed till the format specification is
@ -610,17 +610,15 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
const char *error = 0; const char *error = 0;
unsigned arg_index = 0; unsigned arg_index = 0;
bool have_width = false, have_arg_index = false; bool have_arg_index = false;
c = *s; c = *s;
if (c >= '0' && c <= '9') { if (c >= '0' && c <= '9') {
unsigned value = internal::ParseNonnegativeInt(s, error); unsigned value = internal::ParseNonnegativeInt(s, error);
if (*s != '$') { if (*s != '$') {
if (c == '0') if (c == '0')
spec.fill_ = '0'; spec.fill_ = '0';
if (value != 0) { if (value != 0)
have_width = true;
spec.width_ = value; spec.width_ = value;
}
} else { } else {
++s; ++s;
if (next_arg_index_ <= 0) { if (next_arg_index_ <= 0) {
@ -654,8 +652,9 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
} }
int precision = -1; int precision = -1;
switch (have_width) { switch (spec.width_) {
case false: { case UINT_MAX: {
spec.width_ = 0;
// TODO: parse optional flags // TODO: parse optional flags
bool stop = false; bool stop = false;
do { do {
@ -742,7 +741,7 @@ void fmt::BasicWriter<Char>::PrintfParser::Format(
break; break;
spec.width_ = internal::ParseNonnegativeInt(s, error); spec.width_ = internal::ParseNonnegativeInt(s, error);
} }
// Fall through. // Fall through.
default: default:
if (spec.fill_ == '0') { if (spec.fill_ == '0') {
spec.align_ = ALIGN_NUMERIC; spec.align_ = ALIGN_NUMERIC;

4
test/posix-test.cc
View File

@ -188,7 +188,7 @@ TEST(FileTest, ReadRetry) {
std::streamsize count = 0; std::streamsize count = 0;
EXPECT_RETRY(count = read_end.read(buffer, SIZE), EXPECT_RETRY(count = read_end.read(buffer, SIZE),
read, "cannot read from file"); read, "cannot read from file");
EXPECT_EQ_POSIX(SIZE, count); EXPECT_EQ_POSIX(static_cast<std::streamsize>(SIZE), count);
} }
TEST(FileTest, WriteRetry) { TEST(FileTest, WriteRetry) {
@ -200,7 +200,7 @@ TEST(FileTest, WriteRetry) {
write, "cannot write to file"); write, "cannot write to file");
write_end.close(); write_end.close();
#ifndef _WIN32 #ifndef _WIN32
EXPECT_EQ(SIZE, count); EXPECT_EQ(static_cast<std::streamsize>(SIZE), count);
char buffer[SIZE + 1]; char buffer[SIZE + 1];
read_end.read(buffer, SIZE); read_end.read(buffer, SIZE);
buffer[SIZE] = '\0'; buffer[SIZE] = '\0';