From 1daddec15105ce9e91c27dddb38140aee802d9da Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sun, 6 Nov 2016 09:05:58 -0800 Subject: [PATCH] FMT_NULLPTR -> FMT_NULL and improve formatting --- fmt/format.cc | 19 +++++++++++-------- fmt/format.h | 22 +++++++++++----------- fmt/posix.cc | 2 +- fmt/posix.h | 16 ++++++++-------- fmt/printf.h | 2 +- fmt/string.h | 2 +- fmt/time.h | 18 +++++++++--------- test/mock-allocator.h | 10 ++++++---- 8 files changed, 48 insertions(+), 43 deletions(-) diff --git a/fmt/format.cc b/fmt/format.cc index 06d39b6b..607314e9 100644 --- a/fmt/format.cc +++ b/fmt/format.cc @@ -171,7 +171,8 @@ int safe_strerror( : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {} int run() { - strerror_r(0, FMT_NULLPTR, ""); // Suppress a warning about unused strerror_r. + // Suppress a warning about unused strerror_r. + strerror_r(0, FMT_NULL, ""); return handle(strerror_r(error_code_, buffer_, buffer_size_)); } }; @@ -312,7 +313,7 @@ FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) { FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG)); int s_size = static_cast(s.size()); int length = MultiByteToWideChar( - CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULLPTR, 0); + CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0); if (length == 0) FMT_THROW(WindowsError(GetLastError(), ERROR_MSG)); buffer_.resize(length + 1); @@ -334,12 +335,13 @@ FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s) { if (s.size() > INT_MAX) return ERROR_INVALID_PARAMETER; int s_size = static_cast(s.size()); - int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, FMT_NULLPTR, 0, FMT_NULLPTR, FMT_NULLPTR); + int length = WideCharToMultiByte( + CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL); if (length == 0) return GetLastError(); buffer_.resize(length + 1); length = WideCharToMultiByte( - CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULLPTR, FMT_NULLPTR); + CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL); if (length == 0) return GetLastError(); buffer_[length] = 0; @@ -362,9 +364,10 @@ FMT_FUNC void internal::format_windows_error( buffer.resize(INLINE_BUFFER_SIZE); for (;;) { wchar_t *system_message = &buffer[0]; - int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - FMT_NULLPTR, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - system_message, static_cast(buffer.size()), FMT_NULLPTR); + int result = FormatMessageW( + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + system_message, static_cast(buffer.size()), FMT_NULL); if (result != 0) { UTF16ToUTF8 utf8_message; if (utf8_message.convert(system_message) == ERROR_SUCCESS) { @@ -408,7 +411,7 @@ void internal::ArgMap::init(const ArgList &args) { if (!map_.empty()) return; typedef internal::NamedArg NamedArg; - const NamedArg *named_arg = FMT_NULLPTR; + const NamedArg *named_arg = FMT_NULL; bool use_values = args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE; if (use_values) { diff --git a/fmt/format.h b/fmt/format.h index 541e6743..56ff5ff2 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -214,13 +214,13 @@ typedef __int64 intmax_t; # endif #endif -#ifndef FMT_NULLPTR +#ifndef FMT_NULL # if FMT_HAS_FEATURE(cxx_nullptr) || \ (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \ FMT_MSC_VER >= 1600 -# define FMT_NULLPTR nullptr +# define FMT_NULL nullptr # else -# define FMT_NULLPTR NULL +# define FMT_NULL NULL # endif #endif @@ -643,7 +643,7 @@ class Buffer { std::size_t size_; std::size_t capacity_; - Buffer(T *ptr = FMT_NULLPTR, std::size_t capacity = 0) + Buffer(T *ptr = FMT_NULL, std::size_t capacity = 0) : ptr_(ptr), size_(0), capacity_(capacity) {} /** @@ -773,7 +773,7 @@ void MemoryBuffer::grow(std::size_t size) { std::size_t new_capacity = this->capacity_ + this->capacity_ / 2; if (size > new_capacity) new_capacity = size; - T *new_ptr = this->allocate(new_capacity, FMT_NULLPTR); + T *new_ptr = this->allocate(new_capacity, FMT_NULL); // The following code doesn't throw, so the raw pointer above doesn't leak. std::uninitialized_copy(this->ptr_, this->ptr_ + this->size_, make_ptr(new_ptr, new_capacity)); @@ -1897,14 +1897,14 @@ class ArgMap { public: FMT_API void init(const ArgList &args); - const internal::Arg* find(const fmt::BasicStringRef &name) const { + const internal::Arg *find(const fmt::BasicStringRef &name) const { // The list is unsorted, so just return the first matching name. for (typename MapType::const_iterator it = map_.begin(), end = map_.end(); it != end; ++it) { if (it->first == name) return &it->second; } - return FMT_NULLPTR; + return FMT_NULL; } }; @@ -1933,7 +1933,7 @@ class ArgFormatterBase : public ArgVisitor { } void write(const char *value) { - Arg::StringValue str = {value, value != FMT_NULLPTR ? std::strlen(value) : 0}; + Arg::StringValue str = {value, value ? std::strlen(value) : 0}; writer_.write_str(str, spec_); } @@ -3009,7 +3009,7 @@ void BasicWriter::write_double(T value, const FormatSpec &spec) { // Format using snprintf. Char fill = internal::CharTraits::cast(spec.fill()); unsigned n = 0; - Char *start = FMT_NULLPTR; + Char *start = FMT_NULL; for (;;) { std::size_t buffer_size = buffer_.capacity() - offset; #if FMT_MSC_VER @@ -3615,7 +3615,7 @@ inline internal::Arg BasicFormatter::get_arg( template inline internal::Arg BasicFormatter::parse_arg_index(const Char *&s) { - const char *error = FMT_NULLPTR; + const char *error = FMT_NULL; internal::Arg arg = *s < '0' || *s > '9' ? next_arg(error) : get_arg(internal::parse_nonnegative_int(s), error); if (error) { @@ -3633,7 +3633,7 @@ inline internal::Arg BasicFormatter::parse_arg_name(const Char *&s) { do { c = *++s; } while (internal::is_name_start(c) || ('0' <= c && c <= '9')); - const char *error = FMT_NULLPTR; + const char *error = FMT_NULL; internal::Arg arg = get_arg(BasicStringRef(start, s - start), error); if (error) FMT_THROW(FormatError(error)); diff --git a/fmt/posix.cc b/fmt/posix.cc index 5a182138..d86578fb 100644 --- a/fmt/posix.cc +++ b/fmt/posix.cc @@ -79,7 +79,7 @@ void fmt::BufferedFile::close() { if (!file_) return; int result = FMT_SYSTEM(fclose(file_)); - file_ = FMT_NULLPTR; + file_ = FMT_NULL; if (result != 0) FMT_THROW(SystemError(errno, "cannot close file")); } diff --git a/fmt/posix.h b/fmt/posix.h index a4233afa..f31f3b1f 100644 --- a/fmt/posix.h +++ b/fmt/posix.h @@ -88,7 +88,7 @@ class BufferedFile { public: // Constructs a BufferedFile object which doesn't represent any file. - BufferedFile() FMT_NOEXCEPT : file_(FMT_NULLPTR) {} + BufferedFile() FMT_NOEXCEPT : file_(FMT_NULL) {} // Destroys the object closing the file it represents if any. ~BufferedFile() FMT_NOEXCEPT; @@ -110,7 +110,7 @@ public: // A "move constructor" for moving from an lvalue. BufferedFile(BufferedFile &f) FMT_NOEXCEPT : file_(f.file_) { - f.file_ = FMT_NULLPTR; + f.file_ = FMT_NULL; } // A "move assignment operator" for moving from a temporary. @@ -124,7 +124,7 @@ public: BufferedFile &operator=(BufferedFile &other) { close(); file_ = other.file_; - other.file_ = FMT_NULLPTR; + other.file_ = FMT_NULL; return *this; } @@ -132,7 +132,7 @@ public: // BufferedFile file = BufferedFile(...); operator Proxy() FMT_NOEXCEPT { Proxy p = {file_}; - file_ = FMT_NULLPTR; + file_ = FMT_NULL; return p; } @@ -142,13 +142,13 @@ public: public: BufferedFile(BufferedFile &&other) FMT_NOEXCEPT : file_(other.file_) { - other.file_ = FMT_NULLPTR; + other.file_ = FMT_NULL; } BufferedFile& operator=(BufferedFile &&other) { close(); file_ = other.file_; - other.file_ = FMT_NULLPTR; + other.file_ = FMT_NULL; return *this; } #endif @@ -336,7 +336,7 @@ class Locale { public: typedef locale_t Type; - Locale() : locale_(newlocale(LC_NUMERIC_MASK, "C", FMT_NULLPTR)) { + Locale() : locale_(newlocale(LC_NUMERIC_MASK, "C", FMT_NULL)) { if (!locale_) FMT_THROW(fmt::SystemError(errno, "cannot create locale")); } @@ -347,7 +347,7 @@ class Locale { // Converts string to floating-point number and advances str past the end // of the parsed input. double strtod(const char *&str) const { - char *end = FMT_NULLPTR; + char *end = FMT_NULL; double result = strtod_l(str, &end, locale_); str = end; return result; diff --git a/fmt/printf.h b/fmt/printf.h index 8e13e713..4e2923b6 100644 --- a/fmt/printf.h +++ b/fmt/printf.h @@ -341,7 +341,7 @@ template internal::Arg PrintfFormatter::get_arg(const Char *s, unsigned arg_index) { (void)s; - const char *error = FMT_NULLPTR; + const char *error = FMT_NULL; internal::Arg arg = arg_index == std::numeric_limits::max() ? next_arg(error) : FormatterBase::get_arg(arg_index - 1, error); if (error) diff --git a/fmt/string.h b/fmt/string.h index b8b6250e..ba1fc692 100644 --- a/fmt/string.h +++ b/fmt/string.h @@ -35,7 +35,7 @@ class StringBuffer : public Buffer { data_.resize(this->size_); str.swap(data_); this->capacity_ = this->size_ = 0; - this->ptr_ = FMT_NULLPTR; + this->ptr_ = FMT_NULL; } }; } // namespace internal diff --git a/fmt/time.h b/fmt/time.h index 0da09853..c98b0e01 100644 --- a/fmt/time.h +++ b/fmt/time.h @@ -54,7 +54,7 @@ void format_arg(BasicFormatter &f, } format_str = end + 1; } - + namespace internal{ inline Null<> localtime_r(...) { return Null<>(); } inline Null<> localtime_s(...) { return Null<>(); } @@ -75,7 +75,7 @@ inline std::tm localtime(std::time_t time) { return handle(localtime_r(&time_, &tm_)); } - bool handle(std::tm* tm) { return tm != FMT_NULLPTR; } + bool handle(std::tm *tm) { return tm != FMT_NULL; } bool handle(internal::Null<>) { using namespace fmt::internal; @@ -86,9 +86,9 @@ inline std::tm localtime(std::time_t time) { bool fallback(internal::Null<>) { using namespace fmt::internal; - std::tm* tm = std::localtime(&time_); - if (tm != FMT_NULLPTR) tm_ = *tm; - return tm != FMT_NULLPTR; + std::tm *tm = std::localtime(&time_); + if (tm) tm_ = *tm; + return tm != FMT_NULL; } }; LocalTime lt(time); @@ -112,7 +112,7 @@ inline std::tm gmtime(std::time_t time) { return handle(gmtime_r(&time_, &tm_)); } - bool handle(std::tm* tm) { return tm != FMT_NULLPTR; } + bool handle(std::tm *tm) { return tm != FMT_NULL; } bool handle(internal::Null<>) { using namespace fmt::internal; @@ -122,9 +122,9 @@ inline std::tm gmtime(std::time_t time) { bool fallback(int res) { return res == 0; } bool fallback(internal::Null<>) { - std::tm* tm = std::gmtime(&time_); - if (tm != FMT_NULLPTR) tm_ = *tm; - return tm != FMT_NULLPTR; + std::tm *tm = std::gmtime(&time_); + if (tm != FMT_NULL) tm_ = *tm; + return tm != FMT_NULL; } }; GMTime gt(time); diff --git a/test/mock-allocator.h b/test/mock-allocator.h index 2bff80b6..34b9c11a 100644 --- a/test/mock-allocator.h +++ b/test/mock-allocator.h @@ -36,8 +36,8 @@ class MockAllocator { MockAllocator() {} MockAllocator(const MockAllocator &) {} typedef T value_type; - MOCK_METHOD2_T(allocate, T* (std::size_t n, const T* h)); - MOCK_METHOD2_T(deallocate, void (T* p, std::size_t n)); + MOCK_METHOD2_T(allocate, T *(std::size_t n, const T *h)); + MOCK_METHOD2_T(deallocate, void (T *p, std::size_t n)); }; template @@ -78,8 +78,10 @@ class AllocatorRef { Allocator *get() const { return alloc_; } - value_type* allocate(std::size_t n, const value_type* h) { return alloc_->allocate(n, h); } - void deallocate(value_type* p, std::size_t n) { alloc_->deallocate(p, n); } + value_type *allocate(std::size_t n, const value_type *h) { + return alloc_->allocate(n, h); + } + void deallocate(value_type *p, std::size_t n) { alloc_->deallocate(p, n); } }; #endif // FMT_MOCK_ALLOCATOR_H_