99938c3a36
[ Merge of http://go/wvgerrit/110165 ] The conditional compilation for flagging the CDM and ODKiTEE logging functions as printf-like was guarded by a check on "__gnuc__" or "__clang__". However, GCC doesn't actually define "__gnuc__", it defines "__GNUC__", all caps. Fixing this causes GCC to find a slew of format-string errors that Clang was accepting. This patch fixes the capitalization and the uncovered errors, most of which fall into one of a few categories: 1) The format string and variable had different signedness. For these, the format strings are updated to match the variables. 2) The variable was an array index that was not of size_t. For these, the variables have been updated to be size_t and the format strings have been updated to use %zu. A few index variables that weren't actually used in format strings are also fixed to be size_t. 3) The code assumed the signedness of the internal representation of an integer literal, enum constant, or enum variable. For these, I either cast the input to a known type so that the format string is valid regardless of internal representation or I switched to a hexadecimal format string. The latter case is more useful on ODKiTEE enums where the literal value is in the code as a 32-bit hexadecimal value anyway. This patch also adds missing integer casts to the enum literals in the ODKiTEE logging header. (These are required for pedantic C99 compatibility when using literal values that do not fit into a 16-bit integer.) Bug: 173460694 Test: jenkins/odkitee_ta Test: build.py x86-64 Change-Id: I244972639a5a6ea0de157eb67e1e0dfa9787ec32
65 lines
2.2 KiB
C++
65 lines
2.2 KiB
C++
// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
|
|
// source code may only be used and distributed under the Widevine License
|
|
// Agreement.
|
|
//
|
|
// Log - Platform independent interface for a Logging class
|
|
//
|
|
#ifndef WVCDM_UTIL_LOG_H_
|
|
#define WVCDM_UTIL_LOG_H_
|
|
|
|
#include "util_common.h"
|
|
|
|
namespace wvcdm {
|
|
|
|
// Simple logging class. The implementation is platform dependent.
|
|
|
|
typedef enum {
|
|
// This log level should only be used for |g_cutoff|, in order to silence all
|
|
// logging. It should never be passed to |Log()| as a log level.
|
|
LOG_SILENT = -1,
|
|
|
|
LOG_ERROR = 0,
|
|
LOG_WARN = 1,
|
|
LOG_INFO = 2,
|
|
LOG_DEBUG = 3,
|
|
LOG_VERBOSE = 4,
|
|
} LogPriority;
|
|
|
|
extern LogPriority g_cutoff;
|
|
|
|
// Enable/disable verbose logging (LOGV).
|
|
// This function is supplied for cases where the system layer does not
|
|
// initialize logging. This is also needed to initialize logging in
|
|
// unit tests.
|
|
CORE_UTIL_EXPORT void InitLogging();
|
|
|
|
// Only enable format specifier warnings on LP64 systems. There is
|
|
// no easy portable method to handle format specifiers for int64_t.
|
|
#if (defined(__GNUC__) || defined(__clang__)) && defined(__LP64__)
|
|
[[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file,
|
|
const char* function,
|
|
int line,
|
|
LogPriority level,
|
|
const char* fmt, ...);
|
|
#else
|
|
CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line,
|
|
LogPriority level, const char* fmt, ...);
|
|
#endif
|
|
|
|
// Log APIs
|
|
#ifndef LOGE
|
|
# define LOGE(...) \
|
|
Log(__FILE__, __func__, __LINE__, wvcdm::LOG_ERROR, __VA_ARGS__)
|
|
# define LOGW(...) \
|
|
Log(__FILE__, __func__, __LINE__, wvcdm::LOG_WARN, __VA_ARGS__)
|
|
# define LOGI(...) \
|
|
Log(__FILE__, __func__, __LINE__, wvcdm::LOG_INFO, __VA_ARGS__)
|
|
# define LOGD(...) \
|
|
Log(__FILE__, __func__, __LINE__, wvcdm::LOG_DEBUG, __VA_ARGS__)
|
|
# define LOGV(...) \
|
|
Log(__FILE__, __func__, __LINE__, wvcdm::LOG_VERBOSE, __VA_ARGS__)
|
|
#endif
|
|
} // namespace wvcdm
|
|
|
|
#endif // WVCDM_UTIL_LOG_H_
|