Prepare to migrate ABSL_PRINTF_ATTRIBUTE to [[gnu::format(...)]] PiperOrigin-RevId: 998036008 Change-Id: I316e9a6cfb6635b14e95df3ce375ec3f164027a7
diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc index 7c39f6d..848e69f 100644 --- a/absl/base/internal/raw_logging.cc +++ b/absl/base/internal/raw_logging.cc
@@ -89,8 +89,8 @@ // consumed bytes, and return whether the message fit without truncation. If // truncation occurred, if possible leave room in the buffer for the message // kTruncated[]. -bool VADoRawLog(char** buf, int* size, const char* format, va_list ap) - ABSL_PRINTF_ATTRIBUTE(3, 0); +ABSL_PRINTF_ATTRIBUTE(3, 0) +bool VADoRawLog(char** buf, int* size, const char* format, va_list ap); bool VADoRawLog(char** buf, int* size, const char* format, va_list ap) { if (*size < 0) return false; int n = vsnprintf(*buf, static_cast<size_t>(*size), format, ap); @@ -117,8 +117,8 @@ // Helper for RawLog below. // *DoRawLog writes to *buf of *size and move them past the written portion. // It returns true iff there was no overflow or error. -bool DoRawLog(char** buf, int* size, const char* format, ...) - ABSL_PRINTF_ATTRIBUTE(3, 4); +ABSL_PRINTF_ATTRIBUTE(3, 4) +bool DoRawLog(char** buf, int* size, const char* format, ...); bool DoRawLog(char** buf, int* size, const char* format, ...) { if (*size < 0) return false; va_list ap; @@ -143,8 +143,9 @@ ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES absl::base_internal::AtomicHook<AbortHook> abort_hook; +ABSL_PRINTF_ATTRIBUTE(4, 0) void RawLogVA(absl::LogSeverity severity, const char* file, int line, - const char* format, va_list ap) ABSL_PRINTF_ATTRIBUTE(4, 0); + const char* format, va_list ap); void RawLogVA(absl::LogSeverity severity, const char* file, int line, const char* format, va_list ap) { char buffer[kLogBufSize];
diff --git a/absl/base/internal/raw_logging.h b/absl/base/internal/raw_logging.h index 8637030..9cc270b 100644 --- a/absl/base/internal/raw_logging.h +++ b/absl/base/internal/raw_logging.h
@@ -128,8 +128,9 @@ // Logs format... at "severity" level, reporting it // as called from file:line. // This does not allocate memory or acquire locks. +ABSL_PRINTF_ATTRIBUTE(4, 5) void RawLog(absl::LogSeverity severity, const char* file, int line, - const char* format, ...) ABSL_PRINTF_ATTRIBUTE(4, 5); + const char* format, ...); // Writes the provided buffer directly to stderr, in a signal-safe, low-level // manner. Preserves errno.