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

(handle_dirent): change parameters type from int* to gboolean*.

Browse Source 
(dir_list_load): change variable type and reduce scope.
(dir_list_reload): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-08-24 20:55:34 +03:00
parent 13597ebd67
commit ea0fcc0fb8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/filemanager/dir.c
View File

@ -147,11 +147,10 @@ clean_sort_keys (dir_list * list, int start, int count)
*/ */
static gboolean static gboolean
handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, int *link_to_dir, handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, gboolean * link_to_dir,
int *stale_link) gboolean * stale_link)
{ {
vfs_path_t *vpath; vfs_path_t *vpath;
gboolean stale;
if (DIR_IS_DOT (dp->d_name) || DIR_IS_DOTDOT (dp->d_name)) if (DIR_IS_DOT (dp->d_name) || DIR_IS_DOTDOT (dp->d_name))
return FALSE; return FALSE;
@ -175,12 +174,11 @@ handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, int *link
tree_store_mark_checked (dp->d_name); tree_store_mark_checked (dp->d_name);
/* A link to a file or a directory? */ /* A link to a file or a directory? */
*link_to_dir = file_is_symlink_to_dir (vpath, buf1, &stale) ? 1 : 0; *link_to_dir = file_is_symlink_to_dir (vpath, buf1, stale_link);
*stale_link = stale ? 1 : 0;
vfs_path_free (vpath); vfs_path_free (vpath);
return (S_ISDIR (buf1->st_mode) || *link_to_dir != 0 || fltr == NULL return (S_ISDIR (buf1->st_mode) || *link_to_dir || fltr == NULL
|| mc_search (fltr, NULL, dp->d_name, MC_SEARCH_T_GLOB)); || mc_search (fltr, NULL, dp->d_name, MC_SEARCH_T_GLOB));
} }
@ -628,7 +626,6 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
{ {
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
int link_to_dir, stale_link;
struct stat st; struct stat st;
file_entry_t *fentry; file_entry_t *fentry;
const char *vpath_str; const char *vpath_str;
@ -657,10 +654,12 @@ dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
while ((dp = mc_readdir (dirp)) != NULL) while ((dp = mc_readdir (dirp)) != NULL)
{ {
gboolean link_to_dir, stale_link;
if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link))
continue; continue;
if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link))
goto ret; goto ret;
if ((list->len & 31) == 0) if ((list->len & 31) == 0)
@ -696,7 +695,7 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
{ {
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
int i, link_to_dir, stale_link; int i;
struct stat st; struct stat st;
int marked_cnt; int marked_cnt;
GHashTable *marked_files; GHashTable *marked_files;
@ -769,11 +768,12 @@ dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort,
while ((dp = mc_readdir (dirp)) != NULL) while ((dp = mc_readdir (dirp)) != NULL)
{ {
file_entry_t *fentry; file_entry_t *fentry;
gboolean link_to_dir, stale_link;
if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link))
continue; continue;
if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) if (!dir_list_append (list, dp->d_name, &st, link_to_dir, stale_link))
{ {
mc_closedir (dirp); mc_closedir (dirp);
/* Norbert (Feb 12, 1997): /* Norbert (Feb 12, 1997):