From 347069535767a00b099f76a4b56c7fd4b7f145d8 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 24 Aug 2013 09:50:20 +0400 Subject: [PATCH] Rename macros related to dir_list::size. Signed-off-by: Andrew Borodin --- src/filemanager/dir.c | 8 ++++---- src/filemanager/dir.h | 4 ++-- src/filemanager/find.c | 2 +- src/filemanager/panel.c | 2 +- tests/src/filemanager/exec_get_export_variables_ext.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c index 233f2bace..4c04ac882 100644 --- a/src/filemanager/dir.c +++ b/src/filemanager/dir.c @@ -266,7 +266,7 @@ dir_list_grow (dir_list * list, int delta) size = list->size + delta; if (size <= 0) { - size = MIN_FILES; + size = DIR_LIST_MIN_SIZE; clear = TRUE; } @@ -305,7 +305,7 @@ dir_list_append (dir_list * list, const char *fname, const struct stat *st, gboolean link_to_dir, gboolean stale_link) { /* Need to grow the *list? */ - if (list->len == list->size && !dir_list_grow (list, RESIZE_STEPS)) + if (list->len == list->size && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) return FALSE; list->list[list->len].fnamelen = strlen (fname); @@ -528,7 +528,7 @@ clean_dir (dir_list * list) list->len = 0; /* reduce memory usage */ - dir_list_grow (list, MIN_FILES - list->size); + dir_list_grow (list, DIR_LIST_MIN_SIZE - list->size); } /* --------------------------------------------------------------------------------------------- */ @@ -538,7 +538,7 @@ gboolean set_zero_dir (dir_list * list) { /* Need to grow the *list? */ - if (list->size == 0 && !dir_list_grow (list, RESIZE_STEPS)) + if (list->size == 0 && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) { list->len = 0; return FALSE; diff --git a/src/filemanager/dir.h b/src/filemanager/dir.h index a48efeb04..b61982e18 100644 --- a/src/filemanager/dir.h +++ b/src/filemanager/dir.h @@ -13,8 +13,8 @@ /*** typedefs(not structures) and defined constants **********************************************/ -#define MIN_FILES 128 -#define RESIZE_STEPS 128 +#define DIR_LIST_MIN_SIZE 128 +#define DIR_LIST_RESIZE_STEP 128 /*** enums ***************************************************************************************/ diff --git a/src/filemanager/find.c b/src/filemanager/find.c index a5435efec..5c3cfeebe 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -1738,7 +1738,7 @@ do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, continue; } /* Need to grow the *list? */ - if (list->len == list->size && !dir_list_grow (list, RESIZE_STEPS)) + if (list->len == list->size && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) { g_free (name); break; diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 0d8a34109..e499c1092 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -4069,7 +4069,7 @@ panel_new_with_dir (const char *panel_name, const vfs_path_t * vpath) panel->hist_name = g_strconcat ("Dir Hist ", panel_name, (char *) NULL); /* directories history will be get later */ - panel->dir.size = MIN_FILES; + panel->dir.size = DIR_LIST_MIN_SIZE; panel->dir.list = g_new (file_entry, panel->dir.size); panel->dir.len = 0; panel->active = 0; diff --git a/tests/src/filemanager/exec_get_export_variables_ext.c b/tests/src/filemanager/exec_get_export_variables_ext.c index a98e45b58..0ea4869c7 100644 --- a/tests/src/filemanager/exec_get_export_variables_ext.c +++ b/tests/src/filemanager/exec_get_export_variables_ext.c @@ -51,7 +51,7 @@ setup (void) mc_global.mc_run_mode = MC_RUN_FULL; current_panel = g_new0 (struct WPanel, 1); current_panel->cwd_vpath = vfs_path_from_str ("/home"); - current_panel->dir.size = MIN_FILES; + current_panel->dir.size = DIR_LIST_MIN_SIZE; current_panel->dir.list = g_new0 (file_entry, current_panel->dir.size); current_panel->dir.len = 0; }