External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 062cc37623 into 00d56e06ef

Browse Source
This commit is contained in:
Magnus Bjerke Vik 2015-12-03 20:30:42 +00:00
commit 4b1e38724e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
posix.cc
View File

@ -102,8 +102,8 @@ void fmt::BufferedFile::close() {
// A macro used to prevent expansion of fileno on broken versions of MinGW. // A macro used to prevent expansion of fileno on broken versions of MinGW.
#define FMT_ARGS #define FMT_ARGS
int fmt::BufferedFile::fileno() const { int fmt::BufferedFile::fileno_() const {
int fd = FMT_POSIX_CALL(fileno FMT_ARGS(file_)); int fd = FMT_SYSTEM(fileno FMT_ARGS(file_));
if (fd == -1) if (fd == -1)
throw SystemError(errno, "cannot get file descriptor"); throw SystemError(errno, "cannot get file descriptor");
return fd; return fd;

2
posix.h
View File

@ -195,7 +195,7 @@ public:
// We place parentheses around fileno to workaround a bug in some versions // We place parentheses around fileno to workaround a bug in some versions
// of MinGW that define fileno as a macro. // of MinGW that define fileno as a macro.
int (fileno)() const; int (fileno_)() const;
void print(CStringRef format_str, const ArgList &args) { void print(CStringRef format_str, const ArgList &args) {
fmt::print(file_, format_str, args); fmt::print(file_, format_str, args);

2
test/gtest-extra-test.cc
View File

@ -369,7 +369,7 @@ TEST(OutputRedirectTest, FlushErrorInCtor) {
TEST(OutputRedirectTest, DupErrorInCtor) { TEST(OutputRedirectTest, DupErrorInCtor) {
BufferedFile f = open_buffered_file(); BufferedFile f = open_buffered_file();
int fd = (f.fileno)(); int fd = (f.fileno_)();
File copy = File::dup(fd); File copy = File::dup(fd);
FMT_POSIX(close(fd)); FMT_POSIX(close(fd));
scoped_ptr<OutputRedirect> redir; scoped_ptr<OutputRedirect> redir;

2
test/posix-mock-test.cc
View File

@ -445,7 +445,7 @@ TEST(BufferedFileTest, FilenoNoRetry) {
File::pipe(read_end, write_end); File::pipe(read_end, write_end);
BufferedFile f = read_end.fdopen("r"); BufferedFile f = read_end.fdopen("r");
fileno_count = 1; fileno_count = 1;
EXPECT_SYSTEM_ERROR((f.fileno)(), EINTR, "cannot get file descriptor"); EXPECT_SYSTEM_ERROR((f.fileno_)(), EINTR, "cannot get file descriptor");
EXPECT_EQ(2, fileno_count); EXPECT_EQ(2, fileno_count);
fileno_count = 0; fileno_count = 0;
} }

18
test/posix-test.cc
View File

@ -103,7 +103,7 @@ TEST(BufferedFileTest, MoveAssignment) {
TEST(BufferedFileTest, MoveAssignmentClosesFile) { TEST(BufferedFileTest, MoveAssignmentClosesFile) {
BufferedFile bf = open_buffered_file(); BufferedFile bf = open_buffered_file();
BufferedFile bf2 = open_buffered_file(); BufferedFile bf2 = open_buffered_file();
int old_fd = bf2.fileno(); int old_fd = bf2.fileno_();
bf2 = std::move(bf); bf2 = std::move(bf);
EXPECT_TRUE(isclosed(old_fd)); EXPECT_TRUE(isclosed(old_fd));
} }
@ -123,7 +123,7 @@ TEST(BufferedFileTest, MoveFromTemporaryInAssignment) {
TEST(BufferedFileTest, MoveFromTemporaryInAssignmentClosesFile) { TEST(BufferedFileTest, MoveFromTemporaryInAssignmentClosesFile) {
BufferedFile f = open_buffered_file(); BufferedFile f = open_buffered_file();
int old_fd = f.fileno(); int old_fd = f.fileno_();
f = open_buffered_file(); f = open_buffered_file();
EXPECT_TRUE(isclosed(old_fd)); EXPECT_TRUE(isclosed(old_fd));
} }
@ -132,7 +132,7 @@ TEST(BufferedFileTest, CloseFileInDtor) {
int fd = 0; int fd = 0;
{ {
BufferedFile f = open_buffered_file(); BufferedFile f = open_buffered_file();
fd = f.fileno(); fd = f.fileno_();
} }
EXPECT_TRUE(isclosed(fd)); EXPECT_TRUE(isclosed(fd));
} }
@ -144,14 +144,14 @@ TEST(BufferedFileTest, CloseErrorInDtor) {
// the system may recycle closed file descriptor when redirecting the // the system may recycle closed file descriptor when redirecting the
// output in EXPECT_STDERR and the second close will break output // output in EXPECT_STDERR and the second close will break output
// redirection. // redirection.
FMT_POSIX(close(f->fileno())); FMT_POSIX(close(f->fileno_()));
SUPPRESS_ASSERT(f.reset()); SUPPRESS_ASSERT(f.reset());
}, format_system_error(EBADF, "cannot close file") + "\n"); }, format_system_error(EBADF, "cannot close file") + "\n");
} }
TEST(BufferedFileTest, Close) { TEST(BufferedFileTest, Close) {
BufferedFile f = open_buffered_file(); BufferedFile f = open_buffered_file();
int fd = f.fileno(); int fd = f.fileno_();
f.close(); f.close();
EXPECT_TRUE(f.get() == 0); EXPECT_TRUE(f.get() == 0);
EXPECT_TRUE(isclosed(fd)); EXPECT_TRUE(isclosed(fd));
@ -159,7 +159,7 @@ TEST(BufferedFileTest, Close) {
TEST(BufferedFileTest, CloseError) { TEST(BufferedFileTest, CloseError) {
BufferedFile f = open_buffered_file(); BufferedFile f = open_buffered_file();
FMT_POSIX(close(f.fileno())); FMT_POSIX(close(f.fileno_()));
EXPECT_SYSTEM_ERROR_NOASSERT(f.close(), EBADF, "cannot close file"); EXPECT_SYSTEM_ERROR_NOASSERT(f.close(), EBADF, "cannot close file");
EXPECT_TRUE(f.get() == 0); EXPECT_TRUE(f.get() == 0);
} }
@ -171,15 +171,15 @@ TEST(BufferedFileTest, Fileno) {
// Disable Coverity because this is intentional. // Disable Coverity because this is intentional.
EXPECT_DEATH_IF_SUPPORTED({ EXPECT_DEATH_IF_SUPPORTED({
try { try {
f.fileno(); f.fileno_();
} catch (fmt::SystemError) { } catch (fmt::SystemError) {
std::exit(1); std::exit(1);
} }
}, ""); }, "");
#endif #endif
f = open_buffered_file(); f = open_buffered_file();
EXPECT_TRUE(f.fileno() != -1); EXPECT_TRUE(f.fileno_() != -1);
File copy = File::dup(f.fileno()); File copy = File::dup(f.fileno_());
EXPECT_READ(copy, FILE_CONTENT); EXPECT_READ(copy, FILE_CONTENT);
} }