[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36820 - in gnunet-dbus/src: lib/common lib/gnsrecord servi
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36820 - in gnunet-dbus/src: lib/common lib/gnsrecord services |
|
Date: |
Sun, 17 Jan 2016 08:45:44 +0100 |
Author: canndrew
Date: 2016-01-17 08:45:44 +0100 (Sun, 17 Jan 2016)
New Revision: 36820
Modified:
gnunet-dbus/src/lib/common/gnunet_dbus_lib_arg.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_client.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_message.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_method.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_method_context.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_object.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_object_path.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_push.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c
gnunet-dbus/src/lib/common/gnunet_dbus_lib_signal.c
gnunet-dbus/src/lib/common/timeout.c
gnunet-dbus/src/lib/common/watch.c
gnunet-dbus/src/lib/gnsrecord/gnunet_gnsrecord_dbus_lib.c
gnunet-dbus/src/services/gnunet-service-dht-dbus.c
gnunet-dbus/src/services/gnunet-service-gns-dbus.c
gnunet-dbus/src/services/gnunet-service-namecache-dbus.c
Log:
Get building again with latest GNUnet
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_arg.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_arg.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_arg.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -40,7 +40,7 @@
if (arg->ref_count == 0)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference arg with ref count
0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(arg->ref_count))
{
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_client.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_client.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_client.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -45,7 +45,7 @@
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unref client with ref count 0\n");
LOG (GNUNET_ERROR_TYPE_ERROR, " unique_name == %s\n",
client->unique_name);
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
if (0 == --(client->ref_count))
@@ -112,7 +112,7 @@
if (return_callback)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Method calls on external objects not
implemented yet.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
return ret;
}
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -52,7 +52,7 @@
if (interface->ref_count == 0)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference interface with ref
count 0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(interface->ref_count))
{
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_message.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_message.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_message.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -17,7 +17,7 @@
if (! succ || -1 == id)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_message_allocate_data_slot failed.
id == %lld\n", (long long)id);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
};
@@ -41,7 +41,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_message_set_data failed. id ==
%lld\n", (long long)id);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
};
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_method.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_method.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_method.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -50,7 +50,7 @@
if (method->ref_count == 0)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference method with ref count
0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(method->ref_count))
{
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_method_context.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_method_context.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_method_context.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -49,7 +49,7 @@
if (0 == mc->ref_count)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference method context with
ref count 0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(mc->ref_count))
{
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_object.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_object.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_object.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -54,7 +54,7 @@
if (object->ref_count == 0)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference object with ref count
0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(object->ref_count))
{
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_object_path.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_object_path.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_object_path.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -61,7 +61,7 @@
/* This will probably segfault, but oh well */
char *path_as_str = GNUNET_DBUS_object_path_to_string (path);
LOG (GNUNET_ERROR_TYPE_ERROR, " path == %s\n", path_as_str);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --(path->ref_count))
{
@@ -114,7 +114,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_message_get_path_decomposed
failed.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
struct GNUNET_DBUS_ObjectPath *object_path = GNUNET_new (struct
GNUNET_DBUS_ObjectPath);
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_push.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_push.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_push.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -23,7 +23,7 @@
if (! success)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Ran out of memory in
dbus_message_iter_append_basic\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
}
@@ -172,7 +172,7 @@
if (! success)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Ran out of memory in
dbus_message_iter_open_container\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
}
@@ -229,7 +229,7 @@
if (! success)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Ran out of memory in
dbus_message_iter_close_container\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
}
@@ -289,7 +289,7 @@
if (! success)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Ran out of memory in
dbus_message_iter_push_fixed_array\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
GNUNET_DBUS_push_close_array (message, iter, &iter_sub);
}
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_service.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -63,7 +63,7 @@
if (! succ || -1 == id)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_allocate_data_slot
failed. id == %lld\n", (long long)id);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
};
@@ -113,7 +113,7 @@
if (NULL == wi)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Asked to remove watch that has not been
added\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
struct Watch *w = wi->w;
@@ -143,7 +143,7 @@
if (NULL == wi)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Asked to toggle watch that has not been
added\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
struct Watch *w = wi->w;
@@ -238,7 +238,7 @@
break;
case DBUS_DISPATCH_NEED_MEMORY:
LOG (GNUNET_ERROR_TYPE_ERROR, "Out of memory!\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
break;
default:
LOG (GNUNET_ERROR_TYPE_ERROR, "Unrecognized dispatch status\n");
@@ -345,7 +345,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Ran out of memory in
dbus_message_get_path_decomposed.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
struct GNUNET_DBUS_Object *object = service->root_object;
@@ -452,7 +452,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_set_data returned
false. Out of memory.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
succ = dbus_connection_set_watch_functions (service->dbus_connection,
watch_add, watch_remove, watch_toggle, service, NULL);
@@ -459,7 +459,7 @@
if(! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_set_watch_functions
returned false. Out of memory.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
dbus_connection_set_dispatch_status_function (service->dbus_connection,
dispatch_status_changed, service, NULL);
@@ -469,7 +469,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_set_timeout_functions
returned false. Out of memory.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
DBusObjectPathVTable vtable;
@@ -531,7 +531,7 @@
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unref service with ref count 0\n");
LOG (GNUNET_ERROR_TYPE_ERROR, " well_known_name == %s\n",
service->well_known_name);
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
if (0 == --(service->ref_count))
@@ -642,7 +642,7 @@
if (! obj_it)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to remove object that has not been
added.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
GNUNET_CONTAINER_DLL_remove (
@@ -664,7 +664,7 @@
if (! succ)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "dbus_connection_send failed. Out of
memory.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
};
Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_signal.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_signal.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_signal.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -48,7 +48,7 @@
if (signal->ref_count == 0)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unreference signal with ref count
0.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
}
if (0 == --(signal->ref_count))
{
Modified: gnunet-dbus/src/lib/common/timeout.c
===================================================================
--- gnunet-dbus/src/lib/common/timeout.c 2016-01-17 00:00:54 UTC (rev
36819)
+++ gnunet-dbus/src/lib/common/timeout.c 2016-01-17 07:45:44 UTC (rev
36820)
@@ -14,7 +14,7 @@
bool scheduled;
- GNUNET_SCHEDULER_TaskIdentifier task;
+ struct GNUNET_SCHEDULER_Task *task;
unsigned ref_count;
};
@@ -46,7 +46,7 @@
if (0 == t->ref_count)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unref timeout with ref_count ==
0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --t->ref_count)
Modified: gnunet-dbus/src/lib/common/watch.c
===================================================================
--- gnunet-dbus/src/lib/common/watch.c 2016-01-17 00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/common/watch.c 2016-01-17 07:45:44 UTC (rev 36820)
@@ -27,7 +27,7 @@
* The task that is watching our file descriptor.
* Only valid if scheduled is true.
*/
- GNUNET_SCHEDULER_TaskIdentifier task;
+ struct GNUNET_SCHEDULER_Task *task;
struct GNUNET_NETWORK_Handle *net_handle;
struct GNUNET_DISK_FileHandle *file_handle;
@@ -54,7 +54,7 @@
if (NULL == w->net_handle)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to box network socket passed in
from dbus.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
}
else {
@@ -65,7 +65,7 @@
if (NULL == w->file_handle)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to box file handle passed in
from dbus.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
};
};
@@ -73,7 +73,7 @@
if (! w->net_handle && ! w->file_handle)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create watch.
dbus_watch_get_socket returned %d\n", (int)sock);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
return w;
@@ -93,7 +93,7 @@
if (0 == w->ref_count)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Tried to unref watch with ref_count ==
0\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
if (0 == --w->ref_count)
@@ -190,7 +190,7 @@
};
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to schedule watch.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
/*
Modified: gnunet-dbus/src/lib/gnsrecord/gnunet_gnsrecord_dbus_lib.c
===================================================================
--- gnunet-dbus/src/lib/gnsrecord/gnunet_gnsrecord_dbus_lib.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/lib/gnsrecord/gnunet_gnsrecord_dbus_lib.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -3,6 +3,7 @@
#include <gnunet/platform.h>
#include <gnunet/gnunet_common.h>
#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_time_lib.h>
#include <gnunet/gnunet_gnsrecord_lib.h>
#include "gnunet_dbus_lib.h"
@@ -12,7 +13,6 @@
{
static const struct GNUNET_DBUS_StringEnumPair options[] = {
{ "private", GNUNET_GNSRECORD_RF_PRIVATE },
- { "pending", GNUNET_GNSRECORD_RF_PENDING },
{ "relative_expiration", GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION },
{ "shadow_record", GNUNET_GNSRECORD_RF_SHADOW_RECORD },
{ NULL, 0 }
Modified: gnunet-dbus/src/services/gnunet-service-dht-dbus.c
===================================================================
--- gnunet-dbus/src/services/gnunet-service-dht-dbus.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/services/gnunet-service-dht-dbus.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -461,7 +461,7 @@
if (! gbl_dht_service)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create dht service.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
GNUNET_DBUS_service_set_client_handlers (gbl_dht_service,
client_connects,
Modified: gnunet-dbus/src/services/gnunet-service-gns-dbus.c
===================================================================
--- gnunet-dbus/src/services/gnunet-service-gns-dbus.c 2016-01-17 00:00:54 UTC
(rev 36819)
+++ gnunet-dbus/src/services/gnunet-service-gns-dbus.c 2016-01-17 07:45:44 UTC
(rev 36820)
@@ -135,7 +135,7 @@
if (! gns_service)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create gns service.\n");
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
GNUNET_DBUS_service_set_client_handlers (gns_service, client_connects,
client_disconnects);
Modified: gnunet-dbus/src/services/gnunet-service-namecache-dbus.c
===================================================================
--- gnunet-dbus/src/services/gnunet-service-namecache-dbus.c 2016-01-17
00:00:54 UTC (rev 36819)
+++ gnunet-dbus/src/services/gnunet-service-namecache-dbus.c 2016-01-17
07:45:44 UTC (rev 36820)
@@ -99,7 +99,7 @@
if (GNUNET_OK != err)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to add /namecache object.
GNUNET_DBUS_service_add_object returned %d\n", err);
- GNUNET_abort ();
+ GNUNET_abort_ ();
};
struct GNUNET_DBUS_Interface *namecache_interface =
GNUNET_DBUS_interface_create ("gnu.gnunet.namecache");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36820 - in gnunet-dbus/src: lib/common lib/gnsrecord services,
gnunet <=