mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1585: mc viwer is slow.

Browse Source 
Initial commit: minor refactoring:
    rename coord_cache_entry to coord_cache_entry_t.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-11-27 16:06:29 +03:00 committed by Ilia Maslakov
parent adf88d6bd5
commit d2668b188a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewer/coord_cache.c
View File

@ -72,8 +72,8 @@
/* Find and return the index of the last cache entry that is
* smaller than ''coord'', according to the criterion ''sort_by''. */
static guint
mcview_ccache_find (mcview_t * view, const struct coord_cache_entry *cache,
const struct coord_cache_entry *coord, enum ccache_type sort_by)
mcview_ccache_find (mcview_t * view, const coord_cache_entry_t *cache,
const coord_cache_entry_t *coord, enum ccache_type sort_by)
{
guint base, i, limit;
@ -102,8 +102,8 @@ mcview_ccache_find (mcview_t * view, const struct coord_cache_entry *cache,
/* --------------------------------------------------------------------------------------------- */
gboolean
mcview_coord_cache_entry_less (const struct coord_cache_entry *a,
const struct coord_cache_entry *b, enum ccache_type crit,
mcview_coord_cache_entry_less (const coord_cache_entry_t *a,
const coord_cache_entry_t *b, enum ccache_type crit,
gboolean nroff_mode)
{
if (crit == CCACHE_OFFSET)
@ -132,12 +132,12 @@ mcview_ccache_dump (mcview_t * view)
FILE *f;
off_t offset, line, column, nextline_offset, filesize;
guint i;
const struct coord_cache_entry *cache;
const coord_cache_entry_t *cache;
assert (view->coord_cache != NULL);
filesize = mcview_get_filesize (view);
cache = &(g_array_index (view->coord_cache, struct coord_cache_entry, 0));
cache = &(g_array_index (view->coord_cache, coord_cache_entry, 0));
f = fopen ("mcview-ccache.out", "w");
if (f == NULL)
@ -197,11 +197,11 @@ mcview_ccache_dump (mcview_t * view)
* matches the existing components of ''coord''.
*/
void
mcview_ccache_lookup (mcview_t * view, struct coord_cache_entry *coord,
mcview_ccache_lookup (mcview_t * view, coord_cache_entry_t *coord,
enum ccache_type lookup_what)
{
guint i;
struct coord_cache_entry *cache, current, next, entry;
coord_cache_entry_t *cache, current, next, entry;
enum ccache_type sorter;
off_t limit;
enum {
@ -211,7 +211,7 @@ mcview_ccache_lookup (mcview_t * view, struct coord_cache_entry *coord,
} nroff_state;
if (!view->coord_cache) {
view->coord_cache = g_array_new (FALSE, FALSE, sizeof (struct coord_cache_entry));
view->coord_cache = g_array_new (FALSE, FALSE, sizeof (coord_cache_entry_t));
current.cc_offset = 0;
current.cc_line = 0;
current.cc_column = 0;
@ -225,7 +225,7 @@ mcview_ccache_lookup (mcview_t * view, struct coord_cache_entry *coord,
retry:
/* find the two neighbor entries in the cache */
cache = &(g_array_index (view->coord_cache, struct coord_cache_entry, 0));
cache = &(g_array_index (view->coord_cache, coord_cache_entry_t, 0));
i = mcview_ccache_find (view, cache, coord, sorter);
/* now i points to the lower neighbor in the cache */

10
src/viewer/internal.h
View File

@ -70,12 +70,12 @@ struct area {
* line and column of that cache entry. cc_nroff_column is the column
* corresponding to cc_offset in nroff mode.
*/
struct coord_cache_entry {
typedef struct {
off_t cc_offset;
off_t cc_line;
off_t cc_column;
off_t cc_nroff_column;
};
} coord_cache_entry_t;
struct mcview_nroff_struct;
@ -205,14 +205,14 @@ cb_ret_t mcview_dialog_callback (Dlg_head *h, Widget *sender,
dlg_msg_t msg, int parm, void *data);
/* coord_cache.c: */
gboolean mcview_coord_cache_entry_less (const struct coord_cache_entry *,
const struct coord_cache_entry *, enum ccache_type,
gboolean mcview_coord_cache_entry_less (const coord_cache_entry_t *,
const coord_cache_entry_t *, enum ccache_type,
gboolean);
#ifdef MC_ENABLE_DEBUGGING_CODE
void mcview_ccache_dump (mcview_t *view);
#endif
void mcview_ccache_lookup (mcview_t *view, struct coord_cache_entry *coord,
void mcview_ccache_lookup (mcview_t *view, coord_cache_entry_t *coord,
enum ccache_type lookup_what);
/* datasource.c: */

4
src/viewer/move.c
View File

@ -370,7 +370,7 @@ mcview_moveto (mcview_t * view, off_t line, off_t col)
void
mcview_coord_to_offset (mcview_t * view, off_t * ret_offset, off_t line, off_t column)
{
struct coord_cache_entry coord;
coord_cache_entry_t coord;
coord.cc_line = line;
coord.cc_column = column;
@ -384,7 +384,7 @@ mcview_coord_to_offset (mcview_t * view, off_t * ret_offset, off_t line, off_t c
void
mcview_offset_to_coord (mcview_t * view, off_t * ret_line, off_t * ret_column, off_t offset)
{
struct coord_cache_entry coord;
coord_cache_entry_t coord;
coord.cc_offset = offset;
mcview_ccache_lookup (view, &coord, CCACHE_LINECOL);