Follow standard naming conventions

fmt/format.cc

@@ -70,18 +70,17 @@
 
 // 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 *, ...) {
-  return fmt::internal::Null<>();
+static inline fmt::internal::null<> strerror_r(int, char *, ...) {
+  return fmt::internal::null<>();
 }
-static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
-  return fmt::internal::Null<>();
+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 format_error::~format_error() throw() {}
-FMT_FUNC SystemError::~SystemError() throw() {}
+FMT_FUNC system_error::~system_error() throw() {}
 
 namespace {
 
@@ -146,7 +145,7 @@ 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_));
     }
 
@@ -158,7 +157,7 @@ int safe_strerror(
     }
 
     // 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;
@@ -214,7 +213,7 @@ void report_error(FormatFunc func, int error_code,
 }
 }  // namespace
 
-FMT_FUNC void SystemError::init(
+FMT_FUNC void system_error::init(
     int err_code, CStringRef format_str, args args) {
   error_code_ = err_code;
   memory_buffer buffer;
@@ -301,28 +300,28 @@ FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
 FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view 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));
+    FMT_THROW(windows_error(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);
   if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
+    FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
   buffer_.resize(length + 1);
   length = MultiByteToWideChar(
     CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
   if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
+    FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
   buffer_[length] = 0;
 }
 
-FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(wstring_view s) {
+FMT_FUNC internal::utf16_to_utf8::utf16_to_utf8(wstring_view s) {
   if (int error_code = convert(s)) {
-    FMT_THROW(WindowsError(error_code,
+    FMT_THROW(windows_error(error_code,
         "cannot convert string from UTF-16 to UTF-8"));
   }
 }
 
-FMT_FUNC int internal::UTF16ToUTF8::convert(wstring_view s) {
+FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) {
   if (s.size() > INT_MAX)
     return ERROR_INVALID_PARAMETER;
   int s_size = static_cast<int>(s.size());
@@ -338,7 +337,7 @@ FMT_FUNC int internal::UTF16ToUTF8::convert(wstring_view s) {
   return 0;
 }
 
-FMT_FUNC void WindowsError::init(
+FMT_FUNC void windows_error::init(
     int err_code, CStringRef format_str, args args) {
   error_code_ = err_code;
   memory_buffer buffer;
@@ -359,7 +358,7 @@ FMT_FUNC void internal::format_windows_error(
           0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
           system_message, static_cast<uint32_t>(buffer.size()), 0);
       if (result != 0) {
-        UTF16ToUTF8 utf8_message;
+        utf16_to_utf8 utf8_message;
         if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
           basic_writer<char> w(out);
           w.write(message);
@@ -459,7 +458,7 @@ template struct internal::basic_data<void>;
 
 template void basic_fixed_buffer<char>::grow(std::size_t);
 
-template void internal::ArgMap<context>::init(const args &args);
+template void internal::arg_map<context>::init(const args &args);
 
 template void printf_context<char>::format(buffer &);
 
@@ -477,7 +476,7 @@ template class basic_context<wchar_t>;
 
 template void basic_fixed_buffer<wchar_t>::grow(std::size_t);
 
-template void internal::ArgMap<wcontext>::init(const wargs &args);
+template void internal::arg_map<wcontext>::init(const wargs &args);
 
 template void printf_context<wchar_t>::format(wbuffer &);