Fix clang-tidy 18.1.8 issues (#3800)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Bart Louwers
2025-09-12 14:35:44 +00:00
committed by GitHub
parent 77b4756454
commit ed1f4b3269
77 changed files with 359 additions and 206 deletions

View File

@@ -13,7 +13,7 @@
namespace {
bool acceptsURL(const std::string& url) {
return 0 == url.rfind(mbgl::util::ASSET_PROTOCOL, 0);
return url.starts_with(mbgl::util::ASSET_PROTOCOL);
}
} // namespace

View File

@@ -13,7 +13,7 @@
namespace {
bool acceptsURL(const std::string& url) {
return 0 == url.rfind(mbgl::util::FILE_PROTOCOL, 0);
return url.starts_with(mbgl::util::FILE_PROTOCOL);
}
} // namespace

View File

@@ -29,7 +29,7 @@
namespace {
bool acceptsURL(const std::string &url) {
return 0 == url.rfind(mbgl::util::MBTILES_PROTOCOL, 0);
return url.starts_with(mbgl::util::MBTILES_PROTOCOL);
}
std::string url_to_path(const std::string &url) {

View File

@@ -113,6 +113,7 @@ void logSqlMessage(void*, const int err, const char* msg) {
}
#endif
// NOLINTBEGIN(misc-use-anonymous-namespace)
MBGL_CONSTRUCTOR(initialize) {
if (sqlite3_libversion_number() / 1000000 != SQLITE_VERSION_NUMBER / 1000000) {
char message[96];
@@ -130,6 +131,7 @@ MBGL_CONSTRUCTOR(initialize) {
sqlite3_config(SQLITE_CONFIG_LOG, &logSqlMessage, nullptr);
#endif
}
// NOLINTEND(misc-use-anonymous-namespace)
std::variant<Database, Exception> Database::tryOpen(const std::string& filename, int flags) {
sqlite3* db = nullptr;
@@ -490,7 +492,8 @@ Transaction::~Transaction() {
try {
rollback();
} catch (...) {
// Ignore failed rollbacks in destructor.
// Ignore failed rollbacks in destructor, but keep the catch non-empty for analyzers.
[[maybe_unused]] auto eptr = std::current_exception();
}
}
}

View File

@@ -19,12 +19,13 @@ struct jpeg_stream_wrapper {
std::array<JOCTET, BUF_SIZE> buffer;
};
static void init_source(j_decompress_ptr cinfo) {
namespace {
void init_source(j_decompress_ptr cinfo) {
auto* wrap = reinterpret_cast<jpeg_stream_wrapper*>(cinfo->src);
wrap->stream->seekg(0, std::ios_base::beg);
}
static boolean fill_input_buffer(j_decompress_ptr cinfo) {
boolean fill_input_buffer(j_decompress_ptr cinfo) {
auto* wrap = reinterpret_cast<jpeg_stream_wrapper*>(cinfo->src);
wrap->stream->read(reinterpret_cast<char*>(wrap->buffer.data()), BUF_SIZE);
std::streamsize size = wrap->stream->gcount();
@@ -33,7 +34,7 @@ static boolean fill_input_buffer(j_decompress_ptr cinfo) {
return (size > 0) ? TRUE : FALSE;
}
static void skip(j_decompress_ptr cinfo, long count) {
void skip(j_decompress_ptr cinfo, long count) {
if (count <= 0) return; // A zero or negative skip count should be treated as a no-op.
auto* wrap = reinterpret_cast<jpeg_stream_wrapper*>(cinfo->src);
@@ -48,9 +49,9 @@ static void skip(j_decompress_ptr cinfo, long count) {
}
}
static void term(j_decompress_ptr) {}
void term(j_decompress_ptr) {}
static void attach_stream(j_decompress_ptr cinfo, std::istream* in) {
void attach_stream(j_decompress_ptr cinfo, std::istream* in) {
if (cinfo->src == nullptr) {
cinfo->src = static_cast<struct jpeg_source_mgr*>((*cinfo->mem->alloc_small)(
reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper)));
@@ -66,13 +67,14 @@ static void attach_stream(j_decompress_ptr cinfo, std::istream* in) {
src->stream = in;
}
static void on_error(j_common_ptr) {}
void on_error(j_common_ptr) {}
static void on_error_message(j_common_ptr cinfo) {
void on_error_message(j_common_ptr cinfo) {
char buffer[JMSG_LENGTH_MAX];
(*cinfo->err->format_message)(cinfo, buffer);
throw std::runtime_error(std::string("JPEG Reader: libjpeg could not read image: ") + buffer);
}
} // namespace
struct jpeg_info_guard {
explicit jpeg_info_guard(jpeg_decompress_struct* cinfo)

View File

@@ -6,7 +6,7 @@
namespace mbgl {
void Log::platformRecord(EventSeverity severity, const std::string &msg) {
std::cerr << "[" << Enum<EventSeverity>::toString(severity) << "] " << msg << std::endl;
std::cerr << "[" << Enum<EventSeverity>::toString(severity) << "] " << msg << '\n';
}
} // namespace mbgl

View File

@@ -7,15 +7,17 @@ namespace mbgl {
namespace util {
// Prefer high resolution timer if it is monotonic
namespace {
template <typename T, std::enable_if_t<std::chrono::high_resolution_clock::is_steady, T>* = nullptr>
static T sample() {
T sample() {
return std::chrono::duration_cast<T>(std::chrono::high_resolution_clock::now().time_since_epoch());
}
template <typename T, std::enable_if_t<!std::chrono::high_resolution_clock::is_steady, T>* = nullptr>
static T sample() {
T sample() {
return std::chrono::duration_cast<T>(std::chrono::steady_clock::now().time_since_epoch());
}
} // namespace
std::chrono::duration<double> MonotonicTimer::now() {
return sample<std::chrono::duration<double>>();

View File

@@ -10,12 +10,14 @@ extern "C" {
#include <png.h>
}
namespace {
template <size_t max, typename... Args>
static std::string sprintf(const char* msg, Args... args) {
std::string sprintf(const char* msg, Args... args) {
char res[max];
int len = snprintf(res, sizeof(res), msg, args...);
return std::string(res, len);
}
} // namespace
const static bool png_version_check [[maybe_unused]] = []() {
const png_uint_32 version = png_access_version_number();
@@ -35,15 +37,16 @@ const static bool png_version_check [[maybe_unused]] = []() {
namespace mbgl {
static void user_error_fn(png_structp, png_const_charp error_msg) {
namespace {
void user_error_fn(png_structp, png_const_charp error_msg) {
throw std::runtime_error(std::string("failed to read invalid png: '") + error_msg + "'");
}
static void user_warning_fn(png_structp, png_const_charp warning_msg) {
void user_warning_fn(png_structp, png_const_charp warning_msg) {
Log::Warning(Event::Image, std::string("ImageReader (PNG): ") + warning_msg);
}
static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
auto* fin = reinterpret_cast<std::istream*>(png_get_io_ptr(png_ptr));
fin->read(reinterpret_cast<char*>(data), length);
std::streamsize read_count = fin->gcount();
@@ -51,6 +54,7 @@ static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length
png_error(png_ptr, "Read Error");
}
}
} // namespace
struct png_struct_guard {
png_struct_guard(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)

View File

@@ -35,6 +35,8 @@ struct Watch {
case UV_READABLE | UV_WRITABLE:
watchEvent = RunLoop::Event::ReadWrite;
break;
default:
break;
}
watch->eventCallback(watch->fd, watchEvent);