small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()

4 files changed, 6 insertions, 17 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index f3e49a74..b011d7ca 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -45,11 +45,10 @@ gnunet_fs_gtk_LDADD = \
 gnunet_fs_gtk_LDFLAGS = \
   -export-dynamic
 
-pkgcfgdir= $(prefix)/share/gnunet-gtk/config.d/
+pkgcfgdir= $(prefix)/share/gnunet/config.d/
 
 pkgcfg_DATA = \
   gnunet-fs-gtk.conf
 
 EXTRA_DIST = metatypes.c \
  $(pkgcfg_DATA)
-
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 054fc7bc..58db7609 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -233,11 +233,9 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
  * Task run on shutdown.
  *
  * @param cls NULL
- * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   struct SearchLookup *sl;
   struct PseuLookupContext *lctx;
@@ -678,11 +676,9 @@ handle_sks_zone_identity (void *cls,
  * is initialized.  Initializes up GTK and Glade.
  *
  * @param cls handle to the main loop (`struct GNUNET_GTK_MainLoop`)
- * @param tc scheduler context, unused
  */
 static void
-run (void *cls,
-     const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
 {
   unsigned long long dl_parallel;
   unsigned long long req_parallel;
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 37339c30..3a2273d5 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -84,11 +84,9 @@ abort_search_lookup (struct SearchLookup *sl)
  * the GNS namespace times out.
  *
  * @param cls the 'struct SearchLookup'
- * @param tc scheduler context
  */
 static void
-timeout_search_lookup (void *cls,
-                       const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_search_lookup (void *cls)
 {
   struct SearchLookup *sl = cls;
 
@@ -302,11 +300,9 @@ main_window_search_entry_key_press_event_cb (GtkWidget * widget,
  * Asynchronously clean up PseuLookupContext.
  *
  * @param cls the `struct PseuLookupContext` to clean up.
- * @param tc scheduler context
  */
 static void
-end_pseu_lookup (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_pseu_lookup (void *cls)
 {
   struct PseuLookupContext *lctx = cls;
 
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index a171f32c..450083d7 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1457,11 +1457,9 @@ add_share_items_to_treestore (struct AddDirClientContext *adcc,
  * in a separate task).
  *
  * @param cls  progress dialog context of our window
- * @param tc scheduler context, unused
  */
 static void
-stop_scanner_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop_scanner_task (void *cls)
 {
   struct AddDirClientContext *adcc = cls;