Change-Id: Ief9395eda8c2eb2837706227be75e482842e48ec
This commit is contained in:
Christian Soffke 2025-03-09 17:27:53 +01:00
parent fffae07833
commit 272ce05396
2 changed files with 7 additions and 6 deletions

View file

@ -1574,7 +1574,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
int i; int i;
int namebufused = 0; int namebufused = 0;
int total_count = 0; int total_count = 0;
int special_entry_count = 0; c->special_entry_count = 0;
int level = c->currextra; int level = c->currextra;
int tag; int tag;
bool sort = false; bool sort = false;
@ -1691,7 +1691,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
dptr->customaction = ONPLAY_NO_CUSTOMACTION; dptr->customaction = ONPLAY_NO_CUSTOMACTION;
dptr++; dptr++;
current_entry_count++; current_entry_count++;
special_entry_count++; c->special_entry_count++;
} }
if (offset <= 1) if (offset <= 1)
{ {
@ -1701,7 +1701,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
dptr->customaction = ONPLAY_NO_CUSTOMACTION; dptr->customaction = ONPLAY_NO_CUSTOMACTION;
dptr++; dptr++;
current_entry_count++; current_entry_count++;
special_entry_count++; c->special_entry_count++;
} }
total_count += 2; total_count += 2;
@ -1839,8 +1839,8 @@ entry_skip_formatter:
qsort_fn = sort_inverse ? strncasecmp_inv : strncasecmp; qsort_fn = sort_inverse ? strncasecmp_inv : strncasecmp;
struct tagentry *entries = get_entries(c); struct tagentry *entries = get_entries(c);
qsort(&entries[special_entry_count], qsort(&entries[c->special_entry_count],
current_entry_count - special_entry_count, current_entry_count - c->special_entry_count,
sizeof(struct tagentry), sizeof(struct tagentry),
compare); compare);
} }
@ -1882,7 +1882,7 @@ entry_skip_formatter:
if (strip) if (strip)
{ {
dptr = get_entries(c); dptr = get_entries(c);
for (i = special_entry_count; i < current_entry_count; i++, dptr++) for (i = c->special_entry_count; i < current_entry_count; i++, dptr++)
{ {
int len = strlen(dptr->name); int len = strlen(dptr->name);

View file

@ -92,6 +92,7 @@ struct tree_context {
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
int currtable; /* db use */ int currtable; /* db use */
int currextra; /* db use */ int currextra; /* db use */
int special_entry_count; /* db use */
#endif #endif
int sort_dir; /* directory sort order */ int sort_dir; /* directory sort order */
int out_of_tree; /* shortcut from elsewhere */ int out_of_tree; /* shortcut from elsewhere */