[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17356 - gnunet/src/datacache
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17356 - gnunet/src/datacache |
Date: |
Mon, 10 Oct 2011 16:00:34 +0200 |
Author: grothoff
Date: 2011-10-10 16:00:34 +0200 (Mon, 10 Oct 2011)
New Revision: 17356
Modified:
gnunet/src/datacache/datacache.c
Log:
use LOG macro in datacache.c
Modified: gnunet/src/datacache/datacache.c
===================================================================
--- gnunet/src/datacache/datacache.c 2011-10-10 13:58:43 UTC (rev 17355)
+++ gnunet/src/datacache/datacache.c 2011-10-10 14:00:34 UTC (rev 17356)
@@ -29,6 +29,8 @@
#include "gnunet_statistics_service.h"
#include "gnunet_datacache_plugin.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "datacache", __VA_ARGS__)
+
/**
* Internal state of the datacache library.
*/
@@ -130,17 +132,16 @@
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", "a))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No `%s' specified for `%s' in configuration!\n"), "QUOTA",
- section);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("No `%s' specified for `%s' in configuration!\n"), "QUOTA",
section);
return NULL;
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, section, "DATABASE", &name))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No `%s' specified for `%s' in configuration!\n"),
"DATABASE",
- section);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("No `%s' specified for `%s' in configuration!\n"), "DATABASE",
+ section);
return NULL;
}
bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
@@ -164,16 +165,15 @@
ret->env.cls = ret;
ret->env.delete_notify = &env_delete_notify;
ret->env.quota = quota;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading `%s' datacache plugin\n"),
- name);
+ LOG (GNUNET_ERROR_TYPE_INFO, _("Loading `%s' datacache plugin\n"), name);
GNUNET_asprintf (&libname, "libgnunet_plugin_datacache_%s", name);
ret->short_name = name;
ret->lib_name = libname;
ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
if (ret->api == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load datacache plugin for `%s'\n"), name);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to load datacache plugin for `%s'\n"), name);
GNUNET_DATACACHE_destroy (ret);
return NULL;
}
@@ -199,8 +199,8 @@
if (h->bloom_name != NULL)
{
if (0 != UNLINK (h->bloom_name))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
- h->bloom_name);
+ GNUNET_log_from_strerror_file (GNUNET_ERROR_TYPE_WARNING, "datacache",
+ "unlink", h->bloom_name);
GNUNET_free (h->bloom_name);
}
GNUNET_STATISTICS_destroy (h->stats, GNUNET_NO);
@@ -237,7 +237,7 @@
GNUNET_NO);
GNUNET_CONTAINER_bloomfilter_add (h->filter, key);
while (h->utilization + used > h->env.quota)
- GNUNET_assert (GNUNET_OK == h->api->del (h->api->cls));
+ GNUNET_assert (GNUNET_OK == h->api->del (h->api->cls));
h->utilization += used;
return GNUNET_OK;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17356 - gnunet/src/datacache,
gnunet <=