mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

src/filemanager/dir.c: minor sort optimization.

Browse Source 
Get rid of sort condition double check.

Condition

    ad == bd || panels_options.mix_all_files

was checked twice: first in sort_xxx(), then in sort_name() called in
sort_xxx().

Now this condition is checked in sort_xxx() only.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2022-05-29 12:52:19 +03:00
parent f5399c6d4d
commit 1b93bae611
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/filemanager/dir.c
View File

@ -116,6 +116,20 @@ key_collate (const char *t1, const char *t2)
return ret; return ret;
} }
/* --------------------------------------------------------------------------------------------- */
static inline int
compare_by_names (file_entry_t * a, file_entry_t * b)
{
/* create key if does not exist, key will be freed after sorting */
if (a->sort_key == NULL)
a->sort_key = str_create_key_for_filename (a->fname->str, case_sensitive);
if (b->sort_key == NULL)
b->sort_key = str_create_key_for_filename (b->fname->str, case_sensitive);
return key_collate (a->sort_key, b->sort_key);
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* clear keys, should be call after sorting is finished. * clear keys, should be call after sorting is finished.
@ -336,15 +350,7 @@ sort_name (file_entry_t * a, file_entry_t * b)
int bd = MY_ISDIR (b); int bd = MY_ISDIR (b);
if (ad == bd || panels_options.mix_all_files) if (ad == bd || panels_options.mix_all_files)
{ return compare_by_names (a, b);
/* create key if does not exist, key will be freed after sorting */
if (a->sort_key == NULL)
a->sort_key = str_create_key_for_filename (a->fname->str, case_sensitive);
if (b->sort_key == NULL)
b->sort_key = str_create_key_for_filename (b->fname->str, case_sensitive);
return key_collate (a->sort_key, b->sort_key);
}
return bd - ad; return bd - ad;
} }
@ -365,7 +371,7 @@ sort_vers (file_entry_t * a, file_entry_t * b)
if (result != 0) if (result != 0)
return result * reverse; return result * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;
@ -392,7 +398,7 @@ sort_ext (file_entry_t * a, file_entry_t * b)
if (r != 0) if (r != 0)
return r * reverse; return r * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;
@ -413,7 +419,7 @@ sort_time (file_entry_t * a, file_entry_t * b)
if (result != 0) if (result != 0)
return result * reverse; return result * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;
@ -434,7 +440,7 @@ sort_ctime (file_entry_t * a, file_entry_t * b)
if (result != 0) if (result != 0)
return result * reverse; return result * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;
@ -455,7 +461,7 @@ sort_atime (file_entry_t * a, file_entry_t * b)
if (result != 0) if (result != 0)
return result * reverse; return result * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;
@ -490,7 +496,7 @@ sort_size (file_entry_t * a, file_entry_t * b)
if (result != 0) if (result != 0)
return result * reverse; return result * reverse;
return sort_name (a, b); return compare_by_names (a, b);
} }
return bd - ad; return bd - ad;