From 268b2cc05337112c8e436b341998c8860b952593 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 9 Jul 2023 05:05:00 +0300 Subject: [PATCH] kdecore: remove redundant locks in KMimeTypeRepository once the globs and magic rules are parsed locking is redundant Signed-off-by: Ivailo Monev --- kdecore/services/kmimetyperepository.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/kdecore/services/kmimetyperepository.cpp b/kdecore/services/kmimetyperepository.cpp index 40a1d3e5..a987af38 100644 --- a/kdecore/services/kmimetyperepository.cpp +++ b/kdecore/services/kmimetyperepository.cpp @@ -221,7 +221,6 @@ QStringList KMimeTypeRepository::findFromFileName(const QString &fileName, QStri { parseGlobs(); - std::lock_guard lock(m_mutex); // First try the high weight matches (>=50), if any. QStringList matchingMimeTypes; QString foundExt; @@ -258,15 +257,12 @@ KMimeType::Ptr KMimeTypeRepository::findFromContent(QIODevice* device, int* accu parseMagic(); // Apply magic rules - { - std::lock_guard lock(m_mutex); - Q_FOREACH ( const KMimeMagicRule& rule, m_magicRules ) { - if (rule.match(device, deviceSize, beginning)) { - if (accuracy) { - *accuracy = rule.priority(); - } - return findMimeTypeByName(rule.mimetype()); + Q_FOREACH ( const KMimeMagicRule& rule, m_magicRules ) { + if (rule.match(device, deviceSize, beginning)) { + if (accuracy) { + *accuracy = rule.priority(); } + return findMimeTypeByName(rule.mimetype()); } }