mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

(parse_display_format): refactoring.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-01-01 13:32:10 +03:00
parent 3e92c40a38
commit 8299455519
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/filemanager/panel.c
View File

@ -1712,6 +1712,7 @@ parse_display_format (WPanel * panel, const char *format, char **error, gboolean
align_crt_t justify; /* Which mode. */
gboolean set_justify = TRUE; /* flag: set justification mode? */
gboolean found = FALSE;
size_t klen = 0;
darr = g_new0 (format_item_t, 1);
home = g_slist_append (home, darr);
@ -1738,21 +1739,20 @@ parse_display_format (WPanel * panel, const char *format, char **error, gboolean
break;
}
for (i = 0; panel_fields[i].id != NULL; i++)
for (i = 0; !found && panel_fields[i].id != NULL; i++)
{
size_t klen;
klen = strlen (panel_fields[i].id);
found = strncmp (format, panel_fields[i].id, klen) == 0;
}
if (strncmp (format, panel_fields[i].id, klen) != 0)
continue;
if (found)
{
i--;
format += klen;
darr->requested_field_len = panel_fields[i].min_size;
darr->string_fn = panel_fields[i].string_fn;
darr->title = g_strdup (panel_get_title_without_hotkey (panel_fields[i].title_hotkey));
darr->id = panel_fields[i].id;
darr->expand = panel_fields[i].expands;
darr->just_mode = panel_fields[i].default_just;
@ -1764,7 +1764,6 @@ parse_display_format (WPanel * panel, const char *format, char **error, gboolean
else
darr->just_mode = justify;
}
found = TRUE;
format = skip_separators (format);
@ -1789,13 +1788,9 @@ parse_display_format (WPanel * panel, const char *format, char **error, gboolean
darr->expand = TRUE;
format++;
}
}
break;
}
if (!found)
else
{
size_t pos;
char *tmp_format;