summaryrefslogtreecommitdiff
path: root/src/tests/eio
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-07 14:52:41 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-09 11:43:59 +0000
commit665a75378fcb791600043b5c84e68f441aaaf5d3 (patch)
tree3e5f28ef48f512bec3f01adb5449aa1bd4f7a83c /src/tests/eio
parentf80b8979ba11ade8e5c9365d4464eebc57cd50c3 (diff)
xxx - fix eina_future_then calls to pass sotrage val - fix warns
Diffstat (limited to 'src/tests/eio')
-rw-r--r--src/tests/eio/eio_model_test_file.c8
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eio/eio_test_manager.c12
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c6
4 files changed, 15 insertions, 15 deletions
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 4a7ac7d8f7..53e941fe2c 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -92,12 +92,12 @@ listing(void *data,
92 if (efl_model_children_count_get(filemodel) == 0) 92 if (efl_model_children_count_get(filemodel) == 0)
93 { 93 {
94 future = efl_loop_job(efl_provider_find(filemodel, EFL_LOOP_CLASS)); 94 future = efl_loop_job(efl_provider_find(filemodel, EFL_LOOP_CLASS));
95 future = eina_future_then(future, listing, filemodel); 95 future = eina_future_then(future, listing, filemodel, NULL);
96 } 96 }
97 else 97 else
98 { 98 {
99 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel)); 99 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
100 future = eina_future_then(future, &promise_then_accessor, NULL); 100 future = eina_future_then(future, &promise_then_accessor, NULL, NULL);
101 } 101 }
102 102
103 return eina_future_as_value(future); 103 return eina_future_as_value(future);
@@ -122,8 +122,8 @@ setup_waiter(Efl_Model *model)
122 122
123 if (listingf) return ; 123 if (listingf) return ;
124 listingf = efl_loop_job(loop); 124 listingf = efl_loop_job(loop);
125 listingf = eina_future_then(listingf, listing, model); 125 listingf = eina_future_then(listingf, listing, model, NULL);
126 listingf = eina_future_then(listingf, clearup, NULL); 126 listingf = eina_future_then(listingf, clearup, NULL, NULL);
127} 127}
128 128
129static void 129static void
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 392aa31f0f..aeaaad0229 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -76,7 +76,7 @@ _children_added_cb(void *d EINA_UNUSED, const Efl_Event* event)
76 Eina_Future *future; 76 Eina_Future *future;
77 77
78 future = efl_model_children_slice_get(event->object, evt->index, 1); 78 future = efl_model_children_slice_get(event->object, evt->index, 1);
79 eina_future_then(future, _children_get, event->object); 79 eina_future_then(future, _children_get, event->object, NULL);
80} 80}
81 81
82static Eina_Value 82static Eina_Value
@@ -111,7 +111,7 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
111 111
112 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel)); 112 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
113 113
114 eina_future_then(future, &_create_file, NULL); 114 eina_future_then(future, &_create_file, NULL, NULL);
115 115
116 ecore_main_loop_begin(); 116 ecore_main_loop_begin();
117 117
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 0a849adcc8..ec51f7ce61 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -174,7 +174,7 @@ _test_ls(Eina_Future *(*func)(const Eo *obj, const char *path, Eina_Bool recursi
174 f = func(job, test_dirname, EINA_FALSE, &main_files, _progress_cb, NULL); 174 f = func(job, test_dirname, EINA_FALSE, &main_files, _progress_cb, NULL);
175 fail_if(!f); 175 fail_if(!f);
176 test_count = expected_test_count; 176 test_count = expected_test_count;
177 eina_future_then(f, &_done_cb, &main_files); 177 eina_future_then(f, &_done_cb, &main_files, NULL);
178 178
179 ecore_main_loop_begin(); 179 ecore_main_loop_begin();
180 180
@@ -183,7 +183,7 @@ _test_ls(Eina_Future *(*func)(const Eo *obj, const char *path, Eina_Bool recursi
183 183
184 f = func(job, test_dirname, EINA_TRUE, &main_files, _progress_cb, NULL); 184 f = func(job, test_dirname, EINA_TRUE, &main_files, _progress_cb, NULL);
185 test_count = expected_test_count + 4; 185 test_count = expected_test_count + 4;
186 eina_future_then(f, &_done_cb, &main_files); 186 eina_future_then(f, &_done_cb, &main_files, NULL);
187 187
188 ecore_main_loop_begin(); 188 ecore_main_loop_begin();
189 189
@@ -214,12 +214,12 @@ EFL_START_TEST(efl_io_manager_test_stat)
214 214
215 // Start testing 215 // Start testing
216 f = efl_io_manager_stat(job, nested_dirname); 216 f = efl_io_manager_stat(job, nested_dirname);
217 eina_future_then(f, _stat_done_cb, &is_dir); 217 eina_future_then(f, _stat_done_cb, &is_dir, NULL);
218 ecore_main_loop_begin(); 218 ecore_main_loop_begin();
219 219
220 is_dir = EINA_FALSE; 220 is_dir = EINA_FALSE;
221 f = efl_io_manager_stat(job, nested_filename); 221 f = efl_io_manager_stat(job, nested_filename);
222 eina_future_then(f, _stat_done_cb, &is_dir); 222 eina_future_then(f, _stat_done_cb, &is_dir, NULL);
223 ecore_main_loop_begin(); 223 ecore_main_loop_begin();
224 224
225 // Cleanup 225 // Cleanup
@@ -256,7 +256,7 @@ EFL_START_TEST(efl_io_manager_test_ls)
256 256
257 f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL); 257 f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL);
258 test_count = 6; 258 test_count = 6;
259 eina_future_then(f, _future_cb, &main_files); 259 eina_future_then(f, _future_cb, &main_files, NULL);
260 260
261 ecore_main_loop_begin(); 261 ecore_main_loop_begin();
262 262
@@ -299,7 +299,7 @@ EFL_START_TEST(efl_io_manager_test_open)
299 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get()); 299 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
300 300
301 f = efl_io_manager_open(job, nested_filename, EINA_FALSE); 301 f = efl_io_manager_open(job, nested_filename, EINA_FALSE);
302 eina_future_then(f, _open_done_cb, &opened_file); 302 eina_future_then(f, _open_done_cb, &opened_file, NULL);
303 ecore_main_loop_begin(); 303 ecore_main_loop_begin();
304 304
305 fail_if(!opened_file); 305 fail_if(!opened_file);
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 2d88548239..e0aae0d938 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -149,7 +149,7 @@ EFL_START_TEST(eio_test_job_xattr_set)
149 fail_if(num_of_attr != 0); // test asynchronous 149 fail_if(num_of_attr != 0); // test asynchronous
150 } 150 }
151 eina_future_then(eina_future_all_array(futures), 151 eina_future_then(eina_future_all_array(futures),
152 _future_all_cb, &num_of_attr); 152 _future_all_cb, &num_of_attr, NULL);
153 153
154 ecore_main_loop_begin(); 154 ecore_main_loop_begin();
155 155
@@ -166,14 +166,14 @@ EFL_START_TEST(eio_test_job_xattr_set)
166 } 166 }
167 167
168 eina_future_then(eina_future_all_array(futures), 168 eina_future_then(eina_future_all_array(futures),
169 _future_done_cb, &num_of_attr); 169 _future_done_cb, &num_of_attr, NULL);
170 170
171 ecore_main_loop_begin(); 171 ecore_main_loop_begin();
172 172
173 num_of_attr = 0; 173 num_of_attr = 0;
174 174
175 eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL), 175 eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL),
176 _future_done_cb, &num_of_attr); 176 _future_done_cb, &num_of_attr, NULL);
177 177
178 fail_if(num_of_attr != 0); 178 fail_if(num_of_attr != 0);
179 179