summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxaizek <xaizek@openmailbox.org>2017-06-20 15:34:35 +0300
committerxaizek <xaizek@openmailbox.org>2017-06-20 15:46:42 +0300
commita82ddba30b409df80c4414c7aa8f06407252a75a (patch)
tree6d1df14dd5bdf19cd85f39401eb4d062d20eb522
parenta3b079df6f00bc7bf1e18b8747a684967a111bbd (diff)
check_if_filelist_{ have => has }_changed()
Previously renamed it { filelists => filelist }, but didn't fix "have".
-rw-r--r--src/event_loop.c2
-rw-r--r--src/filelist.c2
-rw-r--r--src/filelist.h2
-rw-r--r--tests/misc/flist_tree.c16
4 files changed, 11 insertions, 11 deletions
diff --git a/src/event_loop.c b/src/event_loop.c
index 451fc6d57..b486e5079 100644
--- a/src/event_loop.c
+++ b/src/event_loop.c
@@ -502,7 +502,7 @@ check_view_for_changes(FileView *view)
{
if(window_shows_dirlist(view))
{
- check_if_filelist_have_changed(view);
+ check_if_filelist_has_changed(view);
}
}
diff --git a/src/filelist.c b/src/filelist.c
index 5289b3e9b..dbc505520 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -2499,7 +2499,7 @@ alloc_dir_entry(dir_entry_t **list, int list_size)
}
void
-check_if_filelist_have_changed(FileView *view)
+check_if_filelist_has_changed(FileView *view)
{
int failed, changed;
const char *const curr_dir = flist_get_dir(view);
diff --git a/src/filelist.h b/src/filelist.h
index 2eefa7a77..9f51973c0 100644
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -161,7 +161,7 @@ char * get_current_file_name(FileView *view);
dir_entry_t * get_current_entry(const FileView *view);
/* Checks whether content in the current directory of the view changed and
* reloads the view if so. */
-void check_if_filelist_have_changed(FileView *view);
+void check_if_filelist_has_changed(FileView *view);
/* Checks whether cd'ing into path is possible. Shows cd errors to a user.
* Returns non-zero if it's possible, zero otherwise. */
int cd_is_possible(const char *path);
diff --git a/tests/misc/flist_tree.c b/tests/misc/flist_tree.c
index 826b49c90..8b7e43e54 100644
--- a/tests/misc/flist_tree.c
+++ b/tests/misc/flist_tree.c
@@ -288,10 +288,10 @@ TEST(tree_is_reloaded_automatically_with_file_updates)
assert_success(load_tree(&lwin, SANDBOX_PATH));
assert_int_equal(2, lwin.list_rows);
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
ui_view_query_scheduled_event(&lwin);
assert_success(remove(SANDBOX_PATH "/b"));
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
curr_stats.load_stage = 2;
assert_true(process_scheduled_updates_of_view(&lwin));
@@ -328,10 +328,10 @@ TEST(nested_directory_change_detection)
assert_success(load_tree(&lwin, SANDBOX_PATH));
assert_int_equal(3, lwin.list_rows);
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
ui_view_query_scheduled_event(&lwin);
assert_success(remove(SANDBOX_PATH "/nested-dir/b"));
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
curr_stats.load_stage = 2;
assert_true(process_scheduled_updates_of_view(&lwin));
@@ -714,14 +714,14 @@ TEST(dotdirs_do_not_mess_up_change_detection)
assert_success(load_tree(&lwin, TEST_DATA_PATH "/tree"));
/* Discard results of the first check. */
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
(void)ui_view_query_scheduled_event(&lwin);
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
assert_int_equal(UUE_NONE, ui_view_query_scheduled_event(&lwin));
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
assert_int_equal(UUE_NONE, ui_view_query_scheduled_event(&lwin));
- check_if_filelist_have_changed(&lwin);
+ check_if_filelist_has_changed(&lwin);
assert_int_equal(UUE_NONE, ui_view_query_scheduled_event(&lwin));
cfg.dot_dirs = 0;