From 406c6123fb972eab368bf745efcf90f0e176a3a5 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Tue, 19 Aug 2014 08:47:38 -0700 Subject: [PATCH] Cleanup --- format.cc | 6 +++--- format.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/format.cc b/format.cc index 2eda7cfe..98b0f4ba 100644 --- a/format.cc +++ b/format.cc @@ -98,14 +98,14 @@ inline int getsign(double value) { inline int isinfinity(double x) { return !_finite(x); } -inline int safe_printf(char *buffer, size_t size, const char *format, ...) { +inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) { va_list args; va_start(args, format); int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args); va_end(args); return result; } -#define FMT_SNPRINTF safe_printf +#define FMT_SNPRINTF fmt_snprintf #endif // _MSC_VER @@ -360,7 +360,7 @@ const uint64_t fmt::internal::POWERS_OF_10_64[] = { 0, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(ULongLong(1000000000)), - // Multiply several constants instead of using a single long long constants + // Multiply several constants instead of using a single long long constant // to avoid warnings about C++98 not supporting long long. ULongLong(1000000000) * ULongLong(1000000000) * 10 }; diff --git a/format.h b/format.h index 8d251a63..9386cd81 100644 --- a/format.h +++ b/format.h @@ -271,7 +271,8 @@ class Array { FMT_DISALLOW_COPY_AND_ASSIGN(Array); public: - explicit Array(std::size_t size = 0) : size_(size), capacity_(SIZE), ptr_(data_) {} + explicit Array(std::size_t size = 0) + : size_(size), capacity_(SIZE), ptr_(data_) {} ~Array() { free(); } #if FMT_USE_RVALUE_REFERENCES