Updated fmto to version def687462c32ec40757e49eb6069f109d50236d6

include/spdlog/fmt/bundled/format.cc

@@ -25,9 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-// commented out by spdlog
-// #include "format.h"
-// #include "printf.h"
+#include "format.h"
 
 #include <string.h>
 
@@ -73,25 +71,31 @@ using fmt::internal::Arg;
 
 // Dummy implementations of strerror_r and strerror_s called if corresponding
 // system functions are not available.
-static inline fmt::internal::Null<> strerror_r(int, char *, ...) {
+static inline fmt::internal::Null<> strerror_r(int, char *, ...)
+{
 	return fmt::internal::Null<>();
 }
-static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
+static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...)
+{
 	return fmt::internal::Null<>();
 }
 
 namespace fmt {
 
-FMT_FUNC internal::RuntimeError::~RuntimeError() throw() {}
-FMT_FUNC FormatError::~FormatError() throw() {}
-FMT_FUNC SystemError::~SystemError() throw() {}
+	FMT_FUNC internal::RuntimeError::~RuntimeError() FMT_DTOR_NOEXCEPT
+	{}
+	FMT_FUNC FormatError::~FormatError() FMT_DTOR_NOEXCEPT
+	{}
+	FMT_FUNC SystemError::~SystemError() FMT_DTOR_NOEXCEPT
+	{}
 
 	namespace {
 
 #ifndef _MSC_VER
 # define FMT_SNPRINTF snprintf
 #else  // _MSC_VER
-inline int fmt_snprintf(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);
@@ -121,26 +125,31 @@ typedef void(*FormatFunc)(Writer &, int, StringRef);
 		//   other  - failure
 		// Buffer should be at least of size 1.
 		int safe_strerror(
-    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT{
+			int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT
+		{
 			FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
 
-    class StrError {
+			class StrError
+			{
 			private:
 				int error_code_;
 				char *&buffer_;
 				std::size_t buffer_size_;
 
 				// A noop assignment operator to avoid bogus warnings.
-        void operator=(const StrError &) {}
+				void operator=(const StrError &)
+				{}
 
 				// Handle the result of XSI-compliant version of strerror_r.
-        int handle(int result) {
+				int handle(int result)
+				{
 					// glibc versions before 2.13 return result in errno.
 					return result == -1 ? errno : result;
 				}
 
 				// Handle the result of GNU-specific version of strerror_r.
-        int handle(char *message) {
+				int handle(char *message)
+				{
 					// If the buffer is full then the message is probably truncated.
 					if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
 						return ERANGE;
@@ -149,19 +158,22 @@ int safe_strerror(
 				}
 
 				// Handle the case when strerror_r is not available.
-        int handle(internal::Null<>) {
+				int handle(internal::Null<>)
+				{
 					return fallback(strerror_s(buffer_, buffer_size_, error_code_));
 				}
 
 				// Fallback to strerror_s when strerror_r is not available.
-        int fallback(int result) {
+				int fallback(int result)
+				{
 					// If the buffer is full then the message is probably truncated.
 					return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
 						ERANGE : result;
 				}
 
 				// Fallback to strerror if strerror_r and strerror_s are not available.
-        int fallback(internal::Null<>) {
+				int fallback(internal::Null<>)
+				{
 					errno = 0;
 					buffer_ = strerror(error_code_);
 					return errno;
@@ -169,10 +181,13 @@ int safe_strerror(
 
 			public:
 				StrError(int err_code, char *&buf, std::size_t buf_size)
-            : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
+					: error_code_(err_code), buffer_(buf), buffer_size_(buf_size)
+				{}
 
-        int run() {
-            strerror_r(0, 0, "");  // Suppress a warning about unused strerror_r.
+				int run()
+				{
+					// Suppress a warning about unused strerror_r.
+					strerror_r(0, FMT_NULL, "");
 					return handle(strerror_r(error_code_, buffer_, buffer_size_));
 				}
 			};
@@ -180,7 +195,8 @@ int safe_strerror(
 		}
 
 		void format_error_code(Writer &out, int error_code,
-                       StringRef message) FMT_NOEXCEPT{
+			StringRef message) FMT_NOEXCEPT
+		{
 			// Report error code making sure that the output fits into
 			// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
 			// bad_alloc.
@@ -203,7 +219,8 @@ void format_error_code(Writer &out, int error_code,
 		}
 
 		void report_error(FormatFunc func, int error_code,
-                  StringRef message) FMT_NOEXCEPT{
+			StringRef message) FMT_NOEXCEPT
+		{
 			MemoryWriter full_message;
 			func(full_message, error_code, message);
 			// Use Writer::data instead of Writer::c_str to avoid potential memory
@@ -218,13 +235,15 @@ namespace internal {
 		// This method is used to preserve binary compatibility with fmt 3.0.
 		// It can be removed in 4.0.
 		FMT_FUNC void format_system_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
+			Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
+		{
 			fmt::format_system_error(out, error_code, message);
 		}
 	}  // namespace internal
 
 	FMT_FUNC void SystemError::init(
-    int err_code, CStringRef format_str, ArgList args) {
+		int err_code, CStringRef format_str, ArgList args)
+	{
 		error_code_ = err_code;
 		MemoryWriter w;
 		format_system_error(w, err_code, format(format_str, args));
@@ -235,7 +254,8 @@ FMT_FUNC void SystemError::init(
 	template <typename T>
 	int internal::CharTraits<char>::format_float(
 		char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, T value) {
+		unsigned width, int precision, T value)
+	{
 		if (width == 0) {
 			return precision < 0 ?
 				FMT_SNPRINTF(buffer, size, format, value) :
@@ -249,7 +269,8 @@ int internal::CharTraits<char>::format_float(
 	template <typename T>
 	int internal::CharTraits<wchar_t>::format_float(
 		wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, T value) {
+		unsigned width, int precision, T value)
+	{
 		if (width == 0) {
 			return precision < 0 ?
 				FMT_SWPRINTF(buffer, size, format, value) :
@@ -294,7 +315,8 @@ const uint64_t internal::BasicData<T>::POWERS_OF_10_64[] = {
 		ULongLong(1000000000) * ULongLong(1000000000) * 10
 	};
 
-FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
+	FMT_FUNC void internal::report_unknown_type(char code, const char *type)
+	{
 		(void)type;
 		if (std::isprint(static_cast<unsigned char>(code))) {
 			FMT_THROW(FormatError(
@@ -307,13 +329,14 @@ FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
 
 #if FMT_USE_WINDOWS_H
 
-FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
+	FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s)
+	{
 		static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
 		if (s.size() > INT_MAX)
 			FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
 		int s_size = static_cast<int>(s.size());
 		int length = MultiByteToWideChar(
-                     CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, 0, 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);
@@ -324,23 +347,26 @@ FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
 		buffer_[length] = 0;
 	}
 
-FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s) {
+	FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s)
+	{
 		if (int error_code = convert(s)) {
 			FMT_THROW(WindowsError(error_code,
 				"cannot convert string from UTF-16 to UTF-8"));
 		}
 	}
 
-FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s) {
+	FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s)
+	{
 		if (s.size() > INT_MAX)
 			return ERROR_INVALID_PARAMETER;
 		int s_size = static_cast<int>(s.size());
-    int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, 0, 0, 0, 0);
+		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, 0, 0);
+			CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
 		if (length == 0)
 			return GetLastError();
 		buffer_[length] = 0;
@@ -348,7 +374,8 @@ FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s) {
 	}
 
 	FMT_FUNC void WindowsError::init(
-    int err_code, CStringRef format_str, ArgList args) {
+		int err_code, CStringRef format_str, ArgList args)
+	{
 		error_code_ = err_code;
 		MemoryWriter w;
 		internal::format_windows_error(w, err_code, format(format_str, args));
@@ -357,15 +384,17 @@ FMT_FUNC void WindowsError::init(
 	}
 
 	FMT_FUNC void internal::format_windows_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
+		Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
+	{
 		FMT_TRY{
 			MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
 		buffer.resize(INLINE_BUFFER_SIZE);
 		for (;;) {
 			wchar_t *system_message = &buffer[0];
-            int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-            0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            system_message, static_cast<uint32_t>(buffer.size()), 0);
+			int result = FormatMessageW(
+				FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+				FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+				system_message, static_cast<uint32_t>(buffer.size()), FMT_NULL);
 			if (result != 0) {
 				UTF16ToUTF8 utf8_message;
 				if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
@@ -378,14 +407,16 @@ FMT_FUNC void internal::format_windows_error(
 				break;  // Can't get error message, report error code instead.
 			buffer.resize(buffer.size() * 2);
 		}
-    } FMT_CATCH(...) {}
+		} FMT_CATCH(...)
+		{}
 		fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
 	}
 
 #endif  // FMT_USE_WINDOWS_H
 
 	FMT_FUNC void format_system_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
+		Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
+	{
 		FMT_TRY{
 			internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
 		buffer.resize(internal::INLINE_BUFFER_SIZE);
@@ -400,16 +431,18 @@ FMT_FUNC void format_system_error(
 				break;  // Can't get error message, report error code instead.
 			buffer.resize(buffer.size() * 2);
 		}
-    } FMT_CATCH(...) {}
+		} FMT_CATCH(...)
+		{}
 		fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
 	}
 
 	template <typename Char>
-void internal::ArgMap<Char>::init(const ArgList &args) {
+	void internal::ArgMap<Char>::init(const ArgList &args)
+	{
 		if (!map_.empty())
 			return;
 		typedef internal::NamedArg<Char> NamedArg;
-    const NamedArg *named_arg = 0;
+		const NamedArg *named_arg = FMT_NULL;
 		bool use_values =
 			args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
 		if (use_values) {
@@ -423,8 +456,7 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
 					map_.push_back(Pair(named_arg->name, *named_arg));
 					break;
 				default:
-                /*nothing*/
-                ;
+					/*nothing*/;
 				}
 			}
 			return;
@@ -445,19 +477,20 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
 				map_.push_back(Pair(named_arg->name, *named_arg));
 				break;
 			default:
-            /*nothing*/
-            ;
+				/*nothing*/;
 			}
 		}
 	}
 
 	template <typename Char>
-void internal::FixedBuffer<Char>::grow(std::size_t) {
+	void internal::FixedBuffer<Char>::grow(std::size_t)
+	{
 		FMT_THROW(std::runtime_error("buffer overflow"));
 	}
 
 	FMT_FUNC Arg internal::FormatterBase::do_get_arg(
-    unsigned arg_index, const char *&error) {
+		unsigned arg_index, const char *&error)
+	{
 		Arg arg = args_[arg_index];
 		switch (arg.type) {
 		case Arg::NONE:
@@ -467,37 +500,41 @@ FMT_FUNC Arg internal::FormatterBase::do_get_arg(
 			arg = *static_cast<const internal::Arg*>(arg.pointer);
 			break;
 		default:
-        /*nothing*/
-        ;
+			/*nothing*/;
 		}
 		return arg;
 	}
 
 	FMT_FUNC void report_system_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT{
+		int error_code, fmt::StringRef message) FMT_NOEXCEPT
+	{
 		// 'fmt::' is for bcc32.
 		report_error(format_system_error, error_code, message);
 	}
 
 #if FMT_USE_WINDOWS_H
 	FMT_FUNC void report_windows_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT{
+		int error_code, fmt::StringRef message) FMT_NOEXCEPT
+	{
 		// 'fmt::' is for bcc32.
 		report_error(internal::format_windows_error, error_code, message);
 	}
 #endif
 
-FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args) {
+	FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args)
+	{
 		MemoryWriter w;
 		w.write(format_str, args);
 		std::fwrite(w.data(), 1, w.size(), f);
 	}
 
-FMT_FUNC void print(CStringRef format_str, ArgList args) {
+	FMT_FUNC void print(CStringRef format_str, ArgList args)
+	{
 		print(stdout, format_str, args);
 	}
 
-FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args) {
+	FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args)
+	{
 		char escape[] = "\x1b[30m";
 		escape[3] = static_cast<char>('0' + c);
 		std::fputs(escape, stdout);
@@ -505,16 +542,6 @@ FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args) {
 		std::fputs(RESET_COLOR, stdout);
 	}
 
-template <typename Char>
-void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args);
-
-FMT_FUNC int fprintf(std::FILE *f, CStringRef format, ArgList args) {
-    MemoryWriter w;
-    printf(w, format, args);
-    std::size_t size = w.size();
-    return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast<int>(size);
-}
-
 #ifndef FMT_HEADER_ONLY
 
 	template struct internal::BasicData<void>;
@@ -525,8 +552,6 @@ template void internal::FixedBuffer<char>::grow(std::size_t);
 
 	template void internal::ArgMap<char>::init(const ArgList &args);
 
-template void PrintfFormatter<char>::format(CStringRef format);
-
 	template int internal::CharTraits<char>::format_float(
 		char *buffer, std::size_t size, const char *format,
 		unsigned width, int precision, double value);
@@ -541,8 +566,6 @@ template void internal::FixedBuffer<wchar_t>::grow(std::size_t);
 
 	template void internal::ArgMap<wchar_t>::init(const ArgList &args);
 
-template void PrintfFormatter<wchar_t>::format(WCStringRef format);
-
 	template int internal::CharTraits<wchar_t>::format_float(
 		wchar_t *buffer, std::size_t size, const wchar_t *format,
 		unsigned width, int precision, double value);

include/spdlog/fmt/bundled/ostream.cc

@@ -12,7 +12,8 @@ For the license information refer to format.h.
 namespace fmt {
 
 	namespace internal {
-FMT_FUNC void write(std::ostream &os, Writer &w) {
+		FMT_FUNC void write(std::ostream &os, Writer &w)
+		{
 			const char *data = w.data();
 			typedef internal::MakeUnsigned<std::streamsize>::Type UnsignedStreamSize;
 			UnsignedStreamSize size = w.size();
@@ -27,7 +28,8 @@ FMT_FUNC void write(std::ostream &os, Writer &w) {
 		}
 	}
 
-FMT_FUNC void print(std::ostream &os, CStringRef format_str, ArgList args) {
+	FMT_FUNC void print(std::ostream &os, CStringRef format_str, ArgList args)
+	{
 		MemoryWriter w;
 		w.write(format_str, args);
 		internal::write(os, w);

include/spdlog/fmt/bundled/ostream.h

@@ -14,11 +14,9 @@ For the license information refer to format.h.
 // #include "format.h"
 #include <ostream>
 
-namespace fmt
-{
+namespace fmt {
 
-namespace internal
-{
+	namespace internal {
 
 		template <class Char>
 		class FormatBuf: public std::basic_streambuf<Char>
@@ -38,8 +36,7 @@ public:
 
 			int_type overflow(int_type ch = traits_type::eof())
 			{
-        if (!traits_type::eq_int_type(ch, traits_type::eof()))
-        {
+				if (!traits_type::eq_int_type(ch, traits_type::eof())) {
 					size_t buf_size = size();
 					buffer_.resize(buf_size);
 					buffer_.reserve(buf_size * 2);

include/spdlog/fmt/bundled/printf.h

@@ -15,10 +15,8 @@ For the license information refer to format.h.
 
 #include "ostream.h"
 
-namespace fmt
-{
-namespace internal
-{
+namespace fmt {
+	namespace internal {
 
 		// Checks if a value fits in int - used to avoid warnings about comparing
 		// signed and unsigned integers.
@@ -83,13 +81,19 @@ public:
 		template <typename T, typename U>
 		struct is_same
 		{
-    enum { value = 0 };
+			enum
+			{
+				value = 0
+			};
 		};
 
 		template <typename T>
 		struct is_same<T, T>
 		{
-    enum { value = 1 };
+			enum
+			{
+				value = 1
+			};
 		};
 
 		// An argument visitor that converts an integer argument to T for printf,
@@ -107,7 +111,8 @@ private:
 
 		public:
 			ArgConverter(internal::Arg &arg, wchar_t type)
-        : arg_(arg), type_(type) {}
+				: arg_(arg), type_(type)
+			{}
 
 			void visit_bool(bool value)
 			{
@@ -122,33 +127,27 @@ public:
 				using internal::Arg;
 				typedef typename internal::Conditional<
 					is_same<T, void>::value, U, T>::type TargetType;
-        if (sizeof(TargetType) <= sizeof(int))
-        {
+				if (sizeof(TargetType) <= sizeof(int)) {
 					// Extra casts are used to silence warnings.
-            if (is_signed)
-            {
+					if (is_signed) {
 						arg_.type = Arg::INT;
 						arg_.int_value = static_cast<int>(static_cast<TargetType>(value));
 					}
-            else
-            {
+					else {
 						arg_.type = Arg::UINT;
 						typedef typename internal::MakeUnsigned<TargetType>::Type Unsigned;
 						arg_.uint_value = static_cast<unsigned>(static_cast<Unsigned>(value));
 					}
 				}
-        else
-        {
-            if (is_signed)
-            {
+				else {
+					if (is_signed) {
 						arg_.type = Arg::LONG_LONG;
 						// glibc's printf doesn't sign extend arguments of smaller types:
 						//   std::printf("%lld", -42);  // prints "4294967254"
 						// but we don't have to do the same because it's a UB.
 						arg_.long_long_value = static_cast<LongLong>(value);
 					}
-            else
-            {
+					else {
 						arg_.type = Arg::ULONG_LONG;
 						arg_.ulong_long_value =
 							static_cast<typename internal::MakeUnsigned<U>::Type>(value);
@@ -166,7 +165,8 @@ private:
 			FMT_DISALLOW_COPY_AND_ASSIGN(CharConverter);
 
 		public:
-    explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
+			explicit CharConverter(internal::Arg &arg): arg_(arg)
+			{}
 
 			template <typename T>
 			void visit_any_int(T value)
@@ -186,7 +186,8 @@ private:
 			FMT_DISALLOW_COPY_AND_ASSIGN(WidthHandler);
 
 		public:
-    explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
+			explicit WidthHandler(FormatSpec &spec): spec_(spec)
+			{}
 
 			void report_unhandled_arg()
 			{
@@ -198,8 +199,7 @@ public:
 			{
 				typedef typename internal::IntTraits<T>::MainType UnsignedType;
 				UnsignedType width = static_cast<UnsignedType>(value);
-        if (internal::is_negative(value))
-        {
+				if (internal::is_negative(value)) {
 					spec_.align_ = ALIGN_LEFT;
 					width = 0 - width;
 				}
@@ -248,8 +248,9 @@ public:
 		specifier information for standard argument types.
 		\endrst
 		*/
-    BasicPrintfArgFormatter(BasicWriter<Char> &writer, FormatSpec &spec)
-        : internal::ArgFormatterBase<Impl, Char>(writer, spec) {}
+		BasicPrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
+			: internal::ArgFormatterBase<Impl, Char>(w, s)
+		{}
 
 		/** Formats an argument of type ``bool``. */
 		void visit_bool(bool value)
@@ -270,22 +271,18 @@ public:
 				w.write_int(value, fmt_spec);
 			typedef typename BasicWriter<Char>::CharPtr CharPtr;
 			CharPtr out = CharPtr();
-        if (fmt_spec.width_ > 1)
-        {
+			if (fmt_spec.width_ > 1) {
 				Char fill = ' ';
 				out = w.grow_buffer(fmt_spec.width_);
-            if (fmt_spec.align_ != ALIGN_LEFT)
-            {
+				if (fmt_spec.align_ != ALIGN_LEFT) {
 					std::fill_n(out, fmt_spec.width_ - 1, fill);
 					out += fmt_spec.width_ - 1;
 				}
-            else
-            {
+				else {
 					std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
 				}
 			}
-        else
-        {
+			else {
 				out = w.grow_buffer(1);
 			}
 			*out = static_cast<Char>(value);
@@ -329,7 +326,8 @@ class PrintfArgFormatter
 	public:
 		/** Constructs an argument formatter object. */
 		PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
-        : BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>(w, s) {}
+			: BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>(w, s)
+		{}
 	};
 
 	/** This template formats data and writes the output to a writer. */
@@ -358,8 +356,9 @@ public:
 		appropriate lifetimes.
 		\endrst
 		*/
-    explicit PrintfFormatter(const ArgList &args, BasicWriter<Char> &w)
-        : FormatterBase(args), writer_(w) {}
+		explicit PrintfFormatter(const ArgList &al, BasicWriter<Char> &w)
+			: FormatterBase(al), writer_(w)
+		{}
 
 		/** Formats stored arguments and writes the output to the writer. */
 		FMT_API void format(BasicCStringRef<Char> format_str);
@@ -368,10 +367,8 @@ public:
 	template <typename Char, typename AF>
 	void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s)
 	{
-    for (;;)
-    {
-        switch (*s++)
-        {
+		for (;;) {
+			switch (*s++) {
 			case '-':
 				spec.align_ = ALIGN_LEFT;
 				break;
@@ -399,7 +396,7 @@ internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
 		unsigned arg_index)
 	{
 		(void)s;
-    const char *error = 0;
+		const char *error = FMT_NULL;
 		internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
 			next_arg(error) : FormatterBase::get_arg(arg_index - 1, error);
 		if (error)
@@ -413,22 +410,18 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
 	{
 		unsigned arg_index = std::numeric_limits<unsigned>::max();
 		Char c = *s;
-    if (c >= '0' && c <= '9')
-    {
+		if (c >= '0' && c <= '9') {
 			// Parse an argument index (if followed by '$') or a width possibly
 			// preceded with '0' flag(s).
 			unsigned value = internal::parse_nonnegative_int(s);
-        if (*s == '$')    // value is an argument index
-        {
+			if (*s == '$') {  // value is an argument index
 				++s;
 				arg_index = value;
 			}
-        else
-        {
+			else {
 				if (c == '0')
 					spec.fill_ = '0';
-            if (value != 0)
-            {
+				if (value != 0) {
 					// Nonzero value means that we parsed width and don't need to
 					// parse it or flags again, so return now.
 					spec.width_ = value;
@@ -438,12 +431,10 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
 		}
 		parse_flags(spec, s);
 		// Parse width.
-    if (*s >= '0' && *s <= '9')
-    {
+		if (*s >= '0' && *s <= '9') {
 			spec.width_ = internal::parse_nonnegative_int(s);
 		}
-    else if (*s == '*')
-    {
+		else if (*s == '*') {
 			++s;
 			spec.width_ = internal::WidthHandler(spec).visit(get_arg(s));
 		}
@@ -455,12 +446,10 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
 	{
 		const Char *start = format_str.c_str();
 		const Char *s = start;
-    while (*s)
-    {
+		while (*s) {
 			Char c = *s++;
 			if (c != '%') continue;
-        if (*s == c)
-        {
+			if (*s == c) {
 				write(writer_, start, s);
 				start = ++s;
 				continue;
@@ -474,15 +463,12 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
 			unsigned arg_index = parse_header(s, spec);
 
 			// Parse precision.
-        if (*s == '.')
-        {
+			if (*s == '.') {
 				++s;
-            if ('0' <= *s && *s <= '9')
-            {
+				if ('0' <= *s && *s <= '9') {
 					spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(s));
 				}
-            else if (*s == '*')
-            {
+				else if (*s == '*') {
 					++s;
 					spec.precision_ = internal::PrecisionHandler().visit(get_arg(s));
 				}
@@ -492,8 +478,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
 			Arg arg = get_arg(s, arg_index);
 			if (spec.flag(HASH_FLAG) && internal::IsZeroInt().visit(arg))
 				spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
-        if (spec.fill_ == '0')
-        {
+			if (spec.fill_ == '0') {
 				if (arg.type <= Arg::LAST_NUMERIC_TYPE)
 					spec.align_ = ALIGN_NUMERIC;
 				else
@@ -502,8 +487,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
 
 			// Parse length and convert the argument to the required type.
 			using internal::ArgConverter;
-        switch (*s++)
-        {
+			switch (*s++) {
 			case 'h':
 				if (*s == 'h')
 					ArgConverter<signed char>(arg, *++s).visit(arg);
@@ -538,13 +522,10 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
 			if (!*s)
 				FMT_THROW(FormatError("invalid format string"));
 			spec.type_ = static_cast<char>(*s++);
-        if (arg.type <= Arg::LAST_INTEGER_TYPE)
-        {
+			if (arg.type <= Arg::LAST_INTEGER_TYPE) {
 				// Normalize type.
-            switch (spec.type_)
-            {
-            case 'i':
-            case 'u':
+				switch (spec.type_) {
+				case 'i': case 'u':
 					spec.type_ = 'd';
 					break;
 				case 'c':
@@ -639,4 +620,8 @@ inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args)
 	FMT_VARIADIC(int, fprintf, std::ostream &, CStringRef)
 }  // namespace fmt
 
+#ifdef FMT_HEADER_ONLY
+# include "printf.cc"
+#endif
+
 #endif  // FMT_PRINTF_H_