[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3726 - in GNUnet/src: applications/advertising application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3726 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/datastore applications/fs/ecrs applications/fs/fsui applications/fs/module applications/fs/uritrack applications/gap applications/getoption applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/template applications/tracekit include server setup setup/gtk setup/lib transports util/boot util/config_impl util/disk util/loggers util/os util/string |
|
Date: |
Sun, 12 Nov 2006 00:58:10 -0800 (PST) |
Author: grothoff
Date: 2006-11-12 00:57:30 -0800 (Sun, 12 Nov 2006)
New Revision: 3726
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/bootstrap_http/httptest.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/fsui/deserialize.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/fsui.h
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/serialize.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/uritrack/callbacks.c
GNUnet/src/applications/fs/uritrack/callbacks.h
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/getoption/getoption.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_mysql/mysqltest2.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/template/gnunet-template.c
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/src/include/gnunet_protocols.h
GNUnet/src/include/platform.h
GNUnet/src/server/connection.c
GNUnet/src/server/gnunetd.c
GNUnet/src/setup/gnunet-setup.c
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/wizard_util.c
GNUnet/src/transports/tcp_old.c
GNUnet/src/util/boot/startup.c
GNUnet/src/util/config_impl/impl.c
GNUnet/src/util/disk/storage.c
GNUnet/src/util/loggers/file.c
GNUnet/src/util/os/osconfig.c
GNUnet/src/util/string/dlmalloc.c
Log:
removing whitespace
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/advertising/advertising.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -159,25 +159,25 @@
&msg->signature,
&msg->publicKey)) {
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
hash2enc(&msg->senderIdentity.hashPubKey,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("hello message from `%s' invalid (signature invalid).
Dropping.\n"),
(char*)&enc);
return SYSERR; /* message invalid */
}
if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_HELLO_EXPIRES) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("hello message received invalid (expiration time over limit).
Dropping.\n"));
return SYSERR;
}
if (SYSERR == transport->verifyhello(msg)) {
#if DEBUG_ADVERTISING
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_BULK | GE_USER,
_("hello transport verification failed (%u).\n"),
ntohs(msg->protocol));
@@ -187,7 +187,7 @@
if (stats != NULL)
stats->change(stat_hello_in, 1);
#if DEBUG_ADVERTISING
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_REQUEST | GE_USER,
_("hello advertisement for protocol %d received.\n"),
ntohs(msg->protocol));
@@ -226,13 +226,13 @@
identity->addHost(msg);
FREE(copy);
return OK;
- }
+ }
#if DEBUG_ADVERTISING
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"advertised hello differs from prior knowledge,"
" requireing ping-pong confirmation.\n");
-#endif
+#endif
FREE(copy);
}
@@ -255,7 +255,7 @@
a couple of lines above would need some minor
editing :-). */
#if DEBUG_ADVERTISING
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_BULK | GE_USER,
"Private network, discarding unknown advertisements\n");
#endif
@@ -277,7 +277,7 @@
we don't want to follow that up with massive
hello-ing by ourselves. */
#if DEBUG_ADVERTISING
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_BULK | GE_USER,
"Not enough resources to verify hello at this time (%u * %u < %u *
100)\n",
(unsigned int) ((now - lasthelloMsg) / cronSECONDS),
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/bootstrap_http/http.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -224,18 +224,18 @@
CURL_EASY_SETOPT(curl,
CURLOPT_URL,
&url[pos]);
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_USER | GE_BULK,
- _("Trying to download hostlist from `%s'\n"),
+ _("Trying to download hostlist from `%s'\n"),
&url[pos]);
- if (strlen(proxy) > 0)
+ if (strlen(proxy) > 0)
CURL_EASY_SETOPT(curl,
CURLOPT_PROXY,
proxy);
CURL_EASY_SETOPT(curl,
CURLOPT_BUFFERSIZE,
1024); /* a bit more than one HELLO */
- if (0 == strncmp(&url[pos], "http", 4))
+ if (0 == strncmp(&url[pos], "http", 4))
CURL_EASY_SETOPT(curl,
CURLOPT_USERAGENT,
"GNUnet");
@@ -244,12 +244,12 @@
CURLOPT_CONNECTTIMEOUT,
15L);
/* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
+ setting NOSIGNAL results in really weird
crashes on my system! */
CURL_EASY_SETOPT(curl,
CURLOPT_NOSIGNAL,
1);
-#endif
+#endif
#if USE_MULTI
multi = curl_multi_init();
if (multi == NULL) {
@@ -258,9 +258,9 @@
}
mret = curl_multi_add_handle(multi, curl);
if (mret != CURLM_OK) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_add_handle",
__FILE__,
__LINE__,
@@ -278,9 +278,9 @@
&es,
&max);
if (mret != CURLM_OK) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_fdset",
__FILE__,
__LINE__,
@@ -302,19 +302,19 @@
do {
running = 0;
mret = curl_multi_perform(multi, &running);
- if (running == 0) {
+ if (running == 0) {
do {
msg = curl_multi_info_read(multi,
&running);
GE_BREAK(ectx, msg != NULL);
- if (msg == NULL)
+ if (msg == NULL)
break;
switch (msg->msg) {
case CURLMSG_DONE:
- if (msg->data.result != CURLE_OK)
- GE_LOG(ectx,
+ if (msg->data.result != CURLE_OK)
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_perform",
__FILE__,
__LINE__,
@@ -330,9 +330,9 @@
(YES == termTest(targ)) );
if ( (mret != CURLM_OK) &&
(mret != CURLM_CALL_MULTI_PERFORM) ) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_perform",
__FILE__,
__LINE__,
@@ -344,9 +344,9 @@
}
mret = curl_multi_remove_handle(multi, curl);
if (mret != CURLM_OK) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_DEVELOPER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_remove_handle",
__FILE__,
__LINE__,
@@ -355,10 +355,10 @@
}
#else
ret = curl_easy_perform(curl);
- if (ret != CURLE_OK)
- GE_LOG(ectx,
+ if (ret != CURLE_OK)
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_DEVELOPER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_easy_perform",
__FILE__,
__LINE__,
@@ -367,10 +367,10 @@
curl_easy_cleanup(curl);
#if USE_MULTI
mret = curl_multi_cleanup(multi);
- if (mret != CURLM_OK)
- GE_LOG(ectx,
+ if (mret != CURLM_OK)
+ GE_LOG(ectx,
GE_ERROR | GE_ADMIN | GE_DEVELOPER | GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
+ _("%s failed at %s:%d: `%s'\n"),
"curl_multi_cleanup",
__FILE__,
__LINE__,
@@ -392,7 +392,7 @@
curl_multi_cleanup(multi);
#endif
FREE(url);
- FREE(proxy);
+ FREE(proxy);
curl_global_cleanup();
}
Modified: GNUnet/src/applications/bootstrap_http/httptest.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/httptest.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/bootstrap_http/httptest.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -36,7 +36,7 @@
Bootstrap_ServiceAPI *
provide_module_bootstrap(CoreAPIForApplication * capi);
-
+
static void * rs(const char * name) { return NULL; }
static int rsx(void * s) { return OK; }
@@ -57,7 +57,7 @@
static void * pt(void * b) {
Bootstrap_ServiceAPI * boot = b;
-
+
boot->bootstrap(&hello,
NULL,
&terminate,
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/datastore/datastore.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -84,7 +84,7 @@
#if DEBUG_DATASTORE
EncName enc;
- IF_GELOG(coreAPI->ectx,
+ IF_GELOG(coreAPI->ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
@@ -114,7 +114,7 @@
GE_WARNING | GE_BULK | GE_USER,
hash2enc(query,
&enc));
- GE_LOG(coreAPI->ectx,
+ GE_LOG(coreAPI->ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Availability test failed for `%s' at %s:%d.\n"),
&enc,
@@ -126,7 +126,7 @@
makeUnavailable(query); /* update filter! */
available += ntohl(value->size);
#if DEBUG_DATASTORE
- IF_GELOG(coreAPI->ectx,
+ IF_GELOG(coreAPI->ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
@@ -136,7 +136,7 @@
&enc);
#endif
} else {
- IF_GELOG(coreAPI->ectx,
+ IF_GELOG(coreAPI->ectx,
GE_WARNING | GE_BULK | GE_USER,
hash2enc(query,
&enc));
@@ -284,10 +284,10 @@
if (get_time() < ntohll(value->expirationTime))
return SYSERR; /* not expired */
ret = sq->del(key, value);
- if (ret != SYSERR)
+ if (ret != SYSERR)
available += ntohl(value->size);
if ( (available > 0) &&
- (available >= MIN_FREE) )
+ (available >= MIN_FREE) )
return SYSERR;
return OK;
}
@@ -299,7 +299,7 @@
minPriority = ntohl(value->prio);
ret = sq->del(key, value);
- if (ret != SYSERR)
+ if (ret != SYSERR)
available += ntohl(value->size);
if ( (available > 0) &&
(available >= MIN_FREE) )
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/ecrs/download.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -1103,11 +1103,11 @@
}
#if DEBUG_DOWNLOAD
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&entry->node->chk.query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Starting FS search for %s:%llu:%u `%s'\n",
entry->node->ctx->ioc->filename,
Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/fs/fsui/deserialize.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -131,7 +131,7 @@
*
* @return OK on success, SYSERR on error
*/
-static struct ECRS_MetaData *
+static struct ECRS_MetaData *
read_meta(struct GE_Context * ectx,
int fd) {
unsigned int size;
@@ -140,7 +140,7 @@
if (read_int(fd, (int*)&size) != OK) {
GE_BREAK(ectx, 0);
- return NULL;
+ return NULL;
}
if (size > 1024 * 1024) {
GE_BREAK(ectx, 0);
@@ -201,7 +201,7 @@
* @return NULL on error AND on read of empty
* list (these two cannot be distinguished)
*/
-static FSUI_DownloadList *
+static FSUI_DownloadList *
readDownloadList(struct GE_Context * ectx,
int fd,
FSUI_Context * ctx,
@@ -233,7 +233,7 @@
(OK != read_long(fd, (long long*) &ret->runTime)) ||
(OK != read_int(fd, (int*) &big)) ||
(big > 1024 * 1024) ) {
- GE_BREAK(NULL, 0);
+ GE_BREAK(NULL, 0);
FREE(ret);
return NULL;
}
@@ -541,7 +541,7 @@
int big;
int bag;
struct GE_Context * ectx;
-
+
ectx = ctx->ectx;
GE_ASSERT(ectx, shared != NULL);
while (1) {
@@ -578,7 +578,7 @@
if ( (big & 4) == 4) {
l.keywords = read_uri(ctx->ectx, fd);
if (l.keywords == NULL) {
- if (l.uri != NULL)
+ if (l.uri != NULL)
ECRS_freeUri(l.uri);
GE_BREAK(NULL, 0);
break;
@@ -587,14 +587,14 @@
if ( (big & 8) == 8) {
l.meta = read_meta(ctx->ectx, fd);
if (l.meta == NULL) {
- if (l.uri != NULL)
+ if (l.uri != NULL)
ECRS_freeUri(l.uri);
- if (l.keywords != NULL)
+ if (l.keywords != NULL)
ECRS_freeUri(l.keywords);
GE_BREAK(NULL, 0);
break;
}
- }
+ }
l.filename = read_string(fd, 1024*1024);
if (l.filename == NULL) {
if (l.uri != NULL)
@@ -607,8 +607,8 @@
break;
}
list = MALLOC(sizeof(struct FSUI_UploadList));
- memcpy(list,
- &l,
+ memcpy(list,
+ &l,
sizeof(struct FSUI_UploadList));
list->shared = shared;
list->parent = parent;
@@ -674,7 +674,7 @@
return SYSERR;
}
}
- shared = MALLOC(sizeof(FSUI_UploadShared));
+ shared = MALLOC(sizeof(FSUI_UploadShared));
memcpy(shared,
&sshared,
sizeof(FSUI_UploadShared));
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -130,7 +130,7 @@
ret->cctx = ctx->ecb(ctx->ecbClosure, &event);
if (ret->child != NULL)
signalUploadResume(ret->child,
- ctx);
+ ctx);
ret = ret->next;
}
}
@@ -246,7 +246,7 @@
event.data.SearchResumed.anonymityLevel = list->anonymityLevel;
event.data.SearchResumed.searchURI = list->uri;
event.data.SearchResumed.state = list->state;
- list->cctx = cb(closure, &event);
+ list->cctx = cb(closure, &event);
list = list->next;
}
/* 2c) signal upload restarts */
@@ -263,7 +263,7 @@
event.data.UnindexResumed.eta = 0; /* FIXME: use start_time for estimate!
*/
event.data.UnindexResumed.filename = xlist->filename;
event.data.UnindexResumed.state = xlist->state;
- xlist->cctx = cb(closure, &event);
+ xlist->cctx = cb(closure, &event);
xlist = xlist->next;
}
@@ -333,7 +333,7 @@
event.data.DownloadSuspended.dc.pcctx = list->parent->cctx;
event.data.DownloadSuspended.dc.spos = list->search;
event.data.DownloadSuspended.dc.sctx = list->search == NULL ? NULL :
list->search->cctx;
- ctx->ecb(ctx->ecbClosure, &event);
+ ctx->ecb(ctx->ecbClosure, &event);
list = list->next;
}
}
@@ -354,7 +354,7 @@
event.data.UploadSuspended.uc.cctx = upos->cctx;
event.data.UploadSuspended.uc.ppos = upos->parent;
event.data.UploadSuspended.uc.pcctx = upos->parent->cctx;
- ctx->ecb(ctx->ecbClosure, &event);
+ ctx->ecb(ctx->ecbClosure, &event);
upos = upos->next;
}
}
Modified: GNUnet/src/applications/fs/fsui/fsui.h
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.h 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/fsui.h 2006-11-12 08:57:30 UTC (rev
3726)
@@ -126,7 +126,7 @@
/**
* Number of downloads associated with this search.
- */
+ */
unsigned int my_downloads_size;
/**
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -137,7 +137,7 @@
if (ECRS_equalsUri(fi->uri,
pos->resultsReceived[i].uri)) {
#if DEBUG_SEARCH
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result that I have seen before.\n");
#endif
@@ -170,7 +170,7 @@
}
if (rp->matchingKeyCount + 1 == pos->numberOfURIKeys) {
#if DEBUG_SEARCH
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (showing client)!\n");
#endif
@@ -214,7 +214,7 @@
1);
rp->matchingKeys[0] = *key;
#if DEBUG_SEARCH
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (waiting for %u more keys before showing
client).\n",
pos->numberOfURIKeys - rp->matchingKeyCount);
@@ -222,7 +222,7 @@
return OK;
} else {
#if DEBUG_SEARCH
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (showing client)!\n");
#endif
@@ -357,10 +357,10 @@
sl->state = FSUI_ABORTED_JOINED;
return OK;
}
- if (sl->state != FSUI_ACTIVE)
+ if (sl->state != FSUI_ACTIVE)
return SYSERR;
sl->state = FSUI_ABORTED;
- PTHREAD_STOP_SLEEP(sl->handle);
+ PTHREAD_STOP_SLEEP(sl->handle);
return OK;
}
Modified: GNUnet/src/applications/fs/fsui/serialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serialize.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/serialize.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -151,7 +151,7 @@
WRITESTRING(fd, list->filename);
writeFileInfo(ectx,
- fd,
+ fd,
&list->fi);
for (i=0;i<list->completedDownloadsCount;i++)
writeURI(fd, list->completedDownloads[i]);
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -131,7 +131,7 @@
utc->filename,
&size,
YES)) {
- GE_BREAK(utc->ctx->ectx, 0);
+ GE_BREAK(utc->ctx->ectx, 0);
size = 0;
}
event.type = FSUI_unindex_started;
@@ -260,7 +260,7 @@
PTHREAD_JOIN(dl->handle,
&unused);
dl->state++; /* add _JOINED */
- }
+ }
event.type = FSUI_unindex_stopped;
event.data.UnindexStopped.uc.pos = dl;
event.data.UnindexStopped.uc.cctx = dl->cctx;
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -342,7 +342,7 @@
*/
static void * FSUI_uploadThreadEvent(void * cls) {
FSUI_UploadList * utc = cls;
-
+
if (utc->parent == &utc->shared->ctx->activeUploads) {
/* top-level call: signal client! */
signalUploadStarted(utc, 1);
@@ -639,7 +639,7 @@
PTHREAD_JOIN(ul->shared->handle,
&unused);
ul->state++; /* add _JOINED */
- }
+ }
signalUploadStopped(ul, 1);
shared = ul->shared;
freeUploadList(ul);
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/fs/module/fs.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -189,11 +189,11 @@
}
processResponse(query, dv);
#if DEBUG_FS
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS received GAP-PUT request (query: `%s')\n",
&enc);
@@ -217,7 +217,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Found reply to query `%s'.\n",
&enc);
@@ -261,7 +261,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&rs->query[0],
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS received QUERY STOP (query: `%s')\n",
&enc);
@@ -319,7 +319,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST INSERT (query: `%s', type: %u, priority %u)\n",
&enc,
@@ -407,7 +407,7 @@
FREE(fn);
#if DEBUG_FS
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Sending confirmation (%s) of index initialization request to
client\n",
ret == OK ? "success" : "failure");
@@ -440,7 +440,7 @@
ntohs(ri->header.size) -
sizeof(CS_fs_request_index_MESSAGE),
(const DBlock*) &ri[1]);
#if DEBUG_FS
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Sending confirmation (%s) of index request to client\n",
ret == OK ? "success" : "failure");
@@ -476,7 +476,7 @@
}
*comp = *value; /* make copy! */
#if DEBUG_FS
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found value that matches.\n",
__FUNCTION__);
@@ -569,7 +569,7 @@
}
ru = (CS_fs_request_unindex_MESSAGE*) req;
#if DEBUG_FS
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST UNINDEX\n");
#endif
@@ -655,7 +655,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Converting reply for query `%s' for gap.\n",
&enc);
@@ -681,7 +681,7 @@
GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (datum not
applicable).\n",
&enc);
@@ -693,7 +693,7 @@
GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (type not
applicable).\n",
&enc);
@@ -719,7 +719,7 @@
GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (insufficient cover
traffic).\n",
&enc);
@@ -773,11 +773,11 @@
#if DEBUG_FS
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&keys[0],
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"GAP requests content for `%s' of type %u\n",
&enc,
@@ -1119,11 +1119,11 @@
}
rs = (const CS_fs_request_search_MESSAGE*) req;
#if DEBUG_FS
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&rs->query[0],
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS received QUERY START (query: `%s', ttl %llu, priority %u,
anonymity %u)\n",
&enc,
@@ -1148,7 +1148,7 @@
&done);
if (done == YES) {
#if DEBUG_FS
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"FS successfully took GAP shortcut for `%s'.\n",
&enc);
@@ -1328,7 +1328,7 @@
doneMigration();
if (dht != NULL) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_REQUEST | GE_USER,
"Leaving DHT (this may take a while).");
dht->leave(&dht_table);
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -316,7 +316,7 @@
#if DEBUG_ONDEMAND
hash2enc(query,
&enc);
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
_("Indexed file disappeared, deleting block for query `%s'\n"),
&enc);
@@ -368,8 +368,8 @@
struct stat linkStat;
GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
- "open",
+ GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
+ "open",
fn);
/* Is the symlink there? */
@@ -496,8 +496,8 @@
FREE(db);
FREE(fn);
if (ret == SYSERR) {
- GE_LOG(ectx,
- GE_ERROR | GE_BULK | GE_USER,
+ GE_LOG(ectx,
+ GE_ERROR | GE_BULK | GE_USER,
"Indexed content does not match its hash.\n");
asyncDelete(datastore, dbv, query);
return SYSERR;
Modified: GNUnet/src/applications/fs/uritrack/callbacks.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/fs/uritrack/callbacks.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -36,7 +36,7 @@
struct GE_Context * ectx;
struct GC_Configuration * cfg;
-
+
ECRS_SearchProgressCallback iterator;
void * closure;
@@ -57,7 +57,7 @@
int isRoot,
void * closure) {
Callback * c = closure;
-
+
c->iterator(fi,
key,
isRoot,
Modified: GNUnet/src/applications/fs/uritrack/callbacks.h
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.h 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/fs/uritrack/callbacks.h 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -32,4 +32,4 @@
*/
void URITRACK_internal_notify(const ECRS_FileInfo * fi);
-#endif
+#endif
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/applications/gap/gap.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -785,11 +785,11 @@
#if DEBUG_GAP
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(primaryKey,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Gap queues reply to query `%s' for later use.\n",
&enc);
@@ -807,7 +807,7 @@
if (! equalsHashCode512(&ite->primaryKey,
primaryKey) ) {
#if DEBUG_GAP
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"GAP: Dropping reply, routing table has no query associated with it
(anymore)\n");
#endif
@@ -914,7 +914,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"GAP: Queueing query '%s' in slot %p\n",
&enc,
@@ -1825,20 +1825,20 @@
&peers,
&sizes,
&timevect)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Failed to get traffic stats.\n"));
return SYSERR;
}
if (anonymityLevel > 1000) {
if (peers < anonymityLevel / 1000) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
return SYSERR;
}
if (count < anonymityLevel % 1000) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
return SYSERR;
@@ -1962,7 +1962,7 @@
hash2enc(&sender->hashPubKey,
&enc));
}
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping query from %s, this peer is too busy.\n",
sender == NULL ? "localhost" : (char*)&enc);
@@ -2016,7 +2016,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&qmsg->queries[0],
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Received GAP query `%s'.\n",
&enc);
@@ -2031,7 +2031,7 @@
hash2enc(&sender->hashPubKey,
&enc));
}
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping query from %s, policy decided that this peer is too
busy.\n",
sender == NULL ? "localhost" : (const char*) &enc);
Modified: GNUnet/src/applications/getoption/getoption.c
===================================================================
--- GNUnet/src/applications/getoption/getoption.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/getoption/getoption.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -48,7 +48,7 @@
val = NULL;
if (NO == GC_have_configuration_value(coreAPI->cfg,
req->section,
- req->option))
+ req->option))
return SYSERR; /* signal error: option not set */
if ( (0 != GC_get_configuration_value_string(coreAPI->cfg,
req->section,
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/applications/session/connect.c 2006-11-12 08:57:30 UTC (rev
3726)
@@ -170,7 +170,7 @@
"LIMIT-ALLOW",
"",
&limited);
- if (strlen(limited) > 0) {
+ if (strlen(limited) > 0) {
hash2enc(&hostId->hashPubKey,
&enc);
if (NULL == strstr(limited,
@@ -198,7 +198,7 @@
if (NULL != strstr(limited,
(char*) &enc)) {
#if DEBUG_SESSION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
"Connection from peer `%s' was rejected.\n",
&enc);
@@ -216,7 +216,7 @@
&sks->signature)) {
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_INFO | GE_USER | GE_REQUEST,
hash2enc(&hostId->hashPubKey,
&enc));
@@ -258,7 +258,7 @@
YES);
/* create and encrypt sessionkey */
if (NULL == foreignHelo) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_USER | GE_REQUEST,
_("Cannot encrypt sessionkey, other peer not known!\n"));
return NULL; /* other host not known */
@@ -295,7 +295,7 @@
msg->header.size = htons(size);
msg->header.type = htons(P2P_PROTO_setkey);
msg->creationTime = htonl(created);
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
SYSERR !=
identity->signData(msg,
sizeof(P2P_setkey_MESSAGE)
@@ -303,7 +303,7 @@
&msg->signature));
#if EXTRA_CHECKS
/* verify signature/SKS */
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
SYSERR != verifySKS(coreAPI->myIdentity,
msg));
#endif
@@ -411,7 +411,7 @@
age = TIME(NULL);
makeSessionkey(&sk);
#if DEBUG_SESSION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
"Created fresh sessionkey `%s'.\n",
printSKEY(&sk));
@@ -702,7 +702,7 @@
#if DEBUG_SESSION
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
hash2enc(&peer->hashPubKey,
&enc));
@@ -710,7 +710,7 @@
if ( (topology != NULL) &&
(topology->allowConnectionFrom(peer) == SYSERR) ) {
#if DEBUG_SESSION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
"Topology rejected connecting to `%s'.\n",
&enc);
@@ -719,7 +719,7 @@
}
if (coreAPI->queryBPMfromPeer(peer) != 0) {
#if DEBUG_SESSION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
"Connection to `%s' already up (have BPM limit)\n",
&enc);
@@ -727,7 +727,7 @@
return YES; /* trivial case */
}
#if DEBUG_SESSION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_USER | GE_REQUEST,
"Trying to exchange key with `%s'.\n",
&enc);
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -255,7 +255,7 @@
(lens[6] != contentSize) ) {
char scratch[512];
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("mysql datastore"));
@@ -470,7 +470,7 @@
dbhI->prepare = YES;
} else
dbhI->prepare = NO;
- dbhI->DATABASE_Lock_ = MUTEX_CREATE(NO);
+ dbhI->DATABASE_Lock_ = MUTEX_CREATE(NO);
return OK;
}
@@ -532,7 +532,7 @@
MUTEX_LOCK(dbhI.DATABASE_Lock_);
mysql_query(dbhI.dbf,
- "SET AUTOCOMMIT = 0");
+ "SET AUTOCOMMIT = 0");
mysql_query(dbhI.dbf,
"SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED");
if (type==0) {
@@ -554,7 +554,7 @@
scratch);
FREE(scratch);
if (mysql_error(dbhI.dbf)[0]) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
"mysql_query",
&dbhI);
MUTEX_UNLOCK(dbhI.DATABASE_Lock_);
@@ -585,8 +585,8 @@
count++;
}
if (mysql_error(dbhI.dbf)[0]) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
- "mysql_query",
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ "mysql_query",
&dbhI);
mysql_free_result(sql_res);
MUTEX_UNLOCK(dbhI.DATABASE_Lock_);
@@ -646,8 +646,8 @@
scratch);
FREE(scratch);
if (mysql_error(dbhI.dbf)[0]) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
- "mysql_query",
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ "mysql_query",
&dbhI);
MUTEX_UNLOCK(dbhI.DATABASE_Lock_);
iclose(&dbhI);
@@ -668,8 +668,8 @@
return count;
}
if ( (iter != NULL) &&
- (SYSERR == iter(&datum->key,
- &datum->value,
+ (SYSERR == iter(&datum->key,
+ &datum->value,
closure) ) ) {
count = SYSERR;
FREE(datum);
@@ -679,8 +679,8 @@
count++;
}
if (mysql_error(dbhI.dbf)[0]) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
- "mysql_query",
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ "mysql_query",
&dbhI);
mysql_free_result(sql_res);
MUTEX_UNLOCK(dbhI.DATABASE_Lock_);
@@ -731,11 +731,11 @@
return iterateLowPriority(type, iter, closure);
#if DEBUG_MYSQL
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL looks for `%s' of type %u\n",
&enc,
@@ -760,7 +760,7 @@
GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 2);
sql_res = mysql_stmt_result_metadata(stmt);
if (! sql_res) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_result_metadata",
@@ -776,7 +776,7 @@
}
if (mysql_stmt_bind_param(stmt,
dbh->sbind)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
@@ -786,7 +786,7 @@
return SYSERR;
}
if (mysql_stmt_execute(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
@@ -822,7 +822,7 @@
return SYSERR;
}
if (mysql_stmt_store_result(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_store_result",
@@ -840,7 +840,7 @@
char scratch[512];
mysql_free_result(sql_res);
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("mysql datastore"));
@@ -864,7 +864,7 @@
datum->anonymityLevel = htonl(level);
datum->expirationTime = htonll(expiration);
#if DEBUG_MYSQL
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Found in database block with type %u.\n",
ntohl(*(int*)&datum[1]));
@@ -879,7 +879,7 @@
datasize = MAX_DATUM_SIZE;
}
if (mysql_stmt_errno(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_fetch",
@@ -891,19 +891,19 @@
MUTEX_UNLOCK(dbh->DATABASE_Lock_);
#if DEBUG_MYSQL
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
if (count > 0) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL found %d results for `%s' of type %u.\n",
count,
&enc,
type);
} else {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL iteration aborted looking for `%s' of type %u.\n",
&enc,
@@ -944,11 +944,11 @@
level = ntohl(value->anonymityLevel);
expiration = ntohll(value->expirationTime);
#if DEBUG_MYSQL
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Storing in database block with type %u and key %s.\n",
type,
@@ -966,7 +966,7 @@
if (mysql_stmt_bind_param(dbh->insert,
dbh->bind)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
@@ -977,7 +977,7 @@
}
if (mysql_stmt_execute(dbh->insert)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
@@ -1020,7 +1020,7 @@
#if DEBUG_MYSQL
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
@@ -1033,15 +1033,15 @@
MUTEX_LOCK(dbh->DATABASE_Lock_);
twenty = sizeof(HashCode512);
svalue = NULL;
- if (value == NULL) {
+ if (value == NULL) {
stmt = dbh->deleteh;
dbh->dbind[0].buffer = (char*) key;
dbh->dbind[0].length = &twenty;
GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 1);
-
+
sql_res = mysql_stmt_result_metadata(stmt);
if (! sql_res) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_result_metadata",
@@ -1057,7 +1057,7 @@
}
if (mysql_stmt_bind_param(stmt,
dbh->dbind)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
@@ -1067,7 +1067,7 @@
return SYSERR;
}
if (mysql_stmt_execute(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
@@ -1102,7 +1102,7 @@
return SYSERR;
}
if (mysql_stmt_store_result(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_store_result",
@@ -1114,7 +1114,7 @@
}
datasize = MAX_DATUM_SIZE;
if (0 != mysql_stmt_fetch(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_fetch",
@@ -1129,7 +1129,7 @@
char scratch[512];
mysql_free_result(sql_res);
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("mysql datastore"));
@@ -1139,7 +1139,7 @@
sizeof(HashCode512),
sizeof(Datastore_Value));
if (0 != mysql_query(dbh->dbf, scratch))
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
"mysql_query", dbh);
FREE(svalue);
MUTEX_UNLOCK(dbh->DATABASE_Lock_);
@@ -1177,7 +1177,7 @@
GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 7);
if (mysql_stmt_bind_param(stmt,
dbh->dbind)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
@@ -1189,7 +1189,7 @@
return SYSERR;
}
if (mysql_stmt_execute(stmt)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
@@ -1203,7 +1203,7 @@
count = mysql_stmt_affected_rows(stmt);
MUTEX_UNLOCK(dbh->DATABASE_Lock_);
#if DEBUG_MYSQL
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL DELETE operation affected %d rows.\n",
count);
@@ -1252,7 +1252,7 @@
* at all in this context.)
*/
if (mysql_stmt_execute(dbh->update)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
@@ -1273,7 +1273,7 @@
*/
static unsigned long long getSize() {
unsigned long long ret;
-
+
MUTEX_LOCK(lock);
ret = content_size;
if (stats)
@@ -1290,7 +1290,7 @@
mysql_query(dbh->dbf,
"DROP TABLE gn070");
if (mysql_error(dbh->dbf)[0]) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
"mysql_query",
dbh);
} else
@@ -1349,9 +1349,9 @@
cnffile);
fp = FOPEN(cnffile, "r");
if (!fp) {
- GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_ADMIN | GE_BULK,
- "fopen",
+ GE_LOG_STRERROR_FILE(ectx,
+ GE_ERROR | GE_ADMIN | GE_BULK,
+ "fopen",
cnffile);
if (stats != NULL)
coreAPI->releaseService(stats);
@@ -1366,7 +1366,7 @@
if (OK != iopen(dbh, YES)) {
FREE(cnffile);
FREE(dbh);
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("Failed to load MySQL database module. Check that MySQL is
running and configured properly!\n"));
dbh = NULL;
@@ -1390,7 +1390,7 @@
if ( (mysql_error(dbh->dbf)[0]) ||
(!(sql_res=mysql_use_result(dbh->dbf))) ||
(!(sql_row=mysql_fetch_row(sql_res))) ) {
- LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
+ LOG_MYSQL(GE_ERROR | GE_ADMIN | GE_BULK,
"mysql_query",
dbh);
content_size = 0;
@@ -1402,7 +1402,7 @@
} else {
content_size = *sb;
FREE(sb);
- /* no longer valid! remember it by deleting
+ /* no longer valid! remember it by deleting
the outdated state file! */
state->unlink(ectx,
"mysql-size");
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest2.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -27,15 +27,15 @@
* This is iterated 10 times, with the actual size of the content stored,
* the database size reported and the file size on disk being printed for
* each iteration. The code also prints a "I" for every 40 blocks
- * inserted and a "D" for every 40 blocks deleted. The deletion
+ * inserted and a "D" for every 40 blocks deleted. The deletion
* strategy alternates between "lowest priority" and "earliest expiration".
- * Priorities and expiration dates are set using a pseudo-random value
+ * Priorities and expiration dates are set using a pseudo-random value
* within a realistic range.
* <p>
*
* Note that the disk overhead calculations are not very sane for
* MySQL: we take the entire /var/lib/mysql directory (best we can
- * do for ISAM), which may contain other data and which never
+ * do for ISAM), which may contain other data and which never
* shrinks. The scanning of the entire mysql directory during
* each report is also likely to be the cause of a minor
* slowdown compared to sqlite.<p>
@@ -62,7 +62,7 @@
* <pre>
* 4: 60 at 7k ops total
* 8: 50 at 3k ops total
- * 16: 48 at 8k ops total
+ * 16: 48 at 8k ops total
* 32: 46 at 8k ops total
* 64: 61 at 9k ops total
* 128: 89 at 9k ops total
@@ -70,7 +70,7 @@
* </pre>
* Pure insertion performance into an empty DB initially peaks
* at about 400 ops. The performance seems to drop especially
- * once the existing (fragmented) ISAM space is filled up and
+ * once the existing (fragmented) ISAM space is filled up and
* the DB needs to grow on disk. This could be explained with
* ISAM looking more carefully for defragmentation opportunities.
* <p>
@@ -91,7 +91,7 @@
#define REPORT_ID NO
/**
- * Number of put operations equivalent to 1/10th of MAX_SIZE
+ * Number of put operations equivalent to 1/10th of MAX_SIZE
*/
#define PUT_10 MAX_SIZE / 32 / 1024 / 10
@@ -110,7 +110,7 @@
/**
* Name of the database on disk. FIXME!
* You may have to adjust this path and the access
- * permission to the respective directory in order
+ * permission to the respective directory in order
* to obtain all of the performance information.
*/
#define DB_NAME "/var/lib/mysql"
@@ -129,7 +129,7 @@
size_t size;
static HashCode512 key;
static int ic;
-
+
/* most content is 32k */
size = sizeof(Datastore_Value) + 32 * 1024;
if (weak_randomi(16) == 0) /* but some of it is less! */
@@ -146,8 +146,8 @@
value->prio = htonl(weak_randomi(100));
value->anonymityLevel = htonl(i);
value->expirationTime = htonll(get_time() + weak_randomi(1000));
- memset(&value[1],
- i,
+ memset(&value[1],
+ i,
size - sizeof(Datastore_Value));
if (OK != api->put(&key, value)) {
FREE(value);
@@ -166,7 +166,7 @@
return OK;
}
-static int
+static int
iterateDelete(const HashCode512 * key,
const Datastore_Value * val,
void * cls) {
@@ -215,7 +215,7 @@
if ((i % 2) == 0)
api->iterateLowPriority(0, &iterateDelete, api);
else
- api->iterateExpirationTime(0, &iterateDelete, api);
+ api->iterateExpirationTime(0, &iterateDelete, api);
size = 0;
if (have_file)
@@ -233,7 +233,7 @@
size / 1024, /* disk size in kb */
(100.0 * size / stored_bytes) - 100, /* overhead */
(stored_ops * 2 - stored_entries) / 1024, /* total operations (in k)
*/
- 1000 * (stored_ops * 2 - stored_entries) / (1 + get_time() -
start_time)); /* operations per second */
+ 1000 * (stored_ops * 2 - stored_entries) / (1 + get_time() -
start_time)); /* operations per second */
if (GNUNET_SHUTDOWN_TEST() == YES)
break;
}
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -144,24 +144,24 @@
static void createIndices(sqlite3 * dbh) {
/* create indices */
- CHECK(SQLITE_OK ==
- sqlite3_exec(dbh,
+ CHECK(SQLITE_OK ==
+ sqlite3_exec(dbh,
"CREATE INDEX idx_hash ON gn070 (hash)",
NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
- sqlite3_exec(dbh,
+ CHECK(SQLITE_OK ==
+ sqlite3_exec(dbh,
"CREATE INDEX idx_prio ON gn070 (prio)",
NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
+ CHECK(SQLITE_OK ==
sqlite3_exec(dbh,
"CREATE INDEX idx_expire ON gn070 (expire)",
NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
+ CHECK(SQLITE_OK ==
sqlite3_exec(dbh,
"CREATE INDEX idx_comb1 ON gn070 (prio,expire,hash)",
NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
- sqlite3_exec(dbh,
+ CHECK(SQLITE_OK ==
+ sqlite3_exec(dbh,
"CREATE INDEX idx_comb2 ON gn070 (expire,prio,hash)",
NULL, NULL, ENULL));
}
@@ -199,19 +199,19 @@
return NULL;
}
- CHECK(SQLITE_OK ==
- sqlite3_exec(ret->dbh,
+ CHECK(SQLITE_OK ==
+ sqlite3_exec(ret->dbh,
"PRAGMA temp_store=MEMORY", NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
+ CHECK(SQLITE_OK ==
sqlite3_exec(ret->dbh,
"PRAGMA synchronous=OFF", NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
+ CHECK(SQLITE_OK ==
sqlite3_exec(ret->dbh,
"PRAGMA count_changes=OFF", NULL, NULL, ENULL));
- CHECK(SQLITE_OK ==
+ CHECK(SQLITE_OK ==
sqlite3_exec(ret->dbh,
"PRAGMA page_size=4092", NULL, NULL, ENULL));
-
+
/* We have to do it here, because otherwise precompiling SQL might fail */
sq_prepare(ret->dbh,
"Select 1 from sqlite_master where tbl_name = 'gn070'",
@@ -304,7 +304,7 @@
* Get a (good) estimate of the size of the given
* value (and its key) in the datastore.<p>
* <pre>
- * row length = hash length + block length + numbers + column count +
estimated index size + 1
+ * row length = hash length + block length + numbers + column count +
estimated index size + 1
* </pre>
*/
static unsigned int getContentDatastoreSize(const Datastore_Value * value) {
@@ -329,7 +329,7 @@
if (stats)
stats->set(stat_size, ret);
MUTEX_UNLOCK(db->DATABASE_Lock_);
- return ret * 1.06;
+ return ret * 1.06;
/* benchmarking shows 2-12% overhead */
}
@@ -337,7 +337,7 @@
* Given a full row from gn070 table
(size,type,prio,anonLevel,expire,hash,value),
* assemble it into a Datastore_Datum representation.
*/
-static Datastore_Datum *
+static Datastore_Datum *
assembleDatum(sqliteHandle * handle,
sqlite3_stmt *stmt) {
Datastore_Datum * datum;
@@ -351,7 +351,7 @@
if (contentSize < 0) {
sqlite3_stmt * stmt;
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("sqlite datastore"));
@@ -372,7 +372,7 @@
sqlite3_column_bytes(stmt, 6) != contentSize) {
sqlite3_stmt * stmt;
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("sqlite datastore"));
@@ -556,7 +556,7 @@
if (sortByPriority)
strcat(scratch,
"(expire > :4 AND prio == :5) OR prio > :6)");
- else
+ else
strcat(scratch,
"(prio > :4 AND expire == :5) OR expire > :6)");
if (type)
@@ -913,7 +913,7 @@
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Storing in database block with type %u, key `%s' and priority %u.\n",
ntohl(*(int*)&value[1]),
@@ -977,7 +977,7 @@
sqlite3_stmt *stmt;
int deleted;
sqliteHandle *dbh;
- Datastore_Datum * dvalue;
+ Datastore_Datum * dvalue;
unsigned int size;
unsigned int type;
unsigned int prio;
@@ -987,11 +987,11 @@
#if DEBUG_SQLITE
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: deleting block with key `%s'\n",
&enc);
@@ -1017,14 +1017,14 @@
1,
key,
sizeof(HashCode512),
- SQLITE_TRANSIENT);
+ SQLITE_TRANSIENT);
if (sqlite3_step(stmt) != SQLITE_ROW) {
sqlite3_finalize(stmt);
MUTEX_UNLOCK(db->DATABASE_Lock_);
return NO;
}
dvalue = assembleDatum(dbh,
- stmt);
+ stmt);
if (dvalue == NULL) {
sqlite3_finalize(stmt);
MUTEX_UNLOCK(db->DATABASE_Lock_);
@@ -1047,7 +1047,7 @@
prio = ntohl(value->prio);
anon = ntohl(value->anonymityLevel);
expir = ntohll(value->expirationTime);
-
+
sqlite3_bind_blob(stmt, 1, key, sizeof(HashCode512), SQLITE_TRANSIENT);
sqlite3_bind_blob(stmt, 2, &value[1], contentSize, SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, 3, size);
@@ -1100,11 +1100,11 @@
#if DEBUG_SQLITE
EncName enc;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: updating block with key `%s'\n",
&enc);
@@ -1175,7 +1175,7 @@
"DIR",
VAR_DAEMON_DIRECTORY "/data/fs/",
&afsdir);
- dir = MALLOC(strlen(afsdir) + strlen("/content/gnunet.dat") + 2);
+ dir = MALLOC(strlen(afsdir) + strlen("/content/gnunet.dat") + 2);
strcpy(dir, afsdir);
strcat(dir, "/content/gnunet.dat");
FREE(afsdir);
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2006-11-12
08:49:47 UTC (rev 3725)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2006-11-12
08:57:30 UTC (rev 3726)
@@ -44,8 +44,8 @@
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__,
__LINE__); goto FAILURE;} } while (0)
/**
- * Target datastore size (in bytes). Realistic sizes are
- * more like 16 GB (not the default of 16 MB); however,
+ * Target datastore size (in bytes). Realistic sizes are
+ * more like 16 GB (not the default of 16 MB); however,
* those take too long to run them in the usual "make check"
* sequence. Hence the value used for shipping is tiny.
*/
@@ -58,7 +58,7 @@
#define REPORT_ID NO
/**
- * Number of put operations equivalent to 1/10th of MAX_SIZE
+ * Number of put operations equivalent to 1/10th of MAX_SIZE
*/
#define PUT_10 MAX_SIZE / 32 / 1024 / 10
@@ -93,7 +93,7 @@
size_t size;
static HashCode512 key;
static int ic;
-
+
/* most content is 32k */
size = sizeof(Datastore_Value) + 32 * 1024;
if (weak_randomi(16) == 0) /* but some of it is less! */
@@ -110,8 +110,8 @@
value->prio = htonl(weak_randomi(100));
value->anonymityLevel = htonl(i);
value->expirationTime = htonll(get_time() + weak_randomi(1000));
- memset(&value[1],
- i,
+ memset(&value[1],
+ i,
size - sizeof(Datastore_Value));
if (OK != api->put(&key, value)) {
FREE(value);
@@ -130,19 +130,19 @@
return OK;
}
-static int
+static int
iterateDelete(const HashCode512 * key,
const Datastore_Value * val,
void * cls) {
SQstore_ServiceAPI * api = cls;
static int dc;
- if (api->getSize() < MAX_SIZE)
+ if (api->getSize() < MAX_SIZE)
return SYSERR;
if (GNUNET_SHUTDOWN_TEST() == YES)
return SYSERR;
dc++;
-#if REPORT_ID
+#if REPORT_ID
if (dc % REP_FREQ == 0)
fprintf(stderr, "D");
#endif
@@ -179,9 +179,9 @@
/* trim down below MAX_SIZE again */
if ((i % 2) == 0)
- api->iterateLowPriority(0, &iterateDelete, api);
- else
- api->iterateExpirationTime(0, &iterateDelete, api);
+ api->iterateLowPriority(0, &iterateDelete, api);
+ else
+ api->iterateExpirationTime(0, &iterateDelete, api);
/* every 10 iterations print status */
size = 0;
@@ -201,7 +201,7 @@
size / 1024, /* disk size in kb */
(100.0 * size / stored_bytes) - 100, /* overhead */
(stored_ops * 2 - stored_entries) / 1024, /* total operations (in k)
*/
- 1000 * ((stored_ops * 2 - stored_entries) - lops) / (1 + get_time()
- start_time)); /* operations per second */
+ 1000 * ((stored_ops * 2 - stored_entries) - lops) / (1 + get_time()
- start_time)); /* operations per second */
lops = stored_ops * 2 - stored_entries;
start_time = get_time();
if (GNUNET_SHUTDOWN_TEST() == YES)
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -109,7 +109,7 @@
struct GE_Context * ectx;
struct GC_Configuration * cfg;
int res;
-
+
res = GNUNET_init(argc,
argv,
"gnunet-tbench",
Modified: GNUnet/src/applications/template/gnunet-template.c
===================================================================
--- GNUnet/src/applications/template/gnunet-template.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/template/gnunet-template.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -70,7 +70,7 @@
const char ** argv) {
struct ClientServerConnection * sock;
struct PTHREAD * messageReceiveThread;
- void * unused;
+ void * unused;
struct GE_Context * ectx;
struct GC_Configuration * cfg;
int i;
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-11-12 08:49:47 UTC
(rev 3725)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-11-12 08:57:30 UTC
(rev 3726)
@@ -294,7 +294,7 @@
struct GE_Context * ectx;
struct CronManager * cron;
int res;
-
+
res = GNUNET_init(argc,
argv,
"gnunet-tracekit",
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2006-11-12 08:57:30 UTC (rev
3726)
@@ -246,7 +246,7 @@
* what is the search?
*/
struct FSUI_SearchList * spos;
-
+
/**
* If this download is associated with a search,
* what is the client context for the search?
Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h 2006-11-12 08:49:47 UTC (rev
3725)
+++ GNUnet/src/include/gnunet_protocols.h 2006-11-12 08:57:30 UTC (rev
3726)
@@ -63,12 +63,12 @@
#define NAT_PROTOCOL_NUMBER 1
/**
- * protocol number of TCP.
+ * protocol number of TCP.
*/
#define TCP_PROTOCOL_NUMBER 2
/**
- * protocol number of UDP.
+ * protocol number of UDP.
*/
#define UDP_PROTOCOL_NUMBER 3
Modified: GNUnet/src/include/platform.h
===================================================================
--- GNUnet/src/include/platform.h 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/include/platform.h 2006-11-12 08:57:30 UTC (rev 3726)
@@ -36,7 +36,7 @@
#include <sys/types.h>
#endif
-#define ALLOW_EXTRA_CHECKS NO
+#define ALLOW_EXTRA_CHECKS NO
#include "plibc.h"
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/server/connection.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -1174,9 +1174,9 @@
EncName enc;
hdr = (MESSAGE_HEADER *) entry->closure;
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
- hash2enc(&be->session.sender.hashPubKey,
+ hash2enc(&be->session.sender.hashPubKey,
&enc));
GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
@@ -1558,7 +1558,7 @@
* @param be on which connection to transmit
* @param se what to transmit (with meta-data)
*/
-static void appendToBuffer(BufferEntry * be,
+static void appendToBuffer(BufferEntry * be,
SendEntry * se) {
#if DEBUG_CONNECTION
EncName enc;
@@ -1752,7 +1752,7 @@
* @param arg the second argument to the method
* @return the number of connected hosts
*/
-static int forAllConnectedHosts(BufferEntryCallback method,
+static int forAllConnectedHosts(BufferEntryCallback method,
void *arg) {
unsigned int i;
int count = 0;
@@ -1800,7 +1800,7 @@
* @return OK (always successful)
*/
static int copyCallback(void *buf,
- void *closure,
+ void *closure,
unsigned short len) {
if(len > 0) {
memcpy(buf, closure, len);
@@ -2502,7 +2502,7 @@
stamp = ntohl(msg->timeStamp);
if(stamp + 1 * cronDAYS < TIME(NULL)) {
GE_LOG(ectx,
- GE_INFO | GE_BULK | GE_USER,
+ GE_INFO | GE_BULK | GE_USER,
_("Message received more than one day old. Dropped.\n"));
MUTEX_UNLOCK(lock);
return SYSERR;
Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/server/gnunetd.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -212,9 +212,9 @@
if (YES == debug_flag) {
ectx = GE_create_context_multiplexer(ectx,
GE_create_context_stderr(NO,
- GE_USERKIND |
- GE_EVENTKIND
|
- GE_BULK |
+ GE_USERKIND |
+ GE_EVENTKIND |
+ GE_BULK |
GE_IMMEDIATE));
}
if (OK != changeUser(ectx, cfg)) {
Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/setup/gnunet-setup.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -68,7 +68,7 @@
static void gns2cfg(struct GNS_Tree * pos) {
int i;
char * val;
-
+
if (pos == NULL)
return;
i = 0;
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -141,7 +141,7 @@
defaultNIC = wiz_is_nic_default(editCfg, name, defaultNIC);
if (defaultNIC)
gtk_combo_box_set_active(GTK_COMBO_BOX(cmbNIC), inc->nic_item_count);
-
+
return OK;
}
@@ -166,20 +166,20 @@
0);
os_list_network_interfaces(err_ctx, &insert_nic, &cls);
-
+
if (cls.nic_item_count != 0) {
GC_get_configuration_value_string(editCfg, "NETWORK", "INTERFACE", "eth0",
&val);
gtk_combo_box_append_text(GTK_COMBO_BOX(cls.cmbNIC), val);
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
+ gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
&iter);
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cls.cmbNIC), &iter);
on_cmbNIC_changedsetup_gtk(GTK_COMBO_BOX(cls.cmbNIC), NULL);
FREE(val);
}
-
+
gtk_widget_set_usize(cls.cmbNIC, 10, -1);
-
+
entIP = lookup_widget("entIP");
GC_get_configuration_value_string(editCfg, "NETWORK", "IP", "",
&val);
@@ -214,17 +214,17 @@
&val);
gtk_entry_set_text(GTK_ENTRY(entUp), val);
FREE(val);
-
+
GC_get_configuration_value_string(editCfg, "LOAD", "MAXNETDOWNBPSTOTAL",
"50000",
&val);
gtk_entry_set_text(GTK_ENTRY(entDown), val);
FREE(val);
-
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
(GC_get_configuration_value_yesno(editCfg, "LOAD", "BASICLIMITING", NO) ==
YES)
- ? radGNUnet
- : radShare ),
+ ? radGNUnet
+ : radShare ),
TRUE);
GC_get_configuration_value_string(editCfg, "LOAD", "MAXCPULOAD", "50",
@@ -304,7 +304,7 @@
gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
if (group_name != NULL)
gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
-
+
cap = os_modify_autostart(err_ctx, 1, 1, NULL, NULL, NULL);
gtk_widget_set_sensitive(entUser, cap);
#ifdef WINDOWS
@@ -335,7 +335,7 @@
&val);
gtk_entry_set_text(GTK_ENTRY(entQuota), val);
FREE(val);
-
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkMigr),
GC_get_configuration_value_yesno(editCfg, "FS",
"ACTIVEMIGRATION", YES) == YES);
@@ -405,9 +405,9 @@
gpointer user_data) {
GtkWidget * dialog;
int ok, ret;
-
+
ok = OK;
-
+
dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
@@ -426,7 +426,7 @@
default:
ok = NO;
}
-
+
if (ok)
{
quit = 1;
Modified: GNUnet/src/setup/lib/wizard_util.c
===================================================================
--- GNUnet/src/setup/lib/wizard_util.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/setup/lib/wizard_util.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -33,7 +33,7 @@
*/
int wiz_is_nic_default(struct GC_Configuration *cfg, const char *name, int
suggestion) {
char *nic;
-
+
GC_get_configuration_value_string(cfg, "NETWORK", "INTERFACE", "eth0", &nic);
#ifdef WINDOWS
@@ -49,11 +49,11 @@
{
/* The user has selected a NIC before */
int niclen, inslen;
-
+
niclen = strlen(nic);
inslen = strlen(name);
suggestion = 0;
-
+
if (inslen >= niclen)
{
#ifdef WINDOWS
@@ -79,7 +79,7 @@
int wiz_autostartService(int doAutoStart, char *username, char *groupname) {
int ret;
char *exe;
-
+
exe = os_get_installation_path(IPK_BINDIR);
exe = (char *) REALLOC(exe, strlen(exe) + 12); /* 11 = "gnunetd.exe" */
strcat(exe,
@@ -88,14 +88,14 @@
#else
"gnunetd.exe");
#endif
-
+
ret = os_modify_autostart(NULL /* FIXME 0.7.1 NILS */, 0, doAutoStart, exe,
username, groupname);
FREE(exe);
if (ret != YES) {
#ifdef WINDOWS
char *err = NULL;
-
+
switch(ret) {
case 1:
err = winErrorStr(_("Can't open Service Control Manager"),
@@ -147,7 +147,7 @@
*/
int wiz_createGroupUser(char *group_name, char *user_name) {
int ret;
-
+
ret = os_modify_user(0, 1, user_name, group_name);
if (ret) {
Modified: GNUnet/src/transports/tcp_old.c
===================================================================
--- GNUnet/src/transports/tcp_old.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/transports/tcp_old.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -705,7 +705,7 @@
&clientAddr.sin_addr,
sizeof(struct in_addr));
- createNewSession(sock);
+ createNewSession(sock);
}
}
}
@@ -1129,8 +1129,8 @@
serverSignal = SEMAPHORE_CREATE(0);
tcp_shutdown = NO;
- if (0 != PIPE(tcp_pipe))
- return SYSERR;
+ if (0 != PIPE(tcp_pipe))
+ return SYSERR;
setBlocking(tcp_pipe[1], NO);
port = getGNUnetTCPPort();
Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/boot/startup.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -32,7 +32,7 @@
#define DO_REQUEST NO
-static GE_KIND
+static GE_KIND
convertLogLevel(const char * level) {
GE_KIND ret;
@@ -54,8 +54,8 @@
/**
* Configure logging mechanism as specified by
- * user (and supported by system).
- *
+ * user (and supported by system).
+ *
* @return 0 on success, 1 on error
*/
static int configure_logging(struct GE_Context ** ectx,
@@ -113,12 +113,12 @@
FREE(admin_log_file);
if (ull != 0) {
tetx = GE_create_context_stderr(NO,
- ull
- | GE_USERKIND
+ ull
+ | GE_USERKIND
#if DO_REQUEST
| GE_REQUEST
#endif
- | GE_BULK
+ | GE_BULK
| GE_IMMEDIATE);
if (nctx == NULL)
nctx = tetx;
@@ -177,7 +177,7 @@
if (i == -1)
return -1;
if (0 != GC_parse_configuration(*cfg,
- *cfgFileName))
+ *cfgFileName))
return -1;
if (configure_logging(ectx, *cfg) != 0)
return -1;
Modified: GNUnet/src/util/config_impl/impl.c
===================================================================
--- GNUnet/src/util/config_impl/impl.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/config_impl/impl.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -750,7 +750,7 @@
orig[i] = DIR_SEPARATOR;
return orig;
}
- }
+ }
result = MALLOC(strlen(prefix) +
strlen(post) + 2);
strcpy(result, prefix);
@@ -782,9 +782,9 @@
data = cfg->data;
tmp = NULL;
ret = _get_configuration_value_string(cfg,
- section,
+ section,
option,
- def,
+ def,
&tmp);
if (tmp != NULL) {
tmp = _configuration_expand_dollar(cfg,
Modified: GNUnet/src/util/disk/storage.c
===================================================================
--- GNUnet/src/util/disk/storage.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/disk/storage.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -456,8 +456,8 @@
fn,
O_CREAT | O_WRONLY,
S_IRUSR | S_IWUSR);
- if (handle == -1) {
- FREE(fn);
+ if (handle == -1) {
+ FREE(fn);
return SYSERR;
}
GE_ASSERT(ectx,
Modified: GNUnet/src/util/loggers/file.c
===================================================================
--- GNUnet/src/util/loggers/file.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/loggers/file.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -210,7 +210,7 @@
name = getLogFileName(fctx->ectx,
fctx->basename);
if (0 != strcmp(name,
- fctx->filename)) {
+ fctx->filename)) {
fclose(fctx->handle);
fctx->handle = FOPEN(name, "a+");
FREE(fctx->filename);
Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/os/osconfig.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -254,7 +254,7 @@
return 5;
}
}
-
+
return YES;
#else
struct stat buf;
Modified: GNUnet/src/util/string/dlmalloc.c
===================================================================
--- GNUnet/src/util/string/dlmalloc.c 2006-11-12 08:49:47 UTC (rev 3725)
+++ GNUnet/src/util/string/dlmalloc.c 2006-11-12 08:57:30 UTC (rev 3726)
@@ -382,9 +382,9 @@
size_t. The value is used only if HAVE_USR_INCLUDE_MALLOC_H is not set
REALLOC_ZERO_BYTES_FREES default: not defined
- This should be set if a call to realloc with zero bytes should
- be the same as a call to free. Some people think it should. Otherwise,
- since this malloc returns a unique pointer for malloc(0), so does
+ This should be set if a call to realloc with zero bytes should
+ be the same as a call to free. Some people think it should. Otherwise,
+ since this malloc returns a unique pointer for malloc(0), so does
realloc(p, 0).
LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H
@@ -3472,7 +3472,7 @@
m->seg.sflags = mmap_flag;
m->magic = mparams.magic;
init_bins(m);
- if (is_global(m))
+ if (is_global(m))
init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);
else {
/* Offset top by embedded malloc_state */
@@ -3623,7 +3623,7 @@
}
/* Unmap any unused mmapped segments */
- if (HAVE_MMAP)
+ if (HAVE_MMAP)
released += release_unused_segments(m);
/* On failure, disable autotrim to avoid repeated failed future calls */
@@ -3831,7 +3831,7 @@
while (a < alignment) a <<= 1;
alignment = a;
}
-
+
if (bytes >= MAX_REQUEST - alignment) {
if (m != 0) { /* Test isn't needed but avoids compiler warning */
MALLOC_FAILURE_ACTION;
@@ -5076,5 +5076,5 @@
Trial version Fri Aug 28 13:14:29 1992 Doug Lea (dl at g.oswego.edu)
* Based loosely on libg++-1.2X malloc. (It retains some of the overall
structure of old version, but most details differ.)
-
+
*/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3726 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/datastore applications/fs/ecrs applications/fs/fsui applications/fs/module applications/fs/uritrack applications/gap applications/getoption applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/template applications/tracekit include server setup setup/gtk setup/lib transports util/boot util/config_impl util/disk util/loggers util/os util/string,
grothoff <=