[GNUnet-SVN] [gnunet] branch master updated: fix ftbfs:

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new a31cd7347 fix ftbfs:
a31cd7347 is described below

commit a31cd73472ac1b4c899a6e1d7e53851c20677f7d
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Jun 19 14:42:41 2019 +0200

    fix ftbfs:
---
 src/curl/curl.c            | 10 +++++-----
 src/curl/curl_reschedule.c | 29 +++++++++++------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/curl/curl.c b/src/curl/curl.c
index a45d0a154..38a1f5fcd 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -430,10 +430,10 @@ GNUNET_CURL_job_cancel (struct GNUNET_CURL_Job *job)
  *              the JSON we received was malformed).
  * @return NULL if downloading a JSON reply failed.
  */
-static void *
-download_get_result (struct GNUNET_CURL_DownloadBuffer *db,
-                     CURL *eh,
-                     long *response_code)
+void *
+GNUNET_CURL_download_get_result_ (struct GNUNET_CURL_DownloadBuffer *db,
+                                  CURL *eh,
+                                  long *response_code)
 {
   json_t *json;
   json_error_t error;
@@ -622,7 +622,7 @@ void
 GNUNET_CURL_perform (struct GNUNET_CURL_Context *ctx)
 {
   GNUNET_CURL_perform2 (ctx,
-                        &download_get_result,
+                        &GNUNET_CURL_download_get_result_,
                         (GNUNET_CURL_ResponseCleaner) &json_decref);
 }
 
diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c
index 1b0f2e440..354ba13df 100644
--- a/src/curl/curl_reschedule.c
+++ b/src/curl/curl_reschedule.c
@@ -28,9 +28,9 @@
 #include "gnunet_util_lib.h"
 
 extern void *
-download_get_result (struct GNUNET_CURL_DownloadBuffer *db,
-                     CURL *eh,
-                     long *response_code);
+GNUNET_CURL_download_get_result_ (struct GNUNET_CURL_DownloadBuffer *db,
+                                  CURL *eh,
+                                  long *response_code);
 
 /**
  * Closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
@@ -105,7 +105,7 @@ GNUNET_CURL_gnunet_rc_create (struct GNUNET_CURL_Context 
*ctx)
 
   rc = GNUNET_new (struct GNUNET_CURL_RescheduleContext);
   rc->ctx = ctx;
-  rc->parser = &download_get_result;
+  rc->parser = &GNUNET_CURL_download_get_result_;
   rc->cleaner = &clean_result;
   return rc;
 }
@@ -145,9 +145,7 @@ context_task (void *cls)
 
   rc->task = NULL;
 
-  GNUNET_CURL_perform2 (rc->ctx,
-                        rc->parser,
-                        rc->cleaner);
+  GNUNET_CURL_perform2 (rc->ctx, rc->parser, rc->cleaner);
   max_fd = -1;
   timeout = -1;
   FD_ZERO (&read_fd_set);
@@ -160,18 +158,14 @@ context_task (void *cls)
                                &max_fd,
                                &timeout);
   if (timeout >= 0)
-    delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                           timeout);
+    delay =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, timeout);
   else
     delay = GNUNET_TIME_UNIT_FOREVER_REL;
   rs = GNUNET_NETWORK_fdset_create ();
-  GNUNET_NETWORK_fdset_copy_native (rs,
-                                    &read_fd_set,
-                                    max_fd + 1);
+  GNUNET_NETWORK_fdset_copy_native (rs, &read_fd_set, max_fd + 1);
   ws = GNUNET_NETWORK_fdset_create ();
-  GNUNET_NETWORK_fdset_copy_native (ws,
-                                    &write_fd_set,
-                                    max_fd + 1);
+  GNUNET_NETWORK_fdset_copy_native (ws, &write_fd_set, max_fd + 1);
   if (NULL == rc->task)
     rc->task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
                                             delay,
@@ -196,12 +190,11 @@ context_task (void *cls)
 void
 GNUNET_CURL_gnunet_scheduler_reschedule (void *cls)
 {
-  struct GNUNET_CURL_RescheduleContext *rc = *(void**) cls;
+  struct GNUNET_CURL_RescheduleContext *rc = *(void **) cls;
 
   if (NULL != rc->task)
     GNUNET_SCHEDULER_cancel (rc->task);
-  rc->task = GNUNET_SCHEDULER_add_now (&context_task,
-                                       rc);
+  rc->task = GNUNET_SCHEDULER_add_now (&context_task, rc);
 }
 
 /* end of curl_reschedule.c */

-- 
To stop receiving notification emails like this one, please contact
address@hidden.