[gnunet] branch master updated (720a8b7aa -> 9ba5f9315)

[gnunet]

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

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 720a8b7aa meson: same build order as autotools
     new 43e559556 REST: Fix warnings with new daemon macro API
     new 9ba5f9315 CONVERSATION: Fix warning for incorrect enum usage

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../service/conversation/conversation_api_call.c   |  2 +-
 src/include/gnunet_program_lib.h                   |  2 +-
 src/service/rest/gnunet-rest-server.c              | 30 ++++++++++++++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/contrib/service/conversation/conversation_api_call.c 
b/src/contrib/service/conversation/conversation_api_call.c
index 2650eb782..cd59678d9 100644
--- a/src/contrib/service/conversation/conversation_api_call.c
+++ b/src/contrib/service/conversation/conversation_api_call.c
@@ -627,7 +627,7 @@ GNUNET_CONVERSATION_call_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg,
   call->gns_lookup = GNUNET_GNS_lookup_with_tld (call->gns,
                                                  call->callee,
                                                  GNUNET_GNSRECORD_TYPE_PHONE,
-                                                 GNUNET_NO,
+                                                 GNUNET_GNS_LO_DEFAULT,
                                                  &handle_gns_response,
                                                  call);
   if (NULL == call->gns_lookup)
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index b50838755..f06d95422 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -139,7 +139,7 @@ GNUNET_DAEMON_register (const char *daemon_name,
           }; \
           if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, \
                                                          &argv)) \
-          return 2; \
+            return 2; \
           ret =  GNUNET_PROGRAM_run (argc, \
                                      argv, \
                                      daemon_name, \
diff --git a/src/service/rest/gnunet-rest-server.c 
b/src/service/rest/gnunet-rest-server.c
index c4b59de96..d71f8d352 100644
--- a/src/service/rest/gnunet-rest-server.c
+++ b/src/service/rest/gnunet-rest-server.c
@@ -1146,8 +1146,9 @@ setup_plugin (const char *name,
  */
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_SERVICE_Handle *service)
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static const char *err_page = "{}";
   char *addr_str;
@@ -1383,39 +1384,48 @@ run (void *cls,
   /* Load plugins */
   // FIXME: Use per-plugin rest plugin structs
   struct GNUNET_REST_Plugin *config_plugin = REST_config_init (cfg);
-  if (GNUNET_OK != setup_plugin (config_plugin->name, 
&REST_config_process_request, config_plugin))
+  if (GNUNET_OK != setup_plugin (config_plugin->name,
+                                 &REST_config_process_request, config_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
   struct GNUNET_REST_Plugin *copying_plugin = REST_copying_init (cfg);
-  if (GNUNET_OK != setup_plugin (copying_plugin->name, 
&REST_copying_process_request, copying_plugin))
+  if (GNUNET_OK != setup_plugin (copying_plugin->name,
+                                 &REST_copying_process_request, 
copying_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
   struct GNUNET_REST_Plugin *identity_plugin = REST_identity_init (cfg);
-  if (GNUNET_OK != setup_plugin (identity_plugin->name, 
&REST_identity_process_request, identity_plugin))
+  if (GNUNET_OK != setup_plugin (identity_plugin->name,
+                                 &REST_identity_process_request,
+                                 identity_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
   struct GNUNET_REST_Plugin *namestore_plugin = REST_namestore_init (cfg);
-  if (GNUNET_OK != setup_plugin (namestore_plugin->name, 
&REST_namestore_process_request, namestore_plugin))
+  if (GNUNET_OK != setup_plugin (namestore_plugin->name,
+                                 &REST_namestore_process_request,
+                                 namestore_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
   struct GNUNET_REST_Plugin *gns_plugin = REST_gns_init (cfg);
-  if (GNUNET_OK != setup_plugin (gns_plugin->name, &REST_gns_process_request, 
gns_plugin))
+  if (GNUNET_OK != setup_plugin (gns_plugin->name, &REST_gns_process_request,
+                                 gns_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
 #if HAVE_JOSE
   struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg);
-  if (GNUNET_OK != setup_plugin (openid_plugin->name, 
&REST_openid_process_request, openid_plugin))
+  if (GNUNET_OK != setup_plugin (openid_plugin->name,
+                                 &REST_openid_process_request, openid_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
 #endif
   struct GNUNET_REST_Plugin *reclaim_plugin = REST_reclaim_init (cfg);
-  if (GNUNET_OK != setup_plugin (reclaim_plugin->name, 
&REST_reclaim_process_request, reclaim_plugin))
+  if (GNUNET_OK != setup_plugin (reclaim_plugin->name,
+                                 &REST_reclaim_process_request, 
reclaim_plugin))
   {
     GNUNET_SCHEDULER_shutdown ();
   }
@@ -1423,6 +1433,6 @@ run (void *cls,
 }
 
 
-GNUNET_DAEMON_MAIN("rest", _("GNUnet REST service"), &run)
+GNUNET_DAEMON_MAIN ("rest", _ ("GNUnet REST service"), &run)
 
 /* end of gnunet-rest-server.c */

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.