Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: remove redundant locks in KMimeTypeRepository

Browse source 
once the globs and magic rules are parsed locking is redundant

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-09 05:05:00 +03:00
parent 32445250ef
commit 268b2cc053
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kdecore/services/kmimetyperepository.cpp
View file

@ -221,7 +221,6 @@ QStringList KMimeTypeRepository::findFromFileName(const QString &fileName, QStri
{ {
parseGlobs(); parseGlobs();
std::lock_guard<std::recursive_mutex> lock(m_mutex);
// First try the high weight matches (>=50), if any. // First try the high weight matches (>=50), if any.
QStringList matchingMimeTypes; QStringList matchingMimeTypes;
QString foundExt; QString foundExt;
@ -258,15 +257,12 @@ KMimeType::Ptr KMimeTypeRepository::findFromContent(QIODevice* device, int* accu
parseMagic(); parseMagic();
// Apply magic rules // Apply magic rules
{ Q_FOREACH ( const KMimeMagicRule& rule, m_magicRules ) {
std::lock_guard<std::recursive_mutex> lock(m_mutex); if (rule.match(device, deviceSize, beginning)) {
Q_FOREACH ( const KMimeMagicRule& rule, m_magicRules ) { if (accuracy) {
if (rule.match(device, deviceSize, beginning)) { *accuracy = rule.priority();
if (accuracy) {
*accuracy = rule.priority();
}
return findMimeTypeByName(rule.mimetype());
} }
return findMimeTypeByName(rule.mimetype());
} }
} }