xxx - fix eina_future_then calls to pass sotrage val - fix warns

11 files changed, 27 insertions, 27 deletions

diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 3c2ca6b7a4..e18bed43a7 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -415,7 +415,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
      }
 
    job = eina_future_then(efl_loop_job(efl_main_loop_get()),
-                          _efl_loop_arguments_send, arga);
+                          _efl_loop_arguments_send, arga, NULL);
    efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
 }
 
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c
index 5fd6924668..98dbbe5bb1 100644
--- a/src/lib/ecore/efl_model_composite_boolean.c
+++ b/src/lib/ecore/efl_model_composite_boolean.c
@@ -297,8 +297,8 @@ _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj,
    req->parent = efl_ref(obj);
    req->start = start;
 
-   return efl_future_Eina_FutureXXX_then(obj,
-                                         eina_future_then(f, _efl_model_composite_boolean_then, req));
+   return efl_future_Eina_FutureXXX_then
+     (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
 }
 
 #include "efl_model_composite_boolean.eo.c"
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index 914a45f90a..14a54cb6fd 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -131,8 +131,8 @@ _check_child_change(Efl_Model *child, Eina_Bool value)
    else
      {
         r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value));
-        r = eina_future_then(r, _commit_change, child);
-        r = eina_future_then(r, _clear_child, child);
+        r = eina_future_then(r, _commit_change, child, NULL);
+        r = eina_future_then(r, _clear_child, child, NULL);
      }
 
    return r;
@@ -218,9 +218,9 @@ _efl_model_composite_selection_efl_model_property_set(Eo *obj,
         if (!success)
           return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
 
-        return efl_future_Eina_FutureXXX_then(obj,
-                                              eina_future_then(efl_model_children_slice_get(obj, l, 1),
-                                                               _select_slice_then, obj));
+        return efl_future_Eina_FutureXXX_then
+          (obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
+                                 _select_slice_then, obj, NULL));
      }
 
    return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value);
@@ -281,7 +281,7 @@ _untangle_array(void *data,
                                    "selected", eina_value_bool_new(EINA_FALSE));
         // Once this is done, we need to repropagate the error
         eina_value_error_get(&v, error);
-        f = eina_future_then(f, _regenerate_error, error);
+        f = eina_future_then(f, _regenerate_error, error, NULL);
 
         return eina_future_as_value(f);
      }
@@ -380,14 +380,14 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
              // There was, need to unselect the previous one along setting the new value
              chain = eina_future_all(chain,
                                      eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1),
-                                                      _unselect_slice_then, NULL));
+                                                      _unselect_slice_then, NULL, NULL));
 
-             chain = eina_future_then(chain, _untangle_array, obj);
+             chain = eina_future_then(chain, _untangle_array, obj, NULL);
           }
      }
 
  commit_change:
-   chain = eina_future_then(chain, _commit_change, obj);
+   chain = eina_future_then(chain, _commit_change, obj, NULL);
 
    return efl_future_Eina_FutureXXX_then(obj, chain);
 }
@@ -448,7 +448,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
    // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here
    f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS),
                                     start, count);
-   f = eina_future_then(f, _slice_get, req);
+   f = eina_future_then(f, _slice_get, req, NULL);
 
    return efl_future_Eina_FutureXXX_then(obj, f);
 }
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index d771581e06..b9adbe8e4d 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -686,7 +686,7 @@ eina_future_as_value(Eina_Future *f)
    EINA_FUTURE_CHECK_RETURN_VAL(f, v);
    p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL);
    EINA_SAFETY_ON_NULL_GOTO(p, err_promise);
-   r_future = eina_future_then(f, _future_proxy, p);
+   r_future = eina_future_then(f, _future_proxy, p, NULL);
    //If eina_future_then() fails f will be cancelled
    EINA_SAFETY_ON_NULL_GOTO(r_future, err_future);
 
@@ -1305,7 +1305,7 @@ promise_proxy_of_future_array_create(Eina_Future *array[],
 
    for (i = 0; i < ctx->futures_len; i++)
      {
-        ctx->futures[i] = eina_future_then(array[i], future_cb, ctx);
+        ctx->futures[i] = eina_future_then(array[i], future_cb, ctx, NULL);
         //Futures will be cancelled by the caller...
         EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then);
      }
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 3b3c2bea3d..62e52f46dd 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -455,7 +455,7 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
    if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004)
      {
         Eina_Future *f = eina_future_then(_build_delay(pd->loop),
-                                          _eio_build_mime_now, model);
+                                          _eio_build_mime_now, model, NULL);
         return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f));
      }
 
@@ -484,7 +484,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
    efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop);
 
    f = efl_loop_job(pd->loop);
-   f = eina_future_then(f, _eio_build_mime_now, model);
+   f = eina_future_then(f, _eio_build_mime_now, model, NULL);
    pd->request.mime = efl_future_Eina_FutureXXX_then(model, f);
 }
 
@@ -808,7 +808,7 @@ _eio_model_efl_model_children_count_get(const Eo *obj, Eio_Model_Data *pd)
 
         f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
                                      (void*) obj, _eio_model_children_list, NULL);
-        f = eina_future_then(f, _eio_model_children_list_on, pd);
+        f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
         pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
      }
 
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 515f49c8ac..e76ce05067 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -997,7 +997,7 @@ _efl_ui_list_view_efl_ui_list_view_model_load_range_set(Eo* obj, Efl_Ui_List_Vie
    if (efl_model_children_count_get(pd->model))
      {
         Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
-        f = eina_future_then(f, _children_slice_then, pd);
+        f = eina_future_then(f, _children_slice_then, pd, NULL);
         pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f);
      }
 }
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.c b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
index e192d7a9bc..3beac4d468 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.c
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
@@ -245,7 +245,7 @@ _child_added_cb(void *data, const Efl_Event *event)
    r->pd = pd;
 
    f = efl_model_children_slice_get(pd->model, evt->index, 1);
-   f = eina_future_then(f, _children_get, r);
+   f = eina_future_then(f, _children_get, r, NULL);
 }
 
 static void
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 25c2787876..21d2c032de 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -738,7 +738,7 @@ _scroll_wheel_post_event_go(Efl_Ui_Scroll_Manager_Data *sd, int x, int y)
         Eina_Future *f;
 
         f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
-                             _scroll_wheel_post_event_job, sd);
+                             _scroll_wheel_post_event_job, sd, NULL);
         efl_future_Eina_FutureXXX_then(sd->obj, f);
      }
    else
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1cbb41cea8..274dcd87bd 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1031,7 +1031,7 @@ _populate(Evas_Object *obj,
    if (efl_model_children_count_get(model))
      {
         future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
-        future = eina_future_then(future, _process_children_cb, lreq);
+        future = eina_future_then(future, _process_children_cb, lreq, NULL);
         efl_future_Eina_FutureXXX_then(obj, future);
      }
    else
@@ -1498,7 +1498,7 @@ _on_text_activated(void *data, const Efl_Event *event)
    efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
    efl_key_ref_set(fs, _text_activated_model_key, model);
    efl_ref(fs);
-   eina_future_then(future, _on_text_activated_set_path_then, fs);
+   eina_future_then(future, _on_text_activated_set_path_then, fs, NULL);
 
    elm_object_focus_set(event->object, EINA_FALSE);
 }
@@ -1687,7 +1687,7 @@ _resource_created(void *data, const Efl_Event *event)
      return;
 
    f = efl_model_children_slice_get(sd->model, evt->index, 1);
-   f = eina_future_then(f, _resource_created_then, fs);
+   f = eina_future_then(f, _resource_created_then, fs, NULL);
    efl_future_Eina_FutureXXX_then(fs, f);
 }
 
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index f5fc08361d..022e03ef7a 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2004,7 +2004,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
         Eina_Future *f;
 
         f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
-                             _scroll_wheel_post_event_job, sid);
+                             _scroll_wheel_post_event_job, sid, NULL);
         efl_future_Eina_FutureXXX_then(sid->obj, f);
      }
    else
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 4360fa1d20..709c1fdfe8 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -284,7 +284,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
 
    f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
                                     efl_model_children_count_get(pdata->priv->connect.model));
-   f = eina_future_then(f, _efl_model_load_children_then, pdata);
+   f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
    efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f);
 }
 
@@ -317,7 +317,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
    Eina_Future *f;
 
    f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
-   f = eina_future_then(f, _efl_model_load_children_then, idata);
+   f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
    efl_future_Eina_FutureXXX_then(idata->priv->genlist, f);
 }