[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7085 - in GNUnet: libltdl src/applications/advertising src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7085 - in GNUnet: libltdl src/applications/advertising src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/lib src/applications/fs/namespace src/applications/fs/tools src/applications/fs/uritrack src/applications/identity src/applications/rpc src/applications/sqstore_mysql src/applications/state src/applications/testing src/applications/transport src/include src/server src/setup src/setup/gtk src/setup/lib src/setup/ncurses src/setup/qt src/setup/text src/transports src/util/boot src/util/config src/util/containers src/util/crypto src/util/getopt src/util/loggers src/util/network src/util/network_client src/util/os src/util/pseudonym src/util/string src/util/threads |
|
Date: |
Sat, 7 Jun 2008 21:26:00 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 21:25:59 -0600 (Sat, 07 Jun 2008)
New Revision: 7085
Modified:
GNUnet/libltdl/ltdl.c
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/datastore/filter.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/service.c
GNUnet/src/applications/dht/tools/dht-query.c
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/uri.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/namespace/namespace_update_test.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/fs/uritrack/callbacks.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/applications/fs/uritrack/uri_info.c
GNUnet/src/applications/identity/hostkey.c
GNUnet/src/applications/rpc/parameters.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/state/state.c
GNUnet/src/applications/testing/remote.c
GNUnet/src/applications/testing/remotetopologies.c
GNUnet/src/applications/testing/testing.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/include/gnunet_util_common.h
GNUnet/src/include/gnunet_util_error.h
GNUnet/src/include/gnunet_util_string.h
GNUnet/src/server/connection.c
GNUnet/src/server/tcpserver.c
GNUnet/src/setup/gnunet-setup.c
GNUnet/src/setup/gtk/ngconf.c
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/gns.c
GNUnet/src/setup/lib/tree.c
GNUnet/src/setup/ncurses/mconf.c
GNUnet/src/setup/qt/qtconfig.cc
GNUnet/src/setup/text/conf.c
GNUnet/src/transports/http.c
GNUnet/src/transports/nat.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/udp.c
GNUnet/src/util/boot/startup.c
GNUnet/src/util/config/config.c
GNUnet/src/util/containers/bloomfilter.c
GNUnet/src/util/crypto/hostkey_gcrypt.c
GNUnet/src/util/getopt/getopt.c
GNUnet/src/util/getopt/printhelp.c
GNUnet/src/util/getopt/printversion.c
GNUnet/src/util/getopt/setoption.c
GNUnet/src/util/loggers/file.c
GNUnet/src/util/loggers/memory.c
GNUnet/src/util/network/io.c
GNUnet/src/util/network/ipcheck.c
GNUnet/src/util/network/select.c
GNUnet/src/util/network_client/tcpio.c
GNUnet/src/util/os/semaphore.c
GNUnet/src/util/os/user.c
GNUnet/src/util/pseudonym/info_test.c
GNUnet/src/util/string/string.c
GNUnet/src/util/string/xmalloc.c
GNUnet/src/util/threads/mutex.c
GNUnet/src/util/threads/pthread.c
GNUnet/src/util/threads/semaphore.c
Log:
fixing compile errors for gcc 4.3 -O2 -Wall -Werror
Modified: GNUnet/libltdl/ltdl.c
===================================================================
--- GNUnet/libltdl/ltdl.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/libltdl/ltdl.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -1770,9 +1770,9 @@
*) (((struct
dylib_command
*)
- lc)->dylib.
- name.offset
- +
+ lc)->
+ dylib.name.
+ offset +
(unsigned
long)
lc));
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/advertising/advertising.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -31,6 +31,7 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_protocols.h"
#include "gnunet_identity_service.h"
@@ -39,7 +40,6 @@
#include "gnunet_stats_service.h"
#include "gnunet_topology_service.h"
#include "bootstrap.h"
-#include "platform.h"
/**
* Send our hello to a random connected host on a regular basis.
@@ -513,7 +513,7 @@
GNUNET_hash_to_enc (&hi->hashPubKey, &other));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Entering `%s' with target `%s'.\n", __FUNCTION__, &other);
+ "Entering with target `%s'.\n", &other);
#endif
if (0 == memcmp (hi, coreAPI->my_identity, sizeof (GNUNET_PeerIdentity)))
return GNUNET_OK; /* never advertise to myself... */
@@ -540,38 +540,17 @@
/* establish short-lived connection, send, tear down */
hello = identity->identity2Hello (hi, proto, GNUNET_NO);
if (NULL == hello)
- {
-#if DEBUG_ADVERTISING
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Exit from `%s' (error: `%s' failed).\n", __FUNCTION__,
- "identity2Hello");
-#endif
- return GNUNET_OK;
- }
+ return GNUNET_OK;
tsession = transport->connect (hello, __FILE__, GNUNET_YES);
GNUNET_free (hello);
if (tsession == NULL)
- {
-#if DEBUG_ADVERTISING
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Exit from `%s' (%s error).\n",
- __FUNCTION__, "transportConnect");
-#endif
- return GNUNET_OK; /* could not connect */
- }
+ return GNUNET_OK; /* could not connect */
if (stats != NULL)
stats->change (stat_hello_out, 1);
coreAPI->plaintext_send (tsession,
(char *) &sd->m->header,
GNUNET_sizeof_hello (sd->m));
transport->disconnect (tsession, __FILE__);
-#if DEBUG_ADVERTISING
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Exit from %s.\n", __FUNCTION__);
-#endif
return GNUNET_OK;
}
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/advertising/bootstrap.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -80,8 +80,7 @@
#if DEBUG_BOOTSTRAP
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "%s chose hello %d of %d\n",
- __FUNCTION__, rndidx, hcq->hellosCount);
+ "Chose hello %d of %d\n", rndidx, hcq->hellosCount);
#endif
msg = (GNUNET_MessageHello *) hcq->hellos[rndidx];
hcq->hellos[rndidx] = hcq->hellos[hcq->hellosCount - 1];
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/datastore/datastore.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -389,9 +389,9 @@
stat_filter_failed =
stats->create (gettext_noop ("# bloom filter false positives"));
- stats->
- set (stats->create (gettext_noop ("# bytes allowed in datastore")),
- quota);
+ stats->set (stats->
+ create (gettext_noop ("# bytes allowed in datastore")),
+ quota);
}
state = capi->service_request ("state");
if (state != NULL)
Modified: GNUnet/src/applications/datastore/filter.c
===================================================================
--- GNUnet/src/applications/datastore/filter.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/datastore/filter.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_directories.h"
#include "gnunet_util.h"
#include "filter.h"
-#include "platform.h"
/**
* Filter.
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/dht/module/cs.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -89,12 +89,6 @@
req = (const CS_dht_request_put_MESSAGE *) message;
size = ntohs (req->header.size) - sizeof (CS_dht_request_put_MESSAGE);
GNUNET_GE_ASSERT (NULL, size < GNUNET_MAX_BUFFER_SIZE);
-#if DEBUG_CS
- GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes put '%.*s'\n",
- __FUNCTION__, __FILE__, __LINE__, size, &req[1]);
-#endif
dhtAPI->put (&req->key, ntohl (req->type), size, (const char *) &req[1]);
return GNUNET_OK;
}
@@ -120,12 +114,6 @@
msg->type = htonl (type);
msg->key = *key;
memcpy (&msg[1], value, size);
-#if DEBUG_CS
- GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes reply '%.*s'\n",
- __FUNCTION__, __FILE__, __LINE__, size, value);
-#endif
if (GNUNET_OK !=
coreAPI->cs_send_message (record->client, &msg->header, GNUNET_YES))
{
@@ -154,12 +142,6 @@
GNUNET_GE_BREAK (NULL, 0);
return GNUNET_SYSERR;
}
-#if DEBUG_CS
- GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes get\n", __FUNCTION__, __FILE__,
- __LINE__);
-#endif
get = (const CS_dht_request_get_MESSAGE *) message;
cpc = GNUNET_malloc (sizeof (struct DHT_CLIENT_GET_RECORD));
cpc->client = client;
@@ -188,13 +170,6 @@
GNUNET_GE_BREAK (NULL, 0);
return GNUNET_SYSERR;
}
-#if DEBUG_CS
- GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes get\n", __FUNCTION__, __FILE__,
- __LINE__);
-#endif
-
get = (const CS_dht_request_get_MESSAGE *) message;
GNUNET_mutex_lock (lock);
pos = getRecords;
Modified: GNUnet/src/applications/dht/module/service.c
===================================================================
--- GNUnet/src/applications/dht/module/service.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/dht/module/service.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -23,7 +23,7 @@
* @brief internal GNUnet DHT service
* @author Christian Grothoff
*/
-
+#include "platform.h"
#include "table.h"
#include "routing.h"
#include "gnunet_dht_service.h"
Modified: GNUnet/src/applications/dht/tools/dht-query.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht-query.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/dht/tools/dht-query.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -65,10 +65,9 @@
static int
printCallback (const GNUNET_HashCode * hash,
unsigned int type,
- unsigned int size, const char *data, void *cls)
+ unsigned int size, const char *data, void *unused)
{
- char *key = cls;
- printf ("%s(%s): '%.*s'\n", "get", key, size, data);
+ printf ("%s: '%.*s'\n", "get", size, data);
return GNUNET_OK;
}
@@ -123,7 +122,7 @@
{
int i;
struct GNUNET_ClientServerConnection *handle;
- void *unused;
+
i = GNUNET_init (argc,
argv,
"gnunet-dht-query",
@@ -136,7 +135,7 @@
handle = GNUNET_client_connection_create (ectx, cfg);
- ctx = GNUNET_DHT_context_create (cfg, ectx, &printCallback, unused);
+ ctx = GNUNET_DHT_context_create (cfg, ectx, &printCallback, NULL);
if (handle == NULL)
{
fprintf (stderr, _("Failed to connect to gnunetd.\n"));
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/collection/collection.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -525,9 +525,12 @@
GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
&dirData,
&dirLen,
-
collectionData->file_count,
-
collectionData->files,
-
collectionData->meta));
+ collectionData->
+ file_count,
+ collectionData->
+ files,
+ collectionData->
+ meta));
if (-1 == WRITE (fd, dirData, dirLen))
{
GNUNET_GE_LOG_STRERROR (ectx,
@@ -541,10 +544,10 @@
GNUNET_free (dirData);
CLOSE (fd);
if (GNUNET_OK != GNUNET_ECRS_file_upload (ectx, cfg, tmpName, GNUNET_NO,
/* indexing */
- ntohl (collectionData->
- data.anonymityLevel),
- ntohl (collectionData->
- data.priority),
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME, NULL,
NULL, NULL, NULL, &directoryURI))
@@ -569,10 +572,10 @@
uri = GNUNET_ECRS_namespace_add_content (ectx,
cfg,
&collectionData->data.pid,
- ntohl (collectionData->
- data.anonymityLevel),
- ntohl (collectionData->
- data.priority),
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME,
this_revision_string,
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -309,8 +309,8 @@
sizeof (unsigned
int),
&ksb->sblock,
- &ksb->
- kblock.signature));
+ &ksb->kblock.
+ signature));
/* extra check: verify sig */
GNUNET_RSA_free_key (pk);
if (GNUNET_OK != GNUNET_FS_insert (sock, knvalue))
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -896,7 +896,7 @@
ret->data.ksk.keywords = NULL; /* just to be sure */
break;
case sks:
- ret->data.sks.identifier = GNUNET_strdup(uri->data.sks.identifier);
+ ret->data.sks.identifier = GNUNET_strdup (uri->data.sks.identifier);
break;
case loc:
break;
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/fs/lib/fslib.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -373,7 +373,7 @@
ctx->total_requested++, type);
#endif
if (GNUNET_OK != GNUNET_client_connection_write (ctx->sock, &req->header))
- GNUNET_client_connection_close_temporarily(ctx->sock);
+ GNUNET_client_connection_close_temporarily (ctx->sock);
GNUNET_mutex_unlock (ctx->lock);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/namespace/namespace_update_test.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_update_test.c
2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/applications/fs/namespace/namespace_update_test.c
2008-06-08 03:25:59 UTC (rev 7085)
@@ -47,17 +47,16 @@
return GNUNET_OK;
}
-static struct GNUNET_ECRS_URI * want;
+static struct GNUNET_ECRS_URI *want;
static void *
eventProc (void *unused, const GNUNET_FSUI_Event * event)
{
if (event->type != GNUNET_FSUI_search_result)
return NULL;
- if ( (want != NULL) &&
- (GNUNET_ECRS_uri_test_equal(event->data.SearchResult.fi.uri,
- want)) )
- want = NULL; /* got the desired result! */
+ if ((want != NULL) &&
+ (GNUNET_ECRS_uri_test_equal (event->data.SearchResult.fi.uri, want)))
+ want = NULL; /* got the desired result! */
return NULL;
}
@@ -119,7 +118,7 @@
thisId = NULL;
GNUNET_NS_namespace_list_contents (ectx, cfg, &nsid, &iter, &thisId);
CHECK (0 != strcmp ("next", thisId));
- GNUNET_free(thisId);
+ GNUNET_free (thisId);
/* publish update */
furi = GNUNET_NS_add_to_namespace (ectx,
cfg,
@@ -145,10 +144,10 @@
while (--tries > 0)
{
if (want == NULL)
- break;
- GNUNET_thread_sleep(GNUNET_CRON_MILLISECONDS * 150);
+ break;
+ GNUNET_thread_sleep (GNUNET_CRON_MILLISECONDS * 150);
}
- CHECK(want == NULL);
+ CHECK (want == NULL);
CHECK (GNUNET_OK == GNUNET_NS_namespace_delete (ectx, cfg, &nsid));
/* END OF TEST CODE */
FAILURE:
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -33,10 +33,6 @@
#include "gnunet_namespace_lib.h"
#include "gnunet_util.h"
-/* hmm. Man says time.h, but that doesn't yield the
- prototype. Strange... */
-extern char *strptime (const char *s, const char *format, struct tm *tm);
-
static int errorCode;
static struct GNUNET_GC_Configuration *cfg;
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -75,9 +75,9 @@
event->data.UnindexCompleted.total,
delta / GNUNET_CRON_SECONDS,
(delta ==
- 0) ? (double) (-1.0) : (double) (event->
- data.UnindexCompleted.
- total / 1024.0 *
+ 0) ? (double) (-1.0) : (double) (event->data.
+ UnindexCompleted.total /
+ 1024.0 *
GNUNET_CRON_SECONDS /
delta));
}
Modified: GNUnet/src/applications/fs/uritrack/callbacks.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/uritrack/callbacks.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_directories.h"
#include "gnunet_util.h"
#include "gnunet_uritrack_lib.h"
-#include "platform.h"
/**
* @brief Struct for URITRACK callback.
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -27,10 +27,10 @@
* An IPC semaphore is used to guard the access.
*/
+#include "platform.h"
#include "gnunet_directories.h"
#include "gnunet_util.h"
#include "gnunet_uritrack_lib.h"
-#include "platform.h"
#include "callbacks.h"
#define DEBUG_FILE_INFO GNUNET_NO
@@ -340,7 +340,7 @@
while ((spos < ret) && (result[spos] != '\0'))
spos++;
spos++; /* skip '\0' */
- if ((spos + sizeof (int) >= ret) || (spos + sizeof (int) < spos))
+ if (spos + sizeof (int) >= ret)
{
GNUNET_GE_BREAK (ectx, 0);
goto FORMATERROR;
Modified: GNUnet/src/applications/fs/uritrack/uri_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/uri_info.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/fs/uritrack/uri_info.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -28,10 +28,10 @@
* to bound disk size of the DB and to get high performance).
*/
+#include "platform.h"
#include "gnunet_directories.h"
#include "gnunet_util.h"
#include "gnunet_uritrack_lib.h"
-#include "platform.h"
static char *
getDBName (struct GNUNET_GC_Configuration *cfg)
Modified: GNUnet/src/applications/identity/hostkey.c
===================================================================
--- GNUnet/src/applications/identity/hostkey.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/identity/hostkey.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -25,9 +25,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "hostkey.h"
#include "gnunet_directories.h"
-#include "platform.h"
#define EXTRA_CHECKS ALLOW_EXTRA_CHECKS
Modified: GNUnet/src/applications/rpc/parameters.c
===================================================================
--- GNUnet/src/applications/rpc/parameters.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/rpc/parameters.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -25,9 +25,9 @@
* @author Antti Salonen, Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_rpc_lib.h"
-#include "platform.h"
/**
* A linked list of parameters to/from an RPC call.
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/applications/rpc/rpc.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -336,9 +336,9 @@
GNUNET_mutex_unlock (lock);
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be registered:"
+ _("%s:%d - RPC %s:%p could not be registered:"
" another callback is already using this name
(%p)\n"),
- __FILE__, __FUNCTION__, name, callback,
+ __FILE__, __LINE__, name, callback,
rrpc->async_callback);
return GNUNET_SYSERR;
}
@@ -395,8 +395,8 @@
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
_
- ("%s::%s - async RPC %s:%p could not be unregistered: not
found\n"),
- __FILE__, __FUNCTION__, name, callback);
+ ("%s:%d - async RPC %s:%p could not be unregistered: not
found\n"),
+ __FILE__, __LINE__, name, callback);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -1273,8 +1273,8 @@
if (type != 0)
stmt =
(vhash !=
- NULL) ? dbh->
- count_entry_by_hash_vhash_and_type : dbh->count_entry_by_hash_and_type;
+ NULL) ? dbh->count_entry_by_hash_vhash_and_type : dbh->
+ count_entry_by_hash_and_type;
else
stmt =
(vhash !=
@@ -1416,8 +1416,8 @@
else
stmt =
(vhash !=
- NULL) ? dbh->
- select_entry_by_hash_and_vhash : dbh->select_entry_by_hash;
+ NULL) ? dbh->select_entry_by_hash_and_vhash : dbh->
+ select_entry_by_hash;
if (count == 0)
limit_off = off;
else
Modified: GNUnet/src/applications/state/state.c
===================================================================
--- GNUnet/src/applications/state/state.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/state/state.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -30,11 +30,11 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_core.h"
#include "gnunet_directories.h"
#include "gnunet_state_service.h"
-#include "platform.h"
#define STATE_DEBUG GNUNET_NO
Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/testing/remote.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -421,7 +421,8 @@
GNUNET_REMOTE_start_daemon (remote_gnunetd_path, "/tmp/",
temp, remote_config_path,
curr_host, ssh_username,
-
temp_pos->remote_friend_file_path);
+ temp_pos->
+ remote_friend_file_path);
GNUNET_GC_get_configuration_value_number (basecfg,
"NETWORK",
Modified: GNUnet/src/applications/testing/remotetopologies.c
===================================================================
--- GNUnet/src/applications/testing/remotetopologies.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/testing/remotetopologies.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -370,13 +370,15 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-
&h2->senderIdentity))
+ &h2->
+
senderIdentity))
{
ret = GNUNET_OK;
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-
&h1->senderIdentity))
+ &h1->
+
senderIdentity))
{
ret = GNUNET_OK;
break;
Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/applications/testing/testing.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -277,7 +277,8 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-
&h2->senderIdentity))
+ &h2->
+
senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
@@ -285,7 +286,8 @@
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-
&h1->senderIdentity))
+ &h1->
+
senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2008-06-08 02:24:35 UTC
(rev 7084)
+++ GNUnet/src/applications/transport/transport.c 2008-06-08 03:25:59 UTC
(rev 7085)
@@ -419,8 +419,8 @@
GNUNET_GE_LOG (ectx,
GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "Illegal call to `%s', do not have token `%s'\n",
- __FUNCTION__, token);
+ "Illegal attempt to disconnect transport; do not have
token `%s'\n",
+ token);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/include/gnunet_util_common.h
===================================================================
--- GNUnet/src/include/gnunet_util_common.h 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/include/gnunet_util_common.h 2008-06-08 03:25:59 UTC (rev
7085)
@@ -39,4 +39,12 @@
#define GNUNET_YES 1
#define GNUNET_NO 0
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+# define __func__ __FUNCTION__
+# else
+# define __func__ "<unknown>"
+# endif
+#endif
+
#endif /*GNUNET_UTIL_COMMON_H_ */
Modified: GNUnet/src/include/gnunet_util_error.h
===================================================================
--- GNUnet/src/include/gnunet_util_error.h 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/include/gnunet_util_error.h 2008-06-08 03:25:59 UTC (rev
7085)
@@ -218,17 +218,20 @@
/**
* Use this for fatal errors that cannot be handled
*/
-#define GNUNET_GE_ASSERT(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at %s:%d in %s.\n"),
__FILE__, __LINE__, __FUNCTION__); GNUNET_GE_CONFIRM(ctx); abort(); } } while(0)
+#define GNUNET_GE_ASSERT(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at %s:%d.\n"),
__FILE__, __LINE__); GNUNET_GE_CONFIRM(ctx); abort(); } } while(0)
-#define GNUNET_GE_ASSERT_FLF(ctx, cond, file, line, function) do { if (!
(cond)) { GNUNET_GE_LOG(ctx, (GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER |
GNUNET_GE_USER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), _("Internal error:
assertion failed at %s:%d in %s.\n"), file, line, function);
GNUNET_GE_CONFIRM(ctx); abort(); } } while(0)
+/**
+ * Use this for fatal errors that cannot be handled
+ */
+#define GNUNET_GE_ASSERT_FL(ctx, cond, f, l) do { if (! (cond)) {
GNUNET_GE_LOG(ctx, (GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at
%s:%d.\n"), f, l); GNUNET_GE_CONFIRM(ctx); abort(); } } while(0)
/**
* Use this for internal assertion violations that are
* not fatal (can be handled) but should not occur.
*/
-#define GNUNET_GE_BREAK(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at %s:%d in %s.\n"),
__FILE__, __LINE__, __FUNCTION__); } } while(0)
+#define GNUNET_GE_BREAK(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at %s:%d.\n"),
__FILE__, __LINE__); } } while(0)
-#define GNUNET_GE_BREAK_RETURN(ctx, cond, retval) do { if (! (cond)) {
GNUNET_GE_LOG(ctx, (GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at
%s:%d in %s.\n"), __FILE__, __LINE__, __FUNCTION__); return retval; } } while(0)
+#define GNUNET_GE_BREAK_RETURN(ctx, cond, retval) do { if (! (cond)) {
GNUNET_GE_LOG(ctx, (GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), _("Internal error: assertion failed at
%s:%d.\n"), __FILE__, __LINE__); return retval; } } while(0)
/**
* Use this for assertion violations caused by other
@@ -238,55 +241,42 @@
* we still want to see these problems during
* development and testing. "OP == other peer".
*/
-#define GNUNET_GE_BREAK_OP(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE),
_("External protocol violation: assertion failed at %s:%d in %s (no need to
panic, we can handle this).\n"), __FILE__, __LINE__, __FUNCTION__); } } while(0)
+#define GNUNET_GE_BREAK_OP(ctx, cond) do { if (! (cond)) { GNUNET_GE_LOG(ctx,
(GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE),
_("External protocol violation: assertion failed at %s:%d (no need to panic, we
can handle this).\n"), __FILE__, __LINE__); } } while(0)
/**
- * Just like GNUNET_GE_BREAK just with file/line/function
- * information given as part of the call.
- */
-#define GNUNET_GE_BREAK_FLF(ctx, cond, file, line, function) do { if (!
(cond)) { GNUNET_GE_LOG(ctx, (GNUNET_GE_KIND) (GNUNET_GE_DEVELOPER |
GNUNET_GE_USER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), _("Internal error:
assertion failed at %s:%d in %s.\n"), file, line, function); } } while(0)
-
-/**
* Log an error message at log-level 'level' that indicates
* a failure of the command 'cmd' with the message given
* by strerror(errno).
*/
-#define GNUNET_GE_LOG_STRERROR(ctx, level, cmd) do { GNUNET_GE_LOG(ctx, level,
_("`%s' failed at %s:%d in %s with error: %s\n"), cmd, __FILE__, __LINE__,
__FUNCTION__, STRERROR(errno)); } while(0)
+#define GNUNET_GE_LOG_STRERROR(ctx, level, cmd) do { GNUNET_GE_LOG(ctx, level,
_("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__,
STRERROR(errno)); } while(0)
/**
* Log an error message at log-level 'level' that indicates
* a failure of the command 'cmd' with the message given
* by strerror(errno).
*/
-#define GNUNET_GE_DIE_STRERROR(ctx, level, cmd) do { GNUNET_GE_LOG(ctx, level,
_("`%s' failed at %s:%d in %s with error: %s\n"), cmd, __FILE__, __LINE__,
__FUNCTION__, STRERROR(errno)); GNUNET_GE_CONFIRM(ctx); abort(); } while(0)
+#define GNUNET_GE_DIE_STRERROR(ctx, level, cmd) do { GNUNET_GE_LOG(ctx, level,
_("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__,
STRERROR(errno)); GNUNET_GE_CONFIRM(ctx); abort(); } while(0)
/**
* Log an error message at log-level 'level' that indicates
* a failure of the command 'cmd' with the message given
* by strerror(errno).
*/
-#define GNUNET_GE_DIE_STRERROR_FLF(ctx, level, cmd, file, line, function) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed at %s:%d in %s with error: %s\n"),
cmd, file, line, function, STRERROR(errno)); GNUNET_GE_CONFIRM(ctx); abort(); }
while(0)
+#define GNUNET_GE_DIE_STRERROR_FL(ctx, level, cmd, f, l) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed at %s:%d with error: %s\n"), cmd, f,
l, STRERROR(errno)); GNUNET_GE_CONFIRM(ctx); abort(); } while(0)
/**
* Log an error message at log-level 'level' that indicates
* a failure of the command 'cmd' with the message given
* by strerror(errno).
*/
-#define GNUNET_GE_LOG_STRERROR_FLF(ctx, level, cmd, file, line, function) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed at %s:%d in %s with error: %s\n"),
cmd, file, line, function, STRERROR(errno)); } while(0)
+#define GNUNET_GE_LOG_STRERROR_FILE(ctx, level, cmd, filename) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed on file `%s' at %s:%d with error:
%s\n"), cmd, filename,__FILE__, __LINE__, STRERROR(errno)); } while(0)
/**
- * Log an error message at log-level 'level' that indicates
- * a failure of the command 'cmd' with the message given
- * by strerror(errno).
- */
-#define GNUNET_GE_LOG_STRERROR_FILE(ctx, level, cmd, filename) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed on file `%s' at %s:%d in %s with
error: %s\n"), cmd, filename,__FILE__, __LINE__, __FUNCTION__,
STRERROR(errno)); } while(0)
-
-/**
* Die with an error message that indicates
* a failure of the command 'cmd' on file 'filename'
* with the message given by strerror(errno).
*/
-#define GNUNET_GE_DIE_STRERROR_FILE(ctx, level, cmd, filename) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed on file `%s' at %s:%d in %s with
error: %s\n"), cmd, filename,__FILE__, __LINE__, __FUNCTION__,
STRERROR(errno)); GNUNET_GE_CONFIRM(ctx); abort(); } while(0)
+#define GNUNET_GE_DIE_STRERROR_FILE(ctx, level, cmd, filename) do {
GNUNET_GE_LOG(ctx, level, _("`%s' failed on file `%s' at %s:%d with error:
%s\n"), cmd, filename,__FILE__, __LINE__, STRERROR(errno));
GNUNET_GE_CONFIRM(ctx); abort(); } while(0)
#if 0 /* keep Emacsens' auto-indent happy */
Modified: GNUnet/src/include/gnunet_util_string.h
===================================================================
--- GNUnet/src/include/gnunet_util_string.h 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/include/gnunet_util_string.h 2008-06-08 03:25:59 UTC (rev
7085)
@@ -62,7 +62,7 @@
* smaller than 40 MB.
* @return pointer to size bytes of memory
*/
-#define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__,
__FUNCTION__)
+#define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__)
/**
* Wrapper around malloc. Allocates size bytes of memory.
@@ -70,7 +70,7 @@
* @param size the number of bytes to allocate
* @return pointer to size bytes of memory
*/
-#define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__,
__LINE__, __FUNCTION__)
+#define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__,
__LINE__)
/**
* Wrapper around realloc. Rellocates size bytes of memory.
@@ -79,7 +79,7 @@
* @param size the number of bytes to reallocate
* @return pointer to size bytes of memory
*/
-#define GNUNET_realloc(ptr, size) GNUNET_xrealloc_(ptr, size, __FILE__,
__LINE__, __FUNCTION__)
+#define GNUNET_realloc(ptr, size) GNUNET_xrealloc_(ptr, size, __FILE__,
__LINE__)
/**
* Wrapper around free. Frees the memory referred to by ptr.
@@ -89,7 +89,7 @@
* @param ptr location where to free the memory. ptr must have
* been returned by GNUNET_strdup, GNUNET_malloc or GNUNET_array_grow
earlier.
*/
-#define GNUNET_free(ptr) GNUNET_xfree_(ptr, __FILE__, __LINE__, __FUNCTION__)
+#define GNUNET_free(ptr) GNUNET_xfree_(ptr, __FILE__, __LINE__)
/**
* Free the memory pointed to by ptr if ptr is not NULL.
@@ -106,7 +106,7 @@
* @param a pointer to a zero-terminated string
* @return a copy of the string including zero-termination
*/
-#define GNUNET_strdup(a) GNUNET_xstrdup_(a,__FILE__,__LINE__, __FUNCTION__)
+#define GNUNET_strdup(a) GNUNET_xstrdup_(a,__FILE__,__LINE__)
/**
* Grow a well-typed (!) array. This is a convenience
@@ -141,7 +141,7 @@
* @param tsize the target size for the resulting vector, use 0 to
* free the vector (then, arr will be NULL afterwards).
*/
-#define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&arr,
sizeof(arr[0]), &size, tsize, __FILE__, __LINE__, __FUNCTION__)
+#define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&arr,
sizeof(arr[0]), &size, tsize, __FILE__, __LINE__)
/**
* Append an element to a list (growing the
@@ -194,9 +194,7 @@
* memory is available. Don't use GNUNET_xmalloc_ directly. Use the
* GNUNET_malloc macro.
*/
-void *GNUNET_xmalloc_ (size_t size,
- const char *filename, int linenumber,
- const char *function);
+void *GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
/**
* Allocate memory. This function does not check if the
@@ -205,34 +203,27 @@
* possibility of very large allocations, use GNUNET_malloc instead.
*/
void *GNUNET_xmalloc_unchecked_ (size_t size,
- const char *filename,
- int linenumber, const char *function);
+ const char *filename, int linenumber);
/**
* Reallocate memory. Checks the return value, aborts if no more
* memory is available.
*/
void *GNUNET_xrealloc_ (void *ptr,
- const size_t n,
- const char *filename, int linenumber,
- const char *function);
+ const size_t n, const char *filename, int linenumber);
/**
* Free memory. Merely a wrapper for the case that we
* want to keep track of allocations. Don't use GNUNET_xfree_
* directly. Use the GNUNET_free macro.
*/
-void GNUNET_xfree_ (void *ptr,
- const char *filename, int linenumber,
- const char *function);
+void GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
/**
* Dup a string. Don't call GNUNET_xstrdup_ directly. Use the GNUNET_strdup
macro.
*/
-char *GNUNET_xstrdup_ (const char *str,
- const char *filename, int linenumber,
- const char *function);
+char *GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
/**
* Grow an array, the new elements are zeroed out.
@@ -251,8 +242,7 @@
size_t elementSize,
unsigned int *oldCount,
unsigned int newCount,
- const char *filename, int linenumber,
- const char *function);
+ const char *filename, int linenumber);
/**
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/server/connection.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -721,8 +721,8 @@
if (root->session.tsession != NULL)
GNUNET_GE_ASSERT (NULL,
GNUNET_OK ==
- transport->assert_associated (root->
- session.tsession,
+ transport->assert_associated (root->session.
+ tsession,
__FILE__));
root = root->overflowChain;
}
@@ -1903,8 +1903,8 @@
stats->change (stat_transmitted, p);
be->available_send_window -= p;
be->lastSequenceNumberSend++;
- GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->
- session.sender, 0);
+ GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->session.
+ sender, 0);
if (be->idealized_limit > be->max_transmitted_limit)
be->max_transmitted_limit = be->idealized_limit;
else /* age */
@@ -2484,8 +2484,8 @@
{
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- GNUNET_hash_to_enc (&entries[u]->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
"peer `%s' transmitted above limit: %llu bpm > %u
bpm\n",
@@ -2508,8 +2508,8 @@
#if DEBUG_CONNECTION
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&entries[u]->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
@@ -2570,8 +2570,8 @@
for (u = 0; u < activePeerCount; u++)
{
GNUNET_CORE_connection_reserve_downstream_bandwidth (&entries
- [u]->session.
- sender, 0);
+ [u]->
+ session.sender, 0);
entries[u]->idealized_limit = 0;
}
while ((schedulableBandwidth > activePeerCount * 100) &&
@@ -2905,8 +2905,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
@@ -3009,8 +3009,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/server/tcpserver.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -241,11 +241,6 @@
const GNUNET_MessageHeader * message,
int force)
{
-#if DEBUG_TCPHANDLER
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "%s: sending reply to client\n", __FUNCTION__);
-#endif
return GNUNET_select_write (selector, handle->sock, message, GNUNET_NO,
force);
}
@@ -279,50 +274,36 @@
ptyp = htons (msg->type);
GNUNET_mutex_lock (handlerlock);
- if (ptyp >= max_registeredType)
+ if ((ptyp >= max_registeredType) || (NULL == (callback = handlers[ptyp])))
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d not understood: no handler
registered\n",
- __FUNCTION__, ptyp, max_registeredType);
+ "Message of type %d not understood: no handler
registered\n",
+ ptyp);
GNUNET_mutex_unlock (handlerlock);
return GNUNET_SYSERR;
}
- callback = handlers[ptyp];
- if (callback == NULL)
+#if TIME_HANDLERS
+ start = GNUNET_get_time ();
+#endif
+ if (GNUNET_OK != callback (sender, msg))
{
+#if 0
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d not understood: no handler
registered\n",
- __FUNCTION__, ptyp);
+ "Message of type %d caused error in handler\n", ptyp);
+#endif
GNUNET_mutex_unlock (handlerlock);
return GNUNET_SYSERR;
}
- else
- {
#if TIME_HANDLERS
- start = GNUNET_get_time ();
+ if (GNUNET_get_time () - start > GNUNET_CRON_SECONDS)
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ "Handling message of type %u took %llu s\n", ptyp,
+ (GNUNET_get_time () - start) / GNUNET_CRON_SECONDS);
#endif
- if (GNUNET_OK != callback (sender, msg))
- {
-#if 0
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d caused error in handler\n",
- __FUNCTION__, ptyp);
-#endif
- GNUNET_mutex_unlock (handlerlock);
- return GNUNET_SYSERR;
- }
-#if TIME_HANDLERS
- if (GNUNET_get_time () - start > GNUNET_CRON_SECONDS)
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE,
- "Handling message of type %u took %llu s\n", ptyp,
- (GNUNET_get_time () - start) / GNUNET_CRON_SECONDS);
-#endif
- }
GNUNET_mutex_unlock (handlerlock);
return GNUNET_OK;
}
@@ -563,8 +544,9 @@
GNUNET_GE_LOG (ectx,
GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed, message type %d already in use.\n"),
- __FUNCTION__, type);
+ _
+ ("Registering failed, message type %d already in
use.\n"),
+ type);
return GNUNET_SYSERR;
}
}
Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/gnunet-setup.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,12 +24,11 @@
* @author Nils Durner
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_directories.h"
#include "gnunet_setup_lib.h"
-#include "platform.h"
-
typedef int (*ConfigurationPluginMain) (int argc,
char *const *argv,
struct GNUNET_PluginHandle * self,
Modified: GNUnet/src/setup/gtk/ngconf.c
===================================================================
--- GNUnet/src/setup/gtk/ngconf.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/gtk/ngconf.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_setup_lib.h"
#include "glade_support.h"
#include "gconf.h"
-#include "platform.h"
static GtkListStore *no_model;
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,10 +25,9 @@
* @author Christian Grothoff
*/
-#include "gnunet_util.h"
#include "platform.h"
+#include "gnunet_util.h"
#include "glade_support.h"
-
#include "wizard_gtk.h"
#include "gconf.h"
Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/lib/gns.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_setup_lib.h"
#include "gnunet_util.h"
-#include "platform.h"
-
#include "tree.h"
typedef struct GNS_TCL
@@ -123,8 +122,8 @@
val = GNUNET_GC_get_configuration_value_yesno (cfg,
section,
option,
- pos->value.
- Boolean.def);
+ pos->value.Boolean.
+ def);
if (val == GNUNET_SYSERR)
{
return GNUNET_SYSERR;
@@ -139,9 +138,18 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_number (cfg,
section,
option,
-
pos->value.UInt64.min,
-
pos->value.UInt64.max,
-
pos->value.UInt64.def,
+ pos->
+ value.
+ UInt64.
+ min,
+ pos->
+ value.
+ UInt64.
+ max,
+ pos->
+ value.
+ UInt64.
+ def,
&val))
{
return GNUNET_SYSERR;
@@ -186,7 +194,10 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_string (cfg,
section,
option,
-
pos->value.String.def,
+ pos->
+ value.
+ String.
+ def,
&val))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
@@ -203,8 +214,14 @@
(const
char
**)
-
pos->value.String.legalRange,
-
pos->value.String.def,
+ pos->
+ value.
+ String.
+
legalRange,
+ pos->
+ value.
+ String.
+ def,
&ival))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
Modified: GNUnet/src/setup/lib/tree.c
===================================================================
--- GNUnet/src/setup/lib/tree.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/lib/tree.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_setup_lib.h"
#include "tree.h"
-#include "platform.h"
#include <libguile.h>
Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/ncurses/mconf.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -179,8 +179,10 @@
case DLG_EXIT_CANCEL:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+ section,
+ pos->
+ option,
st ==
DLG_EXIT_OK
? "YES" :
@@ -215,9 +217,12 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
-
fitem.text))
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -279,9 +284,13 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
-
pos->section,
-
pos->option,
-
val->String.legalRange
+ pos->
+ section,
+ pos->
+ option,
+ val->
+ String.
+ legalRange
[msel]))
{
show_help (pos->option,
@@ -360,8 +369,10 @@
tmp[strlen (tmp) - 1] = '\0';
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+ section,
+ pos->
+ option,
tmp))
{
GNUNET_free (tmp);
@@ -405,9 +416,12 @@
}
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
-
fitem.text))
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -456,8 +470,10 @@
}
if (0 != GNUNET_GC_set_configuration_value_number (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+
section,
+ pos->
+
option,
lval))
{
show_help (pos->option,
Modified: GNUnet/src/setup/qt/qtconfig.cc
===================================================================
--- GNUnet/src/setup/qt/qtconfig.cc 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/qt/qtconfig.cc 2008-06-08 03:25:59 UTC (rev 7085)
@@ -1,7 +1,6 @@
#include <Qt/qapplication.h>
extern "C" {
- #include "gnunet_util.h"
#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_directories.h"
Modified: GNUnet/src/setup/text/conf.c
===================================================================
--- GNUnet/src/setup/text/conf.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/setup/text/conf.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -33,9 +33,9 @@
* - support editing of string inputs...
*/
+#include "platform.h"
#include "gnunet_setup_lib.h"
#include "conf.h"
-#include "platform.h"
#include <termios.h>
static char
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/transports/http.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,12 +24,12 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_protocols.h"
#include "gnunet_transport.h"
#include "gnunet_stats_service.h"
#include "gnunet_upnp_service.h"
-#include "platform.h"
#include <microhttpd.h>
#include <curl/curl.h>
#include "ip.h"
@@ -68,10 +68,6 @@
*/
#define HTTP_PUT_RESPONSE "Thank you!"
-#define ENTER() /* fprintf(stderr, "E(%u-%s)\n", __LINE__,
__FUNCTION__) */
-#define EXIT() /* fprintf(stderr, "X(%u-%s)\n", __LINE__,
__FUNCTION__) */
-#define STEP() /* fprintf(stderr, "S(%u-%s)\n", __LINE__,
__FUNCTION__) */
-
#define MY_TRANSPORT_NAME "HTTP"
#include "common.c"
@@ -456,9 +452,7 @@
signal_select ()
{
static char c;
- ENTER ();
write (signal_pipe[1], &c, sizeof (c));
- EXIT ();
}
/**
@@ -490,7 +484,6 @@
httpDisconnect (GNUNET_TSession * tsession)
{
HTTPSession *httpsession = tsession->internal;
- ENTER ();
if (httpsession == NULL)
{
GNUNET_free (tsession);
@@ -499,7 +492,6 @@
GNUNET_mutex_lock (lock);
httpsession->users--;
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_OK;
}
@@ -516,7 +508,6 @@
struct MHD_Response *r;
int i;
- ENTER ();
GNUNET_mutex_lock (lock);
for (i = 0; i < tsessionCount; i++)
{
@@ -529,14 +520,10 @@
if (httpsession->is_client)
{
#if DO_GET
- STEP ();
curl_multi_remove_handle (curl_multi, httpsession->cs.client.get);
http_requests_pending--;
- STEP ();
signal_select ();
- STEP ();
curl_easy_cleanup (httpsession->cs.client.get);
- STEP ();
GNUNET_array_grow (httpsession->cs.client.rbuff2,
httpsession->cs.client.rsize2, 0);
#endif
@@ -545,13 +532,10 @@
while (pos != NULL)
{
next = pos->next;
- STEP ();
curl_multi_remove_handle (curl_multi, pos->curl_put);
http_requests_pending--;
- STEP ();
signal_select ();
curl_easy_cleanup (pos->curl_put);
- STEP ();
GNUNET_free (pos->msg);
GNUNET_free (pos);
pos = next;
@@ -580,7 +564,6 @@
GNUNET_free (httpsession);
}
GNUNET_mutex_unlock (lock);
- EXIT ();
}
/**
@@ -602,7 +585,6 @@
if (stats != NULL)
stats->change (stat_mhd_close_callbacks, 1);
- ENTER ();
if (httpsession == NULL)
return; /* oops */
GNUNET_GE_ASSERT (NULL, !httpsession->is_client);
@@ -635,7 +617,6 @@
}
#endif
httpsession->is_mhd_active--;
- EXIT ();
}
/**
@@ -662,11 +643,9 @@
{
HTTPSession *httpSession;
- ENTER ();
if (tsession == NULL)
{
GNUNET_GE_BREAK (NULL, 0);
- EXIT ();
return GNUNET_SYSERR;
}
httpSession = tsession->internal;
@@ -674,12 +653,10 @@
if (httpSession->destroyed == GNUNET_YES)
{
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_SYSERR;
}
httpSession->users++;
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_OK;
}
@@ -695,7 +672,6 @@
{
unsigned int i;
- ENTER ();
GNUNET_mutex_lock (lock);
if (tsessionCount == tsessionArrayLength)
GNUNET_array_grow (tsessions, tsessionArrayLength,
@@ -703,7 +679,6 @@
i = tsessionCount;
tsessions[tsessionCount++] = tsession;
GNUNET_mutex_unlock (lock);
- EXIT ();
return i;
}
@@ -725,7 +700,6 @@
if (stats != NULL)
stats->change (stat_mhd_read_callbacks, 1);
- ENTER ();
GNUNET_mutex_lock (lock);
if (mgd->wpos < max)
max = mgd->wpos;
@@ -745,11 +719,7 @@
if (stats != NULL)
stats->change (stat_bytesSent, max);
if ((max == 0) && (mgd->httpsession->cs.server.gets != mgd))
- {
- EXIT ();
- return -1; /* end of response (another GET replaces this
one) */
- }
- EXIT ();
+ return -1; /* end of response (another GET replaces this
one) */
return max;
}
#endif
@@ -764,11 +734,9 @@
{
struct MHDGetData *mgd = cls;
- ENTER ();
GNUNET_GE_ASSERT (NULL, mgd->get == NULL);
GNUNET_array_grow (mgd->wbuff, mgd->wsize, 0);
GNUNET_free (mgd);
- EXIT ();
}
#endif
@@ -804,7 +772,6 @@
if (stats != NULL)
stats->change (stat_mhd_access_callbacks, 1);
- ENTER ();
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
@@ -892,17 +859,13 @@
get->session = session;
get->httpsession = httpSession;
get->last_get_activity = GNUNET_get_time ();
- STEP ();
get->get = MHD_create_response_from_callback (-1,
64 * 1024,
contentReaderCallback,
get,
contentReaderFreeCallback);
- STEP ();
MHD_queue_response (session, MHD_HTTP_OK, get->get);
- STEP ();
GNUNET_mutex_unlock (lock);
- EXIT ();
return MHD_YES;
}
#endif
@@ -943,15 +906,11 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"HTTP/MHD queues dummy response to completed PUT
request.\n");
#endif
- STEP ();
response =
MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),
HTTP_PUT_RESPONSE, MHD_NO, MHD_NO);
- STEP ();
MHD_queue_response (session, MHD_HTTP_OK, response);
- STEP ();
MHD_destroy_response (response);
- STEP ();
GNUNET_mutex_unlock (lock);
return MHD_YES;
}
@@ -1013,7 +972,6 @@
}
GNUNET_mutex_unlock (lock);
GNUNET_GE_BREAK_OP (NULL, 0); /* invalid request */
- EXIT ();
return MHD_NO;
}
@@ -1034,7 +992,6 @@
if (stats != NULL)
stats->change (stat_curl_receive_callbacks, 1);
- ENTER ();
httpSession->cs.client.last_get_activity = GNUNET_get_time ();
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
@@ -1049,9 +1006,8 @@
cpy = sizeof (GNUNET_MessageHeader) - httpSession->cs.client.rpos1;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.
- client.rbuff1[httpSession->cs.client.rpos1], &inbuf[poff],
- cpy);
+ memcpy (&httpSession->cs.client.
+ rbuff1[httpSession->cs.client.rpos1], &inbuf[poff], cpy);
httpSession->cs.client.rpos1 += cpy;
have -= cpy;
poff += cpy;
@@ -1071,9 +1027,8 @@
httpSession->cs.client.rpos2;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.
- client.rbuff2[httpSession->cs.client.rpos2], &inbuf[poff],
- cpy);
+ memcpy (&httpSession->cs.client.
+ rbuff2[httpSession->cs.client.rpos2], &inbuf[poff], cpy);
have -= cpy;
poff += cpy;
httpSession->cs.client.rpos2 += cpy;
@@ -1094,7 +1049,6 @@
}
if (stats != NULL)
stats->change (stat_bytesReceived, size * nmemb);
- EXIT ();
return size * nmemb;
}
#endif
@@ -1111,7 +1065,6 @@
if (stats != NULL)
stats->change (stat_curl_send_callbacks, 1);
- ENTER ();
put->last_activity = GNUNET_get_time ();
if (max > put->size - put->pos)
max = put->size - put->pos;
@@ -1124,7 +1077,6 @@
#endif
if (stats != NULL)
stats->change (stat_bytesSent, max);
- EXIT ();
return max;
}
@@ -1143,7 +1095,6 @@
const HostAddress *haddr =
(const HostAddress *) &httpSession->cs.client.address;
- ENTER ();
url = httpSession->cs.client.url;
if (url == NULL)
{
@@ -1161,7 +1112,6 @@
if (NULL == inet_ntop (AF_INET, &haddr->ipv4, buf, IP_BUF_LEN))
{
/* log? */
- EXIT ();
return;
}
obr = "";
@@ -1172,7 +1122,6 @@
if (NULL == inet_ntop (AF_INET6, &haddr->ipv6, buf, IP_BUF_LEN))
{
/* log? */
- EXIT ();
return;
}
obr = "[";
@@ -1187,7 +1136,6 @@
ntohs (haddr->port), &enc);
httpSession->cs.client.url = url;
}
- EXIT ();
}
#if DO_GET
@@ -1205,25 +1153,20 @@
CURLMcode mret;
GNUNET_CronTime now;
- ENTER ();
if (httpSession->cs.client.url == NULL)
return GNUNET_SYSERR;
curl_get = httpSession->cs.client.get;
if (curl_get != NULL)
{
- STEP ();
GNUNET_mutex_lock (lock);
curl_multi_remove_handle (curl_multi, curl_get);
http_requests_pending--;
signal_select ();
- STEP ();
curl_easy_cleanup (curl_get);
GNUNET_mutex_unlock (lock);
- STEP ();
httpSession->cs.client.get = NULL;
}
curl_get = curl_easy_init ();
- STEP ();
if (curl_get == NULL)
return GNUNET_SYSERR;
/* create GET */
@@ -1249,17 +1192,14 @@
if (ret != CURLE_OK)
{
curl_easy_cleanup (curl_get);
- EXIT ();
return GNUNET_SYSERR;
}
- STEP ();
GNUNET_mutex_lock (lock);
mret = curl_multi_add_handle (curl_multi, curl_get);
http_requests_pending++;
GNUNET_mutex_unlock (lock);
if (stats != NULL)
stats->change (stat_get_issued, 1);
- STEP ();
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
@@ -1268,7 +1208,6 @@
"curl_multi_add_handle", __FILE__, __LINE__,
curl_multi_strerror (mret));
curl_easy_cleanup (curl_get);
- EXIT ();
return GNUNET_SYSERR;
}
signal_select ();
@@ -1281,7 +1220,6 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"HTTP/CURL initiated GET request.\n");
#endif
- EXIT ();
return GNUNET_OK;
}
#endif
@@ -1304,7 +1242,6 @@
if (stats != NULL)
stats->change (stat_connect_calls, 1);
- ENTER ();
/* check if we have a session pending for this peer */
tsession = NULL;
if (may_reuse)
@@ -1323,7 +1260,6 @@
{
*tsessionPtr = tsession;
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_OK;
}
GNUNET_mutex_unlock (lock);
@@ -1347,7 +1283,6 @@
{
GNUNET_free (tsession);
GNUNET_free (httpSession);
- EXIT ();
return GNUNET_SYSERR;
}
#endif
@@ -1360,7 +1295,6 @@
"HTTP/CURL initiated connection to `%s'.\n",
httpSession->cs.client.url);
#endif
- EXIT ();
return GNUNET_OK;
}
@@ -1376,10 +1310,8 @@
/* this condition should pretty much always be
true; just checking here in case the PUT
response comes early somehow */
- ENTER ();
if (put->pos == put->size)
put->done = GNUNET_YES;
- EXIT ();
return size * nmemb;
}
@@ -1394,14 +1326,11 @@
CURLMcode mret;
long size;
- ENTER ();
/* we should have initiated a GET earlier,
so URL must not be NULL here */
if (httpSession->cs.client.url == NULL)
return GNUNET_SYSERR;
- STEP ();
curl_put = curl_easy_init ();
- STEP ();
if (curl_put == NULL)
return GNUNET_SYSERR;
CURL_EASY_SETOPT (curl_put, CURLOPT_FAILONERROR, 1);
@@ -1431,17 +1360,14 @@
if (ret != CURLE_OK)
{
curl_easy_cleanup (curl_put);
- EXIT ();
return GNUNET_SYSERR;
}
- STEP ();
GNUNET_mutex_lock (lock);
mret = curl_multi_add_handle (curl_multi, curl_put);
http_requests_pending++;
GNUNET_mutex_unlock (lock);
if (stats != NULL)
stats->change (stat_put_issued, 1);
- STEP ();
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
@@ -1449,7 +1375,6 @@
GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
"curl_multi_add_handle", __FILE__, __LINE__,
curl_multi_strerror (mret));
- EXIT ();
return GNUNET_SYSERR;
}
signal_select ();
@@ -1460,7 +1385,6 @@
"HTTP/CURL initiated PUT request to `%s'.\n",
httpSession->cs.client.url);
#endif
- EXIT ();
return GNUNET_OK;
}
@@ -1486,7 +1410,6 @@
struct MHDGetData *get;
int ret;
- ENTER ();
if (size >= GNUNET_MAX_BUFFER_SIZE - sizeof (GNUNET_MessageHeader))
{
GNUNET_GE_BREAK (coreAPI->ectx, 0);
@@ -1500,7 +1423,6 @@
if (httpSession->is_client)
{
/* client */
- EXIT ();
if ((important != GNUNET_YES) && (httpSession->cs.client.puts != NULL))
return GNUNET_NO;
return GNUNET_YES;
@@ -1523,10 +1445,8 @@
ret = GNUNET_YES;
}
GNUNET_mutex_unlock (lock);
- EXIT ();
return ret;
}
- EXIT ();
}
@@ -1552,7 +1472,6 @@
if (stats != NULL)
stats->change (stat_send_calls, 1);
- ENTER ();
if (httpSession->is_client)
{
/* we need to do a PUT (we are the client) */
@@ -1574,7 +1493,6 @@
if (stats != NULL)
stats->change (stat_bytesDropped, size);
- EXIT ();
return GNUNET_NO;
}
GNUNET_mutex_unlock (lock);
@@ -1592,14 +1510,12 @@
{
GNUNET_free (putData->msg);
GNUNET_free (putData);
- EXIT ();
return GNUNET_SYSERR;
}
GNUNET_mutex_lock (lock);
putData->next = httpSession->cs.client.puts;
httpSession->cs.client.puts = putData;
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_OK;
}
@@ -1617,7 +1533,6 @@
if (getData == NULL)
{
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_SYSERR;
}
if (getData->wsize == 0)
@@ -1629,7 +1544,6 @@
if (!important)
{
GNUNET_mutex_unlock (lock);
- EXIT ();
return GNUNET_NO;
}
tmp = GNUNET_malloc (getData->wpos + size);
@@ -1666,7 +1580,6 @@
signal_select ();
GNUNET_mutex_unlock (lock);
#endif
- EXIT ();
return GNUNET_OK;
}
@@ -1692,7 +1605,6 @@
#endif
GNUNET_CronTime now;
- ENTER ();
GNUNET_mutex_lock (lock);
now = GNUNET_get_time ();
for (i = 0; i < tsessionCount; i++)
@@ -1733,14 +1645,10 @@
else
prev->next = pos->next;
GNUNET_free (pos->msg);
- STEP ();
curl_multi_remove_handle (curl_multi, pos->curl_put);
http_requests_pending--;
- STEP ();
signal_select ();
- STEP ();
curl_easy_cleanup (pos->curl_put);
- STEP ();
GNUNET_free (pos);
if (prev == NULL)
pos = s->cs.client.puts;
@@ -1799,9 +1707,7 @@
s->cs.server.gets = NULL;
r = gpos->get;
gpos->get = NULL;
- STEP ();
MHD_destroy_response (r);
- STEP ();
}
gpos = gnext;
}
@@ -1827,7 +1733,6 @@
}
}
GNUNET_mutex_unlock (lock);
- EXIT ();
}
/**
@@ -1849,7 +1754,6 @@
char buf[128]; /* for reading from pipe */
int ret;
- ENTER ();
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
@@ -1861,11 +1765,9 @@
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
- STEP ();
GNUNET_mutex_lock (lock);
mret = curl_multi_fdset (curl_multi, &rs, &ws, &es, &max);
GNUNET_mutex_unlock (lock);
- STEP ();
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
@@ -1875,16 +1777,12 @@
curl_multi_strerror (mret));
break;
}
- STEP ();
if (mhd_daemon != NULL)
MHD_get_fdset (mhd_daemon, &rs, &ws, &es, &max);
- STEP ();
timeout = 0;
have_tv = MHD_NO;
if (mhd_daemon != NULL)
have_tv = MHD_get_timeout (mhd_daemon, &timeout);
- STEP ();
-
GNUNET_mutex_lock (lock);
if ((CURLM_OK == curl_multi_timeout (curl_multi, &ms)) &&
(ms != -1) && ((ms < timeout) || (have_tv == MHD_NO)))
@@ -1893,13 +1791,11 @@
have_tv = MHD_YES;
}
GNUNET_mutex_unlock (lock);
- STEP ();
FD_SET (signal_pipe[0], &rs);
if (max < signal_pipe[0])
max = signal_pipe[0];
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
- STEP ();
if (stats != NULL)
stats->change (stat_select_calls, 1);
ret =
@@ -1910,17 +1806,14 @@
GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER, "select");
}
- STEP ();
if (GNUNET_YES != http_running)
break;
running = 0;
do
{
- STEP ();
GNUNET_mutex_lock (lock);
mret = curl_multi_perform (curl_multi, &running);
GNUNET_mutex_unlock (lock);
- STEP ();
}
while ((mret == CURLM_CALL_MULTI_PERFORM)
&& (http_running == GNUNET_YES));
@@ -1932,10 +1825,8 @@
GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
"curl_multi_perform", __FILE__, __LINE__,
curl_multi_strerror (mret));
- STEP ();
if (mhd_daemon != NULL)
MHD_run (mhd_daemon);
- STEP ();
cleanup_connections ();
}
#if DEBUG_HTTP
@@ -1943,7 +1834,6 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"HTTP transport select thread exits.\n");
#endif
- EXIT ();
return NULL;
}
@@ -1957,18 +1847,14 @@
{
unsigned short port;
- ENTER ();
if ((curl_multi != NULL) || (http_running == GNUNET_YES))
return GNUNET_SYSERR;
- STEP ();
curl_multi = curl_multi_init ();
- STEP ();
if (curl_multi == NULL)
return GNUNET_SYSERR;
port = get_port ();
if ((mhd_daemon == NULL) && (port != 0))
{
- STEP ();
if (GNUNET_YES !=
GNUNET_GC_get_configuration_value_yesno (cfg, "GNUNETD",
"DISABLE-IPV6",
@@ -2015,7 +1901,6 @@
}
if (mhd_daemon != NULL)
available_protocols |= VERSION_AVAILABLE_IPV4;
- STEP ();
}
if (port == 0)
{
@@ -2029,11 +1914,8 @@
}
if (0 != PIPE (signal_pipe))
{
- STEP ();
MHD_stop_daemon (mhd_daemon);
- STEP ();
curl_multi_cleanup (curl_multi);
- STEP ();
curl_multi = NULL;
mhd_daemon = NULL;
return GNUNET_SYSERR;
@@ -2046,7 +1928,6 @@
GNUNET_GE_DIE_STRERROR (coreAPI->ectx,
GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "pthread_create");
- EXIT ();
return GNUNET_OK;
}
@@ -2061,7 +1942,6 @@
int i;
HTTPSession *s;
- ENTER ();
if ((http_running == GNUNET_NO) || (curl_multi == NULL))
return GNUNET_SYSERR;
http_running = GNUNET_NO;
@@ -2072,9 +1952,7 @@
CLOSE (signal_pipe[1]);
if (mhd_daemon != NULL)
{
- STEP ();
MHD_stop_daemon (mhd_daemon);
- STEP ();
mhd_daemon = NULL;
}
cleanup_connections ();
@@ -2087,11 +1965,8 @@
i--;
}
}
- STEP ();
curl_multi_cleanup (curl_multi);
- STEP ();
curl_multi = NULL;
- EXIT ();
return GNUNET_OK;
}
@@ -2104,7 +1979,6 @@
GNUNET_TransportAPI *
inittransport_http (GNUNET_CoreAPIForTransport * core)
{
- ENTER ();
GNUNET_GE_ASSERT (coreAPI->ectx, sizeof (HostAddress) == 24);
coreAPI = core;
cfg = coreAPI->cfg;
@@ -2194,7 +2068,6 @@
myAPI.server_stop = &stopTransportServer;
myAPI.hello_to_address = &hello_to_address;
myAPI.send_now_test = &httpTestWouldTry;
- EXIT ();
return &myAPI;
}
@@ -2202,13 +2075,11 @@
void
donetransport_http ()
{
- ENTER ();
curl_global_cleanup ();
GNUNET_free_non_null (proxy);
proxy = NULL;
GNUNET_array_grow (tsessions, tsessionArrayLength, 0);
do_shutdown ();
- EXIT ();
}
/* end of http.c */
Modified: GNUnet/src/transports/nat.c
===================================================================
--- GNUnet/src/transports/nat.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/transports/nat.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_protocols.h"
#include "gnunet_transport.h"
-#include "platform.h"
#include "ip.h"
#define DEBUG_NAT GNUNET_NO
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/transports/smtp.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,12 +25,12 @@
* @author Renaldo Ferreira
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_directories.h"
#include "gnunet_protocols.h"
#include "gnunet_transport.h"
#include "gnunet_stats_service.h"
-#include "platform.h"
#include <libesmtp.h>
#include <signal.h>
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/transports/tcp.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,12 +24,12 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_protocols.h"
#include "gnunet_transport.h"
#include "gnunet_upnp_service.h"
#include "gnunet_stats_service.h"
-#include "platform.h"
#include "ip.h"
#define DEBUG_TCP GNUNET_NO
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/transports/udp.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,13 +24,13 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_protocols.h"
#include "gnunet_transport.h"
#include "gnunet_stats_service.h"
#include "gnunet_upnp_service.h"
#include "ip.h"
-#include "platform.h"
#define DEBUG_UDP GNUNET_NO
Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/boot/startup.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,12 +24,12 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_directories.h"
#include "gnunet_util_boot.h"
#include "gnunet_util_config.h"
#include "gnunet_util_error_loggers.h"
#include <gcrypt.h>
-#include "platform.h"
static GNUNET_GE_KIND
convertLogLevel (const char *level)
Modified: GNUnet/src/util/config/config.c
===================================================================
--- GNUnet/src/util/config/config.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/config/config.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,8 +25,8 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
-#include "platform.h"
/**
* @brief configuration entry
Modified: GNUnet/src/util/containers/bloomfilter.c
===================================================================
--- GNUnet/src/util/containers/bloomfilter.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/util/containers/bloomfilter.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -39,9 +39,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
#include "gnunet_util_containers.h"
-#include "platform.h"
typedef struct GNUNET_BloomFilter
{
Modified: GNUnet/src/util/crypto/hostkey_gcrypt.c
===================================================================
--- GNUnet/src/util/crypto/hostkey_gcrypt.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/util/crypto/hostkey_gcrypt.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -31,11 +31,11 @@
* is not required. The performance impact is minimal anyway.
*/
+#include "platform.h"
+#include <gcrypt.h>
#include "gnunet_util.h"
#include "gnunet_util_crypto.h"
#include "locking_gcrypt.h"
-#include "platform.h"
-#include <gcrypt.h>
/**
* Use LOG_ERROR for anything that should never happen
Modified: GNUnet/src/util/getopt/getopt.c
===================================================================
--- GNUnet/src/util/getopt/getopt.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/getopt/getopt.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -38,10 +38,10 @@
* actually fits our API.
*/
+#include "platform.h"
#include "gnunet_util_error.h"
#include "gnunet_util_string.h"
#include "gnunet_util_getopt.h"
-#include "platform.h"
#ifdef VMS
# include <unixlib.h>
Modified: GNUnet/src/util/getopt/printhelp.c
===================================================================
--- GNUnet/src/util/getopt/printhelp.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/getopt/printhelp.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,9 +24,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_string.h"
#include "gnunet_util_getopt.h"
-#include "platform.h"
#define BORDER 29
Modified: GNUnet/src/util/getopt/printversion.c
===================================================================
--- GNUnet/src/util/getopt/printversion.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/util/getopt/printversion.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -24,9 +24,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_string.h"
#include "gnunet_util_getopt.h"
-#include "platform.h"
int
GNUNET_getopt_print_version_ (GNUNET_CommandLineProcessorContext * ctx,
Modified: GNUnet/src/util/getopt/setoption.c
===================================================================
--- GNUnet/src/util/getopt/setoption.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/getopt/setoption.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_string.h"
#include "gnunet_util_config.h"
#include "gnunet_util_getopt.h"
-#include "platform.h"
int
Modified: GNUnet/src/util/loggers/file.c
===================================================================
--- GNUnet/src/util/loggers/file.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/loggers/file.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,11 +25,11 @@
* @author Christian Grothoff
*/
#define _XOPEN_SOURCE /* glibc2 needs this */
+#include "platform.h"
#include "gnunet_util_error_loggers.h"
#include "gnunet_util_os.h"
#include "gnunet_util_string.h"
#include "gnunet_util.h"
-#include "platform.h"
#include <time.h>
/**
@@ -275,8 +275,8 @@
}
if (ret < 0)
fprintf (stderr,
- _("`%s' failed at %s:%d in %s with error: %s\n"),
- "fclose", __FILE__, __LINE__, __FUNCTION__, STRERROR (errno));
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "fclose", __FILE__, __LINE__, STRERROR (errno));
fflush (fctx->handle);
GNUNET_mutex_unlock (fctx->lock);
}
@@ -293,8 +293,8 @@
if ((fctx->handle != stderr) &&
(fctx->handle != stdout) && (0 != fclose (fctx->handle)))
fprintf (stderr,
- _("`%s' failed at %s:%d in %s with error: %s\n"),
- "fclose", __FILE__, __LINE__, __FUNCTION__, STRERROR (errno));
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "fclose", __FILE__, __LINE__, STRERROR (errno));
GNUNET_free (fctx);
}
Modified: GNUnet/src/util/loggers/memory.c
===================================================================
--- GNUnet/src/util/loggers/memory.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/loggers/memory.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
*
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_error_loggers.h"
#include "gnunet_util_string.h"
#include "gnunet_util.h"
-#include "platform.h"
typedef struct GNUNET_GE_Message
{
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/network/io.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,8 +24,8 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_network.h"
-#include "platform.h"
#include "network.h"
#define DEBUG_IO GNUNET_NO
Modified: GNUnet/src/util/network/ipcheck.c
===================================================================
--- GNUnet/src/util/network/ipcheck.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/network/ipcheck.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,10 +24,10 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_network.h"
#include "gnunet_util_string.h"
#include "gnunet_util_error.h"
-#include "platform.h"
/**
* @brief IPV4 network in CIDR notation.
Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/network/select.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,8 +24,8 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util.h"
-#include "platform.h"
#include "network.h"
#define DEBUG_SELECT GNUNET_NO
Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/util/network_client/tcpio.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -300,12 +300,12 @@
while (1)
{
if (addr_families[af_index] == -1)
- {
+ {
GNUNET_GE_LOG (sock->ectx,
GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
_("Error connecting to %s:%u\n"), host, port);
- return GNUNET_SYSERR;
- }
+ return GNUNET_SYSERR;
+ }
soaddr = NULL;
socklen = 0;
if (GNUNET_SYSERR ==
@@ -601,7 +601,8 @@
{
GNUNET_GE_LOG (sock->ectx,
GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("`%s' failed, reply invalid!\n"), __FUNCTION__);
+ _
+ ("Reading result from gnunetd failed, reply invalid!\n"));
GNUNET_free (rv);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/util/os/semaphore.c
===================================================================
--- GNUnet/src/util/os/semaphore.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/os/semaphore.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,12 +25,12 @@
* TODO: implement non-blocking semaphore down!
*/
+#include "platform.h"
#include "gnunet_util_os.h"
#include "gnunet_util_string.h"
#include "gnunet_util_error.h"
#include "gnunet_util_threads.h"
#include "gnunet_util_disk.h"
-#include "platform.h"
#if SOLARIS || GNUNET_freeBSD || OSX
#include <semaphore.h>
Modified: GNUnet/src/util/os/user.c
===================================================================
--- GNUnet/src/util/os/user.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/os/user.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,9 +24,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_os.h"
#include "gnunet_util_string.h"
-#include "platform.h"
int
GNUNET_configure_user_account (int testCapability,
Modified: GNUnet/src/util/pseudonym/info_test.c
===================================================================
--- GNUnet/src/util/pseudonym/info_test.c 2008-06-08 02:24:35 UTC (rev
7084)
+++ GNUnet/src/util/pseudonym/info_test.c 2008-06-08 03:25:59 UTC (rev
7085)
@@ -40,10 +40,10 @@
{
int *ok = cls;
- if ( (0 == memcmp(pseudonym,
- &id1,
- sizeof(GNUNET_HashCode))) &&
- (!GNUNET_meta_data_test_equal (md, meta)) )
+ if ((0 == memcmp (pseudonym,
+ &id1,
+ sizeof (GNUNET_HashCode))) &&
+ (!GNUNET_meta_data_test_equal (md, meta)))
{
*ok = GNUNET_NO;
GNUNET_GE_BREAK (NULL, 0);
@@ -70,7 +70,7 @@
if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
{
GNUNET_GC_free (cfg);
- GNUNET_GE_BREAK(NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return -1;
}
/* ACTUAL TEST CODE */
Modified: GNUnet/src/util/string/string.c
===================================================================
--- GNUnet/src/util/string/string.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/string/string.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -25,11 +25,11 @@
* @author Christian Grothoff
*/
-#include "gnunet_util_string.h"
#include "platform.h"
#if HAVE_ICONV_H
#include <iconv.h>
#endif
+#include "gnunet_util_string.h"
int
Modified: GNUnet/src/util/string/xmalloc.c
===================================================================
--- GNUnet/src/util/string/xmalloc.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/string/xmalloc.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -24,9 +24,9 @@
* @author Christian Grothoff
*/
+#include "platform.h"
#include "gnunet_util_string.h"
#include "gnunet_util_error.h"
-#include "platform.h"
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
@@ -45,31 +45,28 @@
* @return pointer to size bytes of memory
*/
void *
-GNUNET_xmalloc_ (size_t size,
- const char *filename, int linenumber, const char *function)
+GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
{
/* As a security precaution, we generally do not allow very large
allocations using the default 'GNUNET_malloc' macro */
- GNUNET_GE_ASSERT_FLF (NULL,
- size <= GNUNET_MAX_GNUNET_malloc_CHECKED, filename,
- linenumber, function);
- return GNUNET_xmalloc_unchecked_ (size, filename, linenumber, function);
+ GNUNET_GE_ASSERT_FL (NULL,
+ size <= GNUNET_MAX_GNUNET_malloc_CHECKED, filename,
+ linenumber);
+ return GNUNET_xmalloc_unchecked_ (size, filename, linenumber);
}
void *
-GNUNET_xmalloc_unchecked_ (size_t size,
- const char *filename,
- int linenumber, const char *function)
+GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
{
void *result;
- GNUNET_GE_ASSERT_FLF (NULL, size < INT_MAX, filename, linenumber, function);
+ GNUNET_GE_ASSERT_FL (NULL, size < INT_MAX, filename, linenumber);
result = malloc (size);
if (result == NULL)
- GNUNET_GE_DIE_STRERROR_FLF (NULL,
- GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
- GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
- "malloc", filename, linenumber, function);
+ GNUNET_GE_DIE_STRERROR_FL (NULL,
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
+ "malloc", filename, linenumber);
memset (result, 0, size); /* client code should not rely on this,
though... */
return result;
}
@@ -88,16 +85,15 @@
*/
void *
GNUNET_xrealloc_ (void *ptr,
- const size_t n,
- const char *filename, int linenumber, const char *function)
+ const size_t n, const char *filename, int linenumber)
{
ptr = realloc (ptr, n);
if (!ptr)
- GNUNET_GE_DIE_STRERROR_FLF (NULL,
- GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
- GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
- "realloc", filename, linenumber, function);
+ GNUNET_GE_DIE_STRERROR_FL (NULL,
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
+ "realloc", filename, linenumber);
return ptr;
}
@@ -110,10 +106,9 @@
* @param linenumber where in the code was the call to GNUNET_array_grow
*/
void
-GNUNET_xfree_ (void *ptr, const char *filename, int linenumber,
- const char *function)
+GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
{
- GNUNET_GE_ASSERT_FLF (NULL, ptr != NULL, filename, linenumber, function);
+ GNUNET_GE_ASSERT_FL (NULL, ptr != NULL, filename, linenumber);
free (ptr);
}
@@ -126,15 +121,12 @@
* @return strdup(str)
*/
char *
-GNUNET_xstrdup_ (const char *str,
- const char *filename, int linenumber, const char *function)
+GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber)
{
char *res;
- GNUNET_GE_ASSERT_FLF (NULL, str != NULL, filename, linenumber, function);
- res =
- (char *) GNUNET_xmalloc_ (strlen (str) + 1, filename, linenumber,
- function);
+ GNUNET_GE_ASSERT_FL (NULL, str != NULL, filename, linenumber);
+ res = (char *) GNUNET_xmalloc_ (strlen (str) + 1, filename, linenumber);
memcpy (res, str, strlen (str) + 1);
return res;
}
@@ -155,15 +147,14 @@
GNUNET_xgrow_ (void **old,
size_t elementSize,
unsigned int *oldCount,
- unsigned int newCount,
- const char *filename, int linenumber, const char *function)
+ unsigned int newCount, const char *filename, int linenumber)
{
void *tmp;
size_t size;
- GNUNET_GE_ASSERT_FLF (NULL,
- INT_MAX / elementSize > newCount,
- filename, linenumber, function);
+ GNUNET_GE_ASSERT_FL (NULL,
+ INT_MAX / elementSize > newCount,
+ filename, linenumber);
size = newCount * elementSize;
if (size == 0)
{
@@ -171,7 +162,7 @@
}
else
{
- tmp = GNUNET_xmalloc_ (size, filename, linenumber, function);
+ tmp = GNUNET_xmalloc_ (size, filename, linenumber);
GNUNET_GE_ASSERT (NULL, tmp != NULL);
memset (tmp, 0, size); /* client code should not rely on this,
though... */
if (*oldCount > newCount)
@@ -181,7 +172,7 @@
if (*old != NULL)
{
- GNUNET_xfree_ (*old, filename, linenumber, function);
+ GNUNET_xfree_ (*old, filename, linenumber);
}
*old = tmp;
*oldCount = newCount;
Modified: GNUnet/src/util/threads/mutex.c
===================================================================
--- GNUnet/src/util/threads/mutex.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/threads/mutex.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -23,10 +23,10 @@
* @brief implementation of mutual exclusion
*/
+#include "platform.h"
#include "gnunet_util_threads.h"
#include "gnunet_util_error.h"
#include "gnunet_util_string.h"
-#include "platform.h"
#if SOLARIS || GNUNET_freeBSD || OSX
#include <semaphore.h>
@@ -134,7 +134,7 @@
GNUNET_CronTime start;
GNUNET_CronTime end;
- GNUNET_GE_ASSERT_FLF (NULL, mutex != NULL, file, line, __FUNCTION__);
+ GNUNET_GE_ASSERT_FL (NULL, mutex != NULL, file, line);
start = GNUNET_get_time ();
ret = pthread_mutex_lock (&mutex->pt);
end = GNUNET_get_time ();
@@ -159,7 +159,7 @@
GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
| GNUNET_GE_IMMEDIATE, _("Deadlock due to `%s'.\n"),
"pthread_mutex_lock");
- GNUNET_GE_ASSERT_FLF (NULL, 0, file, line, __FUNCTION__);
+ GNUNET_GE_ASSERT_FL (NULL, 0, file, line);
}
if (mutex->locked_depth++ == 0)
{
Modified: GNUnet/src/util/threads/pthread.c
===================================================================
--- GNUnet/src/util/threads/pthread.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/threads/pthread.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -23,10 +23,10 @@
* @brief implementation of pthread start/join/sleep
*/
+#include "platform.h"
#include "gnunet_util_threads.h"
#include "gnunet_util_error.h"
#include "gnunet_util_string.h"
-#include "platform.h"
#if SOLARIS || GNUNET_freeBSD || OSX
#include <semaphore.h>
Modified: GNUnet/src/util/threads/semaphore.c
===================================================================
--- GNUnet/src/util/threads/semaphore.c 2008-06-08 02:24:35 UTC (rev 7084)
+++ GNUnet/src/util/threads/semaphore.c 2008-06-08 03:25:59 UTC (rev 7085)
@@ -19,17 +19,17 @@
*/
/**
- * @file util/pthreads/semaphore.c
+ * @file util/threads/semaphore.c
* @brief functions related to threading and synchronization
*
* In particular, functions for mutexes, semaphores
* and thread creation are provided.
*/
+#include "platform.h"
#include "gnunet_util_threads.h"
#include "gnunet_util_error.h"
#include "gnunet_util_string.h"
-#include "platform.h"
#if SOLARIS || GNUNET_freeBSD || OSX
#include <semaphore.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7085 - in GNUnet: libltdl src/applications/advertising src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/lib src/applications/fs/namespace src/applications/fs/tools src/applications/fs/uritrack src/applications/identity src/applications/rpc src/applications/sqstore_mysql src/applications/state src/applications/testing src/applications/transport src/include src/server src/setup src/setup/gtk src/setup/lib src/setup/ncurses src/setup/qt src/setup/text src/transports src/util/boot src/util/config src/util/containers src/util/crypto src/util/getopt src/util/loggers src/util/network src/util/network_client src/util/os src/util/pseudonym src/util/string src/util/threads,
gnunet <=