[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2035 - in GNUnet/src: applications/advertising application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2035 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/dht/module applications/dht/tools applications/fragmentation applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/identity applications/pingpong applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/stats applications/tbench applications/testbed applications/topology_default applications/topology_f2f applications/tracekit applications/traffic applications/transport conf include server transports util util/win |
|
Date: |
Wed, 31 Aug 2005 14:26:47 -0700 (PDT) |
Author: grothoff
Date: 2005-08-31 14:26:22 -0700 (Wed, 31 Aug 2005)
New Revision: 2035
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/tools/dhttest2.c
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/fs/ecrs/directory.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/indexinfo.c
GNUnet/src/applications/fs/ecrs/keyspace.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/namespacetest.c
GNUnet/src/applications/fs/ecrs/search.c
GNUnet/src/applications/fs/ecrs/searchtest.c
GNUnet/src/applications/fs/ecrs/unindex.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/ecrs/uri.c
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/downloadtest.c
GNUnet/src/applications/fs/fsui/file_info.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/fsui.h
GNUnet/src/applications/fs/fsui/fsuitest.c
GNUnet/src/applications/fs/fsui/fsuitest2.c
GNUnet/src/applications/fs/fsui/helper.c
GNUnet/src/applications/fs/fsui/namespace_info.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/lib/fslibtest.c
GNUnet/src/applications/fs/module/anonymity.c
GNUnet/src/applications/fs/module/anonymity.h
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/migration.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/module/querymanager.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gaptest.c
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/pingpong/pingpong.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/session/sessiontest.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_mysql/mysqltest.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/stats/clientapi.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/tbench/tbenchtest.c
GNUnet/src/applications/tbench/tbenchtest_udp.c
GNUnet/src/applications/testbed/socket.c
GNUnet/src/applications/topology_default/topology.c
GNUnet/src/applications/topology_f2f/topology.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/conf/conf.c
GNUnet/src/conf/confdata.c
GNUnet/src/conf/expr.c
GNUnet/src/conf/gconf.c
GNUnet/src/conf/gnunet-setup.c
GNUnet/src/conf/gnunet-win-tool.c
GNUnet/src/conf/images.c
GNUnet/src/conf/lex.zconf.c
GNUnet/src/conf/mconf.c
GNUnet/src/conf/mconf_util.c
GNUnet/src/conf/menu.c
GNUnet/src/conf/symbol.c
GNUnet/src/conf/wizard.c
GNUnet/src/conf/wizard_callbacks.c
GNUnet/src/conf/wizard_curs.c
GNUnet/src/conf/wizard_util.c
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/src/include/gnunet_util.h
GNUnet/src/server/connection.c
GNUnet/src/server/core.c
GNUnet/src/server/gnunet-update.c
GNUnet/src/server/gnunetd.c
GNUnet/src/server/handler.c
GNUnet/src/transports/http.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/udp.c
GNUnet/src/util/configuration.c
GNUnet/src/util/daemon.c
GNUnet/src/util/daemontest.c
GNUnet/src/util/dso.c
GNUnet/src/util/hashing.c
GNUnet/src/util/initialize.c
GNUnet/src/util/kblockkey.c
GNUnet/src/util/logging.c
GNUnet/src/util/osconfig.c
GNUnet/src/util/port.c
GNUnet/src/util/statuscalls.c
GNUnet/src/util/storage.c
GNUnet/src/util/timer.c
GNUnet/src/util/weakkeytest.c
GNUnet/src/util/win/winproc.c
Log:
removing tailing whitespace
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/advertising/advertising.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -262,12 +262,12 @@
/* Establish session as advertised in the hello */
tsession = transport->connect(msg);
- if (tsession == NULL)
- return SYSERR; /* could not connect */
+ if (tsession == NULL)
+ return SYSERR; /* could not connect */
/* build message to send, ping must contain return-information,
such as a selection of our hellos... */
- mtu = transport->getMTU(tsession->ttype);
+ mtu = transport->getMTU(tsession->ttype);
if (mtu == 0) {
mtu = 2048; /* bound size */
} else {
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/bootstrap_http/http.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -111,9 +111,9 @@
port = TCP_HTTP_PORT;
}
}
-
+
hostname[curpos] = '\0'; /* terminator for hostname */
-
+
sock = SOCKET(PF_INET, SOCK_STREAM, 0);
if (sock < 0) {
LOG(LOG_ERROR,
@@ -280,7 +280,7 @@
return;
}
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"Trying to bootstrap with peers from `%s'\n",
url);
#endif
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/dht/module/cs.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -403,16 +403,16 @@
CS_dht_request_leave_MESSAGE * req;
int i;
DHT_CLIENT_TableHandlers * ptr;
-
+
if (ntohs(message->size) != sizeof(CS_dht_request_leave_MESSAGE))
return SYSERR;
req = (CS_dht_request_leave_MESSAGE*) message;
LOG(LOG_EVERYTHING,
"Client leaving request received!\n");
- MUTEX_LOCK(&csLock);
+ MUTEX_LOCK(&csLock);
for (i=0;i<csHandlersCount;i++) {
- ptr = csHandlers[i];
+ ptr = csHandlers[i];
if ( (equalsHashCode512(&ptr->table,
&req->table)) ) {
csHandlers[i] = csHandlers[csHandlersCount-1];
Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -80,7 +80,7 @@
"OPDA8F1VIKESLSNBO",
&peer2.hashPubKey));
if (OK != initUtil(argc,
- argv,
+ argv,
&parseOptions))
return -1;
FREENONNULL(setConfigurationString("GNUNET",
@@ -164,7 +164,7 @@
&key,
0,
5 * cronSECONDS,
- value));
+ value));
CHECK2(1 == DHT_LIB_get(&table,
0,
0,
@@ -187,10 +187,10 @@
DHT_LIB_leave(&table);
destroy_blockstore_memory(store);
DHT_LIB_done();
- stopCron();
- doneUtil();
+ stopCron();
+ doneUtil();
exit(ret);
- }
+ }
DHT_LIB_join(store,
&table);
hash("key2", 4, &key);
@@ -200,7 +200,7 @@
&key,
0,
5 * cronSECONDS,
- value));
+ value));
CHECK(1 == DHT_LIB_get(&table,
0,
0,
@@ -238,7 +238,7 @@
if (! termProcess(daemon2))
DIE_STRERROR("kill");
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
- }
+ }
doneUtil();
return ret;
}
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2005-08-31
21:25:11 UTC (rev 2034)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2005-08-31
21:26:22 UTC (rev 2035)
@@ -386,7 +386,7 @@
hash = sender->hashPubKey.bits[0] % DEFRAG_BUCKET_COUNT;
smf = defragmentationCache[hash];
while (smf != NULL) {
- if (OK == tryJoin(smf,
+ if (OK == tryJoin(smf,
sender,
(P2P_fragmentation_MESSAGE*) frag)) {
MUTEX_UNLOCK(&defragCacheLock);
@@ -518,7 +518,7 @@
fbmc = MALLOC(sizeof(FragmentBMC) + len);
fbmc->mtu = mtu;
fbmc->sender = *peer;
- fbmc->transmissionTime = targetTime;
+ fbmc->transmissionTime = targetTime;
fbmc->len = len;
if (bmc == NULL) {
memcpy(&fbmc[1],
Modified: GNUnet/src/applications/fs/ecrs/directory.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directory.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/directory.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -74,7 +74,7 @@
return SYSERR; /* invalid size */
*md = ECRS_deserializeMetaData(&data[8 + sizeof(unsigned int)],
mdSize);
- if (*md == NULL)
+ if (*md == NULL)
return SYSERR; /* malformed !*/
pos = 8 + sizeof(unsigned int) + mdSize;
}
@@ -109,7 +109,7 @@
}
memcpy(&mdSize,
- &data[pos],
+ &data[pos],
sizeof(unsigned int));
mdSize = ntohl(mdSize);
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/download.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -152,8 +152,8 @@
((size_t)st.st_size > filesize ) ) {
/* if exists and oversized, truncate */
if (truncate(filename, filesize) != 0) {
- LOG_FILE_STRERROR(LOG_FAILURE,
- "truncate",
+ LOG_FILE_STRERROR(LOG_FAILURE,
+ "truncate",
filename);
return SYSERR;
}
@@ -172,7 +172,7 @@
O_CREAT|O_RDWR,
S_IRUSR|S_IWUSR );
if (this->handles[i] < 0) {
- LOG_FILE_STRERROR(LOG_FAILURE,
+ LOG_FILE_STRERROR(LOG_FAILURE,
"OPEN",
fn);
freeIOC(this, NO);
@@ -966,7 +966,7 @@
cron_t timeout;
unsigned int ttl;
int TTL_DECREMENT;
-#if DEBUG_DOWNLOAD
+#if DEBUG_DOWNLOAD
EncName enc;
#endif
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -261,7 +261,7 @@
int i;
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
Modified: GNUnet/src/applications/fs/ecrs/indexinfo.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/indexinfo.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/indexinfo.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -91,10 +91,10 @@
size,
size * 2);
continue;
- }
+ }
if (errno != EINVAL) {
- LOG_FILE_STRERROR(LOG_WARNING,
- "readlink",
+ LOG_FILE_STRERROR(LOG_WARNING,
+ "readlink",
fullName);
}
FREE(lnkName);
@@ -109,11 +109,11 @@
if (OK != cls->iterator(lnkName,
cls->closure)) {
cls->cnt = SYSERR;
- FREE(fullName);
+ FREE(fullName);
FREE(lnkName);
return SYSERR;
}
- FREE(fullName);
+ FREE(fullName);
FREE(lnkName);
return OK;
}
Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -193,7 +193,7 @@
if (testConfigurationString("FS",
"DISABLE-CREATION-TIME",
- "YES"))
+ "YES"))
xuri = ECRS_dupUri(uri);
else
xuri = ECRS_dateExpandKeywordUri(uri);
@@ -201,7 +201,7 @@
keywordCount = xuri->data.ksk.keywordCount;
cpy = MALLOC(mdsize + strlen(dstURI) + 1);
memcpy(cpy,
- &kb[1],
+ &kb[1],
mdsize + strlen(dstURI) + 1);
for (i=0;i<keywordCount;i++) {
memcpy(&kb[1], cpy, mdsize + strlen(dstURI) + 1);
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -185,7 +185,7 @@
break;
ret = ECRS_getFromMetaData(md,
type);
- if (ret != NULL)
+ if (ret != NULL)
break;
}
va_end(args);
@@ -284,7 +284,7 @@
md->items[i].data);
return ret;
}
-
+
/**
* Extract meta-data from a file.
*
@@ -338,7 +338,7 @@
}
}
FREE(tmp);
- return oldSize;
+ return oldSize;
}
/**
@@ -483,7 +483,7 @@
{
MetaData * mdx;
mdx = ECRS_deserializeMetaData(target,
- size);
+ size);
GNUNET_ASSERT(NULL != mdx);
ECRS_freeMetaData(mdx);
}
@@ -632,7 +632,7 @@
for (i=md->itemCount-1;i>=0;i--) {
if (md->items[i].type == EXTRACTOR_MIMETYPE) {
if (0 == strcmp(md->items[i].data,
- GNUNET_DIRECTORY_MIME))
+ GNUNET_DIRECTORY_MIME))
return YES;
else
return NO;
@@ -769,7 +769,7 @@
(key[0] != DIR_SEPARATOR) )
key--;
if (key[0] == DIR_SEPARATOR)
- key++;
+ key++;
}
if (mime != NULL) {
if (0 == strcmp(&key[strlen(key)-strlen(mime)],
@@ -812,7 +812,7 @@
SNPRINTF(&renameTo[i],
19,
".%u",
- j++);
+ j++);
if (j > 100000)
break;
} while (0 == STAT(renameTo,
@@ -821,10 +821,10 @@
if (0 != STAT(renameTo,
&filestat)) {
- if (0 != RENAME(filename, renameTo))
+ if (0 != RENAME(filename, renameTo))
LOG(LOG_ERROR,
_("Renaming of file `%s' to `%s' failed: %s\n"),
- filename,
+ filename,
renameTo,
STRERROR(errno));
else
@@ -832,12 +832,12 @@
} else {
LOG(LOG_ERROR,
_("Could not rename file `%s' to `%s': file exists\n"),
- filename,
+ filename,
renameTo);
- }
+ }
}
FREE(path);
- FREE(renameTo);
+ FREE(renameTo);
EXTRACTOR_freeKeywords(list);
EXTRACTOR_removeAll(l);
return ret;
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -230,7 +230,7 @@
keywords = advertisementURI->data.ksk.keywords;
keywordCount = advertisementURI->data.ksk.keywordCount;
cpy = MALLOC(size - sizeof(KBlock) - sizeof(unsigned int));
- memcpy(cpy,
+ memcpy(cpy,
&knb->nblock,
size - sizeof(KBlock) - sizeof(unsigned int));
for (i=0;i<keywordCount;i++) {
@@ -245,7 +245,7 @@
ECRS_encryptInPlace(&hc,
&knb->nblock,
size - sizeof(KBlock) - sizeof(unsigned int));
-
+
GNUNET_ASSERT(OK == sign(pk,
sizeof(NBlock) + mdsize,
&knb->nblock,
@@ -264,16 +264,16 @@
}
/* restore nblock to avoid re-encryption! */
memcpy(&knb->nblock,
- cpy,
+ cpy,
size - sizeof(KBlock) - sizeof(unsigned int));
- }
+ }
FREE(cpy);
}
FREE(knvalue);
FREE(value);
releaseClientSocket(sock);
freePrivateKey(hk);
-
+
return rootURI;
}
@@ -478,7 +478,7 @@
/* FINALLY: sign & publish SBlock */
GNUNET_ASSERT(OK == sign(hk,
size
- - sizeof(Signature)
+ - sizeof(Signature)
- sizeof(PublicKey)
- sizeof(unsigned int),
&sb->identifier,
Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -47,13 +47,13 @@
"testNamespace",
NULL,
};
-
+
ECRS_deleteNamespace(CHECKNAME); /* make sure old one is deleted */
meta = ECRS_createMetaData();
adv = ECRS_keywordsToUri(keys);
hash("root", 4, &root);
- rootURI =
+ rootURI =
ECRS_createNamespace(CHECKNAME,
meta,
0,
@@ -64,7 +64,7 @@
CHECK(NULL != rootURI);
hash("this", 4, &thisId);
hash("next", 4, &nextId);
- uri = rootURI; /* just for fun: NS::this advertises NS::root */
+ uri = rootURI; /* just for fun: NS::this advertises NS::root */
advURI = ECRS_addToNamespace(CHECKNAME,
0,
0,
@@ -103,17 +103,17 @@
int main(int argc, char * argv[]) {
pid_t daemon;
- int failureCount = 0;
+ int failureCount = 0;
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
GNUNET_ASSERT(daemon > 0);
GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(30 * cronSECONDS);
-
+
failureCount += testNamespace();
GNUNET_ASSERT(OK == stopGNUnetDaemon());
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/search.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -183,7 +183,7 @@
struct PrivateKey * pk;
PublicKey pub;
int i;
-
+
#if DEBUG_SEARCH
LOG(LOG_DEBUG,
"Computing queries (this may take a while).\n");
@@ -492,8 +492,8 @@
/* compute current/NEXT URI (if updateable SBlock) and issue
respective query automatically! */
TIME(&now);
- if (OK != computeIdAtTime(sb,
- now,
+ if (OK != computeIdAtTime(sb,
+ now,
&updateId)) {
FREE(sb);
return SYSERR;
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -101,7 +101,7 @@
const char * keywords[6];
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/unindex.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -203,7 +203,7 @@
return SYSERR;
}
if (OK != getFileSize(filename,
- &filesize))
+ &filesize))
return SYSERR;
sock = getClientSocket();
if (sock == NULL)
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -47,7 +47,7 @@
* enough.
*/
static int pushBlock(GNUNET_TCP_SOCKET * sock,
- const CHK * chk,
+ const CHK * chk,
unsigned int level,
Datastore_Value ** iblocks) {
unsigned int size;
@@ -117,7 +117,7 @@
size += sizeof(CHK) + sizeof(Datastore_Value);
GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
iblocks[level]->size = htonl(size);
-
+
return OK;
}
@@ -181,7 +181,7 @@
if (OK != getFileSize(filename,
&filesize)) {
LOG(LOG_ERROR, _("Cannot get size of file `%s'"), filename);
-
+
return SYSERR;
}
sock = getClientSocket();
@@ -196,8 +196,8 @@
if (doIndex) {
if (SYSERR == getFileHash(filename,
&fileId)) {
- LOG(LOG_ERROR,
- _("Cannot hash `%s'.\n"),
+ LOG(LOG_ERROR,
+ _("Cannot hash `%s'.\n"),
filename);
releaseClientSocket(sock);
return SYSERR;
@@ -215,12 +215,12 @@
switch (FS_initIndex(sock, &fileId, filename)) {
case SYSERR:
LOG(LOG_ERROR,
- _("Initialization for indexing file `%s' failed.\n"),
+ _("Initialization for indexing file `%s' failed.\n"),
filename);
releaseClientSocket(sock);
return SYSERR;
case NO:
- LOG(LOG_ERROR,
+ LOG(LOG_ERROR,
_("Indexing file `%s' failed. Trying to insert file...\n"),
filename);
doIndex = YES;
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -391,7 +391,7 @@
int i;
GNUNET_ASSERT(uri != NULL);
if (uri->type == ksk) {
- for (i=0;i<uri->data.ksk.keywordCount;i++)
+ for (i=0;i<uri->data.ksk.keywordCount;i++)
FREE(uri->data.ksk.keywords[i]);
GROW(uri->data.ksk.keywords,
uri->data.ksk.keywordCount,
@@ -493,7 +493,7 @@
if (uri->type != ksk) {
return -1;
} else {
- for (i=0;i<uri->data.ksk.keywordCount;i++)
+ for (i=0;i<uri->data.ksk.keywordCount;i++)
if (iterator != NULL)
if (OK != iterator(uri->data.ksk.keywords[i],
cls))
@@ -549,11 +549,11 @@
switch (ret->type) {
case ksk:
if (ret->data.ksk.keywordCount > 0) {
- ret->data.ksk.keywords
+ ret->data.ksk.keywords
= MALLOC(ret->data.ksk.keywordCount * sizeof(char*));
- for (i=0;i<ret->data.ksk.keywordCount;i++)
+ for (i=0;i<ret->data.ksk.keywordCount;i++)
ret->data.ksk.keywords[i]
- = STRDUP(uri->data.ksk.keywords[i]);
+ = STRDUP(uri->data.ksk.keywords[i]);
}
break;
default:
@@ -575,7 +575,7 @@
struct tm t;
time_t now;
unsigned int keywordCount;
-
+
GNUNET_ASSERT(uri->type == ksk);
time(&now);
#ifdef HAVE_GMTIME_R
@@ -593,7 +593,7 @@
for (i=0;i<keywordCount;i++) {
key = uri->data.ksk.keywords[i];
GNUNET_ASSERT(key != NULL);
- ret->data.ksk.keywords[2*i]
+ ret->data.ksk.keywords[2*i]
= STRDUP(key);
kd = MALLOC(strlen(key) + 13);
memset(kd, 0, strlen(key) + 13);
@@ -607,7 +607,7 @@
}
} else
ret->data.ksk.keywords = NULL;
-
+
return ret;
}
@@ -641,7 +641,7 @@
havePreview++; /* duplicate! */
break;
}
- }
+ }
}
}
GROW(ret->data.ksk.keywords,
@@ -662,7 +662,7 @@
}
if (add == 1) {
GNUNET_ASSERT(md->items[i].data != NULL);
- ret->data.ksk.keywords[i-havePreview]
+ ret->data.ksk.keywords[i-havePreview]
= STRDUP(md->items[i].data);
}
}
@@ -705,7 +705,7 @@
int ret;
int i;
int j;
-
+
GNUNET_ASSERT(uri1 != NULL);
GNUNET_ASSERT(uri2 != NULL);
if (uri1->type != uri2->type)
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/ecrs_core.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -178,9 +178,9 @@
}
sb = (const SBlock*) data;
if (OK != verifySig(&sb->identifier,
- size
- - sizeof(Signature)
- - sizeof(PublicKey)
+ size
+ - sizeof(Signature)
+ - sizeof(PublicKey)
- sizeof(unsigned int),
&sb->signature,
&sb->subspace)) {
@@ -217,8 +217,8 @@
}
nb = (const NBlock*) data;
if (OK != verifySig(&nb->identifier,
- size
- - sizeof(Signature)
+ size
+ - sizeof(Signature)
- sizeof(PublicKey)
- sizeof(unsigned int),
&nb->signature,
@@ -237,7 +237,7 @@
}
kb = (const KNBlock*) data;
if ( (OK != verifySig(&kb->nblock,
- size
+ size
- sizeof(KBlock)
- sizeof(unsigned int),
&kb->kblock.signature,
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/download.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -49,13 +49,13 @@
static int triggerRecursiveDownload(const ECRS_FileInfo * fi,
const HashCode512 * key,
int isRoot,
- void * prnt) {
+ void * prnt) {
FSUI_DownloadList * parent = prnt;
int i;
FSUI_DownloadList * pos;
char * filename;
char * fullName;
-
+
if (isRoot == YES)
return OK; /* namespace ad, ignore */
@@ -192,7 +192,7 @@
(ECRS_TestTerminate) &testTerminate,
dl);
if (ret == OK)
- dl->finished = YES;
+ dl->finished = YES;
totalBytes = ECRS_fileSize(dl->uri);
root = dl;
while ( (root->parent != NULL) &&
@@ -295,7 +295,7 @@
FSUI_DownloadList * dl;
FSUI_DownloadList * root;
unsigned long long totalBytes;
-
+
GNUNET_ASSERT(ctx != NULL);
if (! (ECRS_isFileUri(uri) ||
ECRS_isLocationUri(uri)) ) {
@@ -400,7 +400,7 @@
LOG_STRERROR(LOG_WARNING, "pthread_create");
}
}
-
+
/* should this one be stopped? */
if ( (list->ctx->threadPoolSize
< list->ctx->activeDownloadThreads) &&
@@ -431,7 +431,7 @@
list->signalTerminate = SYSERR;
ret = YES;
}
-
+
dpos = list->child;
while (dpos != NULL) {
if (YES == updateDownloadThread(dpos))
@@ -560,7 +560,7 @@
/**
* Clear all completed top-level downloads from the FSUI list.
- *
+ *
* @param callback function to call on each completed download
* that is being cleared.
* @return SYSERR on error, otherwise number of downloads cleared
@@ -608,10 +608,10 @@
/**
- * Get parent of active download.
+ * Get parent of active download.
* @return NULL if there is no parent
*/
-const FSUI_DownloadList *
+const FSUI_DownloadList *
FSUI_getDownloadParent(const FSUI_DownloadList * child) {
if (child->parent ==
&child->ctx->activeDownloads)
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -139,7 +139,7 @@
}
if (lastEvent == waitForEvent)
return; /* ignore all other events */
- lastEvent = event->type;
+ lastEvent = event->type;
if (event->type == FSUI_search_result) {
char * u;
@@ -150,7 +150,7 @@
u = ECRS_uriToString(event->data.SearchResult.fi.uri);
printf("Download started: %s.\n", u);
FREE(u);
- if (OK !=
+ if (OK !=
FSUI_startDownload(ctx,
0,
event->data.SearchResult.fi.uri,
@@ -170,7 +170,7 @@
int i;
struct ECRS_URI * uri = NULL;
char * fn = NULL;
- char * keywords[] = {
+ char * keywords[] = {
"down_foo",
"down_bar",
NULL,
@@ -182,7 +182,7 @@
struct ECRS_URI * kuri = NULL;
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
#if 1
@@ -229,7 +229,7 @@
prog = 0;
while (lastEvent != FSUI_upload_complete) {
prog++;
- CHECK(prog < 1000);
+ CHECK(prog < 1000);
gnunet_util_sleep(50 * cronMILLIS);
}
SNPRINTF(keyword,
@@ -270,7 +270,7 @@
}
}
CHECK(OK == FSUI_stopSearch(ctx,
- uri));
+ uri));
waitForEvent = FSUI_unindex_complete;
CHECK(OK == FSUI_unindex(ctx, fn));
prog = 0;
@@ -299,7 +299,7 @@
NULL,
NULL);
FSUI_stop(ctx);
- }
+ }
if (uri != NULL)
ECRS_freeUri(uri);
if (kuri != NULL)
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -179,8 +179,8 @@
BREAK();
goto FORMATERROR;
}
- memcpy(&msize,
- &result[spos],
+ memcpy(&msize,
+ &result[spos],
sizeof(int));
msize = ntohl(msize);
spos += sizeof(int);
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -87,17 +87,17 @@
GNUNET_ASSERT(ctx != NULL);
if (1 != READ(fd, &zaro, sizeof(char))) {
BREAK();
- return NULL;
+ return NULL;
}
if (zaro == '\0')
return NULL;
ret = MALLOC(sizeof(FSUI_DownloadList));
- memset(ret,
+ memset(ret,
0,
sizeof(FSUI_DownloadList));
ret->ctx = ctx;
- ret->signalTerminate
+ ret->signalTerminate
= SYSERR;
READINT(ret->is_recursive);
READINT(ret->is_directory);
@@ -132,7 +132,7 @@
for (i=0;i<ret->completedDownloadsCount;i++) {
ret->completedDownloads[i]
= readURI(fd);
- if (ret->completedDownloads[i] == NULL)
+ if (ret->completedDownloads[i] == NULL)
ok = NO;
}
if (NO == ok) {
@@ -162,7 +162,7 @@
if (ret->completedDownloads[i] != NULL)
ECRS_freeUri(ret->completedDownloads[i]);
}
-
+
FREE(ret);
LOG(LOG_WARNING,
_("FSUI persistence: error restoring download\n"));
@@ -224,14 +224,14 @@
WRITEINT(fd, list->completedDownloadsCount);
WRITEINT(fd, list->finished);
WRITEINT(fd, strlen(list->filename));
- WRITE(fd,
+ WRITE(fd,
list->filename,
strlen(list->filename));
WRITELONG(fd, list->total);
WRITELONG(fd, list->completed);
WRITELONG(fd, cronTime(NULL) - list->startTime);
writeURI(fd, list->uri);
- for (i=0;i<list->completedDownloadsCount;i++)
+ for (i=0;i<list->completedDownloadsCount;i++)
writeURI(fd, list->completedDownloads[i]);
writeDownloadList(fd,
@@ -253,7 +253,7 @@
fi->meta = NULL;
fi->uri = NULL;
- if (sizeof(unsigned int) !=
+ if (sizeof(unsigned int) !=
READ(fd,
&big,
sizeof(unsigned int))) {
@@ -278,7 +278,7 @@
}
FREE(buf);
- fi->uri
+ fi->uri
= readURI(fd);
if (fi->uri == NULL) {
ECRS_freeMetaData(fi->meta);
@@ -326,7 +326,7 @@
while (dpos != NULL) {
updateDownloadThread(dpos);
dpos = dpos->next;
- }
+ }
MUTEX_UNLOCK(&ctx->lock);
}
@@ -344,7 +344,7 @@
void * closure) {
FSUI_Context * ret;
FSUI_SearchList * list;
- ResultPending * rp;
+ ResultPending * rp;
char * fn;
char * gh;
int fd;
@@ -352,7 +352,7 @@
ret = MALLOC(sizeof(FSUI_Context));
memset(ret, 0, sizeof(FSUI_Context));
- ret->activeDownloads.signalTerminate
+ ret->activeDownloads.signalTerminate
= SYSERR;
ret->activeDownloads.ctx
= ret;
@@ -449,7 +449,7 @@
BREAK();
goto WARN;
}
- list
+ list
= MALLOC(sizeof(FSUI_SearchList));
list->uri
= ECRS_stringToUri(buf);
@@ -470,7 +470,7 @@
if (sizeof(unsigned int) !=
READ(fd, &big, sizeof(unsigned int))) {
ECRS_freeUri(list->uri);
- FREE(list);
+ FREE(list);
BREAK();
goto WARN;
}
@@ -522,10 +522,10 @@
rp = &list->unmatchedResultsReceived[i];
readFileInfo(fd,
&rp->fi);
-
+
if (sizeof(unsigned int) !=
- READ(fd,
- &big,
+ READ(fd,
+ &big,
sizeof(unsigned int))) {
BREAK();
goto WARNL;
@@ -533,12 +533,12 @@
rp->matchingKeyCount
= ntohl(big);
if ( (rp->matchingKeyCount > 1024) ||
- (rp->matchingKeyCount >
+ (rp->matchingKeyCount >
list->numberOfURIKeys) ) {
BREAK();
goto WARNL;
}
-
+
if (rp->matchingKeyCount > 0)
rp->matchingKeys
= MALLOC(sizeof(HashCode512) *
@@ -558,7 +558,7 @@
}
- list->signalTerminate
+ list->signalTerminate
= NO;
list->ctx
= ret;
@@ -574,11 +574,11 @@
DIE_STRERROR("pthread_create");
/* finally: prepend to list */
- list->next
+ list->next
= ret->activeSearches;
ret->activeSearches
= list;
- }
+ }
memset(&ret->activeDownloads,
0,
sizeof(FSUI_DownloadList));
@@ -586,7 +586,7 @@
= readDownloadList(fd,
ret,
&ret->activeDownloads);
-
+
/* success, read complete! */
goto END;
WARNL:
@@ -610,7 +610,7 @@
}
GROW(list->resultsReceived,
list->sizeResultsReceived,
- 0);
+ 0);
WARN:
LOG(LOG_WARNING,
_("FSUI state file `%s' had syntax error at offset %u.\n"),
@@ -620,7 +620,7 @@
CLOSE(fd);
UNLINK(fn);
} else {
- if (errno != ENOENT)
+ if (errno != ENOENT)
LOG_FILE_STRERROR(LOG_ERROR,
"open",
fn);
@@ -639,7 +639,7 @@
addCronJob(&updateDownloadThreads,
0,
FSUI_UDT_FREQUENCY,
- ret);
+ ret);
return ret;
}
@@ -687,15 +687,15 @@
/* next, serialize all of the FSUI state */
if (ctx->ipc != NULL) {
- fd = fileopen(ctx->name,
- O_CREAT|O_TRUNC|O_WRONLY,
+ fd = fileopen(ctx->name,
+ O_CREAT|O_TRUNC|O_WRONLY,
S_IRUSR|S_IWUSR);
if (fd == -1) {
LOG_FILE_STRERROR(LOG_ERROR,
"open",
ctx->name);
} else {
- WRITE(fd,
+ WRITE(fd,
"FSUI00\n\0",
8); /* magic */
}
@@ -733,7 +733,7 @@
tmp = ECRS_uriToString(spos->uri);
GNUNET_ASSERT(tmp != NULL);
- big = htonl(strlen(tmp));
+ big = htonl(strlen(tmp));
WRITE(fd,
&big,
sizeof(unsigned int));
@@ -801,7 +801,7 @@
if (fd != -1) {
/* search list terminator */
- big = htonl(0);
+ big = htonl(0);
WRITE(fd,
&big,
sizeof(unsigned int));
Modified: GNUnet/src/applications/fs/fsui/fsui.h
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.h 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/fsui.h 2005-08-31 21:26:22 UTC (rev
2035)
@@ -34,7 +34,7 @@
* Linked list of FSUI threads.
*/
typedef struct FSUI_ThreadList {
-
+
/**
* FSUI threads are kept in a simple
* linked list
@@ -169,7 +169,7 @@
/**
* Set this to YES to signal the download thread that
- * termination is desired. Then join on handle.
+ * termination is desired. Then join on handle.
* Set to NO if thread is running. Set to SYSERR
* if no thread has been assigned to this download
* at the moment.
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -91,7 +91,7 @@
}
if (lastEvent == FSUI_download_complete)
return; /* ignore all other events */
- lastEvent = event->type;
+ lastEvent = event->type;
if (event->type == FSUI_search_result) {
fn = makeName(43);
FSUI_startDownload(ctx,
@@ -107,8 +107,8 @@
pid_t daemon;
int ok;
struct ECRS_URI * uri;
- char * filename = NULL;
- char * keywords[] = {
+ char * filename = NULL;
+ char * keywords[] = {
"fsui_foo",
"fsui_bar",
NULL,
@@ -118,10 +118,10 @@
struct ECRS_MetaData * meta;
struct ECRS_URI * kuri;
- if (OK != initUtil(argc,
- argv,
+ if (OK != initUtil(argc,
+ argv,
&parseCommandLine))
- return -1;
+ return -1;
daemon = startGNUnetDaemon(NO);
GNUNET_ASSERT(daemon > 0);
ok = YES;
@@ -156,8 +156,8 @@
prog = 0;
while (lastEvent != FSUI_upload_complete) {
prog++;
- CHECK(prog < 10000)
-
+ CHECK(prog < 10000)
+
gnunet_util_sleep(50 * cronMILLIS);
}
SNPRINTF(keyword,
Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -59,7 +59,7 @@
int ok;
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
Modified: GNUnet/src/applications/fs/fsui/helper.c
===================================================================
--- GNUnet/src/applications/fs/fsui/helper.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/helper.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -176,7 +176,7 @@
uriLen++;
}
strcat(uriString, keywords[i]);
- uriLen += strlen(keywords[i]);
+ uriLen += strlen(keywords[i]);
}
uri = ECRS_stringToUri(uriString);
GROW(uriString,
Modified: GNUnet/src/applications/fs/fsui/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_info.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/fsui/namespace_info.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -164,8 +164,8 @@
meta,
anonymityLevel,
getConfigurationInt("FS", "INSERT-PRIORITY"),
- getConfigurationInt("FS",
- "INSERT-EXPIRATION")
+ getConfigurationInt("FS",
+ "INSERT-EXPIRATION")
* cronYEARS + cronTime(NULL),
advertisementURI,
rootEntry);
@@ -526,7 +526,7 @@
&delta,
nextId);
}
- return OK;
+ return OK;
}
@@ -646,8 +646,8 @@
uri = ECRS_addToNamespace(name,
anonymityLevel,
getConfigurationInt("FS", "INSERT-PRIORITY"),
- getConfigurationInt("FS",
- "INSERT-EXPIRATION")
+ getConfigurationInt("FS",
+ "INSERT-EXPIRATION")
* cronYEARS + cronTime(NULL),
creationTime,
updateInterval,
@@ -718,8 +718,8 @@
TIME(&now);
nextTime = lastTime;
while ( (nextTime + pubFreq < now) &&
- (nextTime + pubFreq > nextTime) )
- nextTime += pubFreq;
+ (nextTime + pubFreq > nextTime) )
+ nextTime += pubFreq;
}
if (cls->it != NULL) {
if (OK != cls->it(cls->closure,
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/search.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -62,7 +62,7 @@
char * fn;
char * fnBase;
HashCode512 ns;
- char * name;
+ char * name;
if (OK != ECRS_getNamespaceId(fi->uri,
&ns)) {
@@ -92,7 +92,7 @@
sizeof(HashCode512),
"644");
}
- FREE(fn);
+ FREE(fn);
}
/**
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -91,7 +91,7 @@
}
if (lastEvent == FSUI_download_complete)
return; /* ignore all other events */
- lastEvent = event->type;
+ lastEvent = event->type;
if (event->type == FSUI_search_result) {
fn = makeName(43);
FSUI_startDownload(ctx,
@@ -108,7 +108,7 @@
int ok;
struct ECRS_URI * uri = NULL;
char * fn = NULL;
- char * keywords[] = {
+ char * keywords[] = {
"search_foo",
"search_bar",
NULL,
@@ -119,7 +119,7 @@
struct ECRS_URI * kuri;
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
@@ -173,11 +173,11 @@
prog = 0;
while (lastEvent != FSUI_upload_complete) {
prog++;
- CHECK(prog < 10000)
-
+ CHECK(prog < 10000)
+
gnunet_util_sleep(50 * cronMILLIS);
}
-
+
prog = 0;
while (lastEvent != FSUI_download_complete) {
prog++;
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/fsui/upload.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -90,7 +90,7 @@
if (totalBytes > 0) {
event.data.UploadProgress.main_eta
= (cron_t) (utc->start_time +
- (((double)( (now -
+ (((double)( (now -
utc->start_time) /
(double)(utc->main_completed
+ completedBytes))))
@@ -303,7 +303,7 @@
utc->priority,
utc->expiration,
uri,
- meta);
+ meta);
if (utc->dir != NULL) {
GROW(utc->dir->fis,
utc->dir->fiCount,
@@ -405,7 +405,7 @@
GROW(current.fis,
current.fiCount,
0);
-
+
if (ret != OK) {
event.type = FSUI_upload_error;
event.data.message = _("Upload failed.\n");
@@ -587,7 +587,7 @@
utc->extractors = EXTRACTOR_loadDefaultLibraries();
config = getConfigurationString("FS",
"EXTRACTORS");
-
+
if (config != NULL) {
utc->extractors = EXTRACTOR_loadConfigLibraries(utc->extractors,
config);
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/lib/fslib.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -119,7 +119,7 @@
}
MUTEX_UNLOCK(ctx->lock);
#if DEBUG_FSLIB
- if (matched == 0)
+ if (matched == 0)
LOG(LOG_DEBUG,
"FSLIB: received content but have no pending request\n");
#endif
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -121,7 +121,7 @@
*/
static int countCallback(const HashCode512 * key,
const Datastore_Value * value,
- void * cls) {
+ void * cls) {
int * cnt = cls;
(*cnt)--;
return OK;
@@ -227,7 +227,7 @@
cronTime(&now);
if (OK != initUtil(argc,
- argv,
+ argv,
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
@@ -271,14 +271,14 @@
MAX_BUFFER_SIZE,
&hc));
/* indexing with symlink */
- tmpName = STRDUP("/tmp/symlinkTestXXXXXX");
+ tmpName = STRDUP("/tmp/symlinkTestXXXXXX");
CHECK(-1 != (fd = mkstemp(tmpName)));
- CHECK(-1 != WRITE(fd,
+ CHECK(-1 != WRITE(fd,
&((DBlock*)&block[1])[1],
ntohl(block->size) - sizeof(Datastore_Value) -
sizeof(DBlock)));
closefile(fd);
CHECK(FS_initIndex(sock,
- &hc,
+ &hc,
tmpName) == YES);
CHECK(OK == FS_index(sock,
&hc,
Modified: GNUnet/src/applications/fs/module/anonymity.c
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/module/anonymity.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -38,7 +38,7 @@
* require changing the DataProcessor somewhat,
* which would also be ugly. So to keep things
* simple, we do the anonymity-level check for
- * outgoing content right here.
+ * outgoing content right here.
*
* @return OK if cover traffic is sufficient
*/
@@ -71,7 +71,7 @@
"Not enough cover traffic to satisfy anonymity requirements (%u, %u
peers). "
"Result dropped.\n",
level,
- peers);
+ peers);
return SYSERR;
}
if (count < level % 1000) {
@@ -88,11 +88,11 @@
"Not enough cover traffic to satisfy anonymity requirements (%u, %u
messages). "
"Result dropped.\n",
level,
- count);
+ count);
return SYSERR;
}
}
return OK;
}
-
+
/* end of anonymity.c */
Modified: GNUnet/src/applications/fs/module/anonymity.h
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.h 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/module/anonymity.h 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -39,7 +39,7 @@
* require changing the DataProcessor somewhat,
* which would also be ugly. So to keep things
* simple, we do the anonymity-level check for
- * outgoing content right here.
+ * outgoing content right here.
*
* @return OK if cover traffic is sufficient
*/
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/fs/module/fs.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -86,7 +86,7 @@
*/
static DHT_TableId dht_table;
-static Datastore_Value *
+static Datastore_Value *
gapWrapperToDatastoreValue(const DataContainer * value,
int prio) {
Datastore_Value * dv;
@@ -672,7 +672,7 @@
LOG(LOG_WARNING,
"Converting reply for query `%s' for gap failed (insufficient cover
traffic).\n",
&enc);
- return OK;
+ return OK;
}
gw = MALLOC(size);
gw->dc.size = htonl(size);
@@ -983,7 +983,7 @@
const CS_MESSAGE_HEADER * req) {
const CS_fs_request_search_MESSAGE * rs;
unsigned int keyCount;
-#if DEBUG_FS
+#if DEBUG_FS
EncName enc;
#endif
unsigned int type;
@@ -994,7 +994,7 @@
return SYSERR;
}
rs = (const CS_fs_request_search_MESSAGE*) req;
-#if DEBUG_FS
+#if DEBUG_FS
IFLOG(LOG_DEBUG,
hash2enc(&rs->query[0],
&enc));
@@ -1007,7 +1007,7 @@
type,
sock);
keyCount = 1 + (ntohs(req->size) - sizeof(CS_fs_request_search_MESSAGE)) /
sizeof(HashCode512);
-
+
/* try a "fast path" avoiding gap/dht if unique reply is locally available */
done = NO;
gapGet(NULL,
@@ -1145,9 +1145,9 @@
&csHandleCS_fs_request_test_index_MESSAGEed));
GNUNET_ASSERT(SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
&csHandleRequestGetAvgPriority));
- initMigration(capi,
- datastore,
- gap,
+ initMigration(capi,
+ datastore,
+ gap,
dht,
traffic);
setConfigurationString("ABOUT",
Modified: GNUnet/src/applications/fs/module/migration.c
===================================================================
--- GNUnet/src/applications/fs/module/migration.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/module/migration.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -130,7 +130,7 @@
ret = 0;
if (anonymity == 0) {
/* ret > 0; (if DHT succeeds) fixme for DHT */
- }
+ }
if ( (ret == 0) &&
(OK == checkCoverTraffic(traffic,
anonymity)) ) {
@@ -147,7 +147,7 @@
FREE(gw);
}
if (ret > 0) {
- FREE(content);
+ FREE(content);
content = NULL;
}
MUTEX_UNLOCK(&lock);
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/module/ondemand.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -137,7 +137,7 @@
FREE(serverDir);
serverDir = tmp;
if ( (SYSERR == getFileHash(fn,
- &linkId)) ||
+ &linkId)) ||
(! equalsHashCode512(&linkId,
fileId)) ) {
FREE(serverDir);
@@ -206,14 +206,14 @@
fn = getOnDemandFile(fileId);
if ( (0 != LSTAT(fn,
- &sbuf))
+ &sbuf))
#ifdef S_ISLNK
- || (! S_ISLNK(sbuf.st_mode))
+ || (! S_ISLNK(sbuf.st_mode))
#endif
) {
int fd;
- /* not sym-linked, write content to offset! */
+ /* not sym-linked, write content to offset! */
#if DEBUG_ONDEMAND
LOG(LOG_DEBUG,
"Storing on-demand encoded data in `%s'.\n",
@@ -244,10 +244,10 @@
}
closefile(fd);
if (ret == SYSERR) {
- FREE(fn);
+ FREE(fn);
return ret;
}
- }
+ }
FREE(fn);
odb.header.size = htonl(sizeof(OnDemandBlock));
@@ -340,8 +340,8 @@
#endif
/* schedule for "immediate" execution */
addCronJob((CronJob) &asyncDelJob,
- 0,
- 0,
+ 0,
+ 0,
job);
}
@@ -377,7 +377,7 @@
#ifdef O_LARGEFILE
O_LARGEFILE |
#endif
- O_RDONLY,
+ O_RDONLY,
0);
if (fileHandle == -1) {
char unavail_key[256];
@@ -420,8 +420,8 @@
FREE(fn);
return SYSERR;
}
- GROW(ofn,
- len,
+ GROW(ofn,
+ len,
len*2);
if (ret != -1) {
@@ -607,7 +607,7 @@
return SYSERR;
}
pos = 0;
- if (OK != getFileSize(fn,
+ if (OK != getFileSize(fn,
&size)) {
FREE(fn);
return SYSERR;
@@ -671,8 +671,8 @@
"FIRST_UNAVAILABLE-%s",
(char*)&enc);
stateUnlinkFromDB(unavail_key);
-
+
FREE(fn);
return OK;
}
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/module/querymanager.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -30,7 +30,7 @@
#include "fs.h"
#include "querymanager.h"
-#define DEBUG_QUERYMANAGER NO
+#define DEBUG_QUERYMANAGER NO
typedef struct {
HashCode512 query;
@@ -160,14 +160,14 @@
LOG(LOG_DEBUG,
"Sending reply to client waiting in slot %u.\n",
i);
-#endif
+#endif
coreAPI->sendToClient(trackers[i]->client,
&rc->header);
FREE(rc);
}
}
#if DEBUG_QUERYMANAGER
- if (matchCount == 0) {
+ if (matchCount == 0) {
EncName enc;
IFLOG(LOG_DEBUG,
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -115,7 +115,7 @@
printf(_("Failed to add entry to namespace `%s' (does it exist?)\n"),
pname);
}
- FREE(pname);
+ FREE(pname);
}
/**
@@ -145,7 +145,7 @@
if (*verboselevel == YES) {
if (0 == strcmp(event->data.UploadComplete.filename,
event->data.UploadComplete.main_filename)) {
- delta = event->data.UploadComplete.eta
+ delta = event->data.UploadComplete.eta
- event->data.UploadComplete.start_time;
PRINTF(_("Upload of `%s' complete, "
"%llu bytes took %llu seconds (%8.3f kbps).\n"),
@@ -154,7 +154,7 @@
delta / cronSECONDS,
(delta == 0)
? (double) (-1.0)
- : (double) (event->data.UploadComplete.total
+ : (double) (event->data.UploadComplete.total
/ 1024.0 * cronSECONDS / delta));
} else {
cron_t now;
@@ -565,7 +565,7 @@
if (printAndReturn) {
EXTRACTOR_ExtractorList * l;
char * ex;
-
+
filename = getConfigurationString("GNUNET-INSERT",
"MAIN-FILE");
l = EXTRACTOR_loadDefaultLibraries();
@@ -673,8 +673,8 @@
doIndex = YES;
if (! testConfigurationString("FS",
"DISABLE-CREATION-TIME",
- "YES"))
- ECRS_addPublicationDateToMetaData(meta);
+ "YES"))
+ ECRS_addPublicationDateToMetaData(meta);
if (testConfigurationString("GNUNET-INSERT",
"RECURSIVE",
"YES")) {
@@ -684,7 +684,7 @@
gloURI = FSUI_parseListKeywordURI(gloKeywordCnt,
(const char**) gloKeywords);
topURI = FSUI_parseListKeywordURI(topKeywordCnt,
- (const char**) topKeywords);
+ (const char**) topKeywords);
ret = FSUI_uploadAll(ctx,
filename,
getConfigurationInt("FS",
@@ -702,7 +702,7 @@
struct ECRS_URI * topURI;
topURI = FSUI_parseListKeywordURI(topKeywordCnt,
- (const char**) topKeywords);
+ (const char**) topKeywords);
ret = FSUI_upload(ctx,
filename,
getConfigurationInt("FS",
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -166,7 +166,7 @@
int verbose;
char * tmp;
- if (SYSERR == initUtil(argc, argv, &parseOptions))
+ if (SYSERR == initUtil(argc, argv, &parseOptions))
return 0;
verbose = testConfigurationString("GNUNET-INSERT",
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/applications/gap/gap.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -814,7 +814,7 @@
(equalsHashCode512(&id->hashPubKey,
&qr->msg->returnTo.hashPubKey)) )
return; /* never send back to source */
-
+
if (getBit(qr, getIndex(id)) == 1) {
#if DEBUG_GAP
IFLOG(LOG_DEBUG,
@@ -1060,7 +1060,7 @@
uri(data,
ANY_BLOCK,
primaryKey);
-#endif
+#endif
ite = &ROUTING_indTable_[computeRoutingIndex(primaryKey)];
if (! equalsHashCode512(&ite->primaryKey,
@@ -1533,13 +1533,13 @@
HashCode512 hc1;
int i;
IndirectionTableEntry * ite;
-
+
#if EXTRA_CHECKS
/* verify data is valid */
uri(value,
ANY_BLOCK,
primaryKey);
-#endif
+#endif
/* check seen */
ite = &ROUTING_indTable_[computeRoutingIndex(primaryKey)];
@@ -1664,7 +1664,7 @@
if (max > cls.valueCount)
max = cls.valueCount; /* can't send more back then
what we have */
-
+
for (i=0;i<cls.valueCount;i++) {
if (i < max) {
if (cls.sender != NULL)
@@ -1680,7 +1680,7 @@
&query->queries[0],
cls.values[perm[i]],
ite->priority);
-
+
if (uri(cls.values[perm[i]],
ite->type,
&query->queries[0]))
@@ -1758,7 +1758,7 @@
size);
rhf(value,
&contentHC);
-
+
/* FIRST: check if seen */
MUTEX_LOCK(&lookup_exclusion);
for (i=0;i<ite->seenIndex;i++) {
@@ -2172,7 +2172,7 @@
GNUNET_ASSERT(sizeof(P2P_gap_reply_MESSAGE) == 68);
GNUNET_ASSERT(sizeof(P2P_gap_query_MESSAGE) == 144);
-
+
coreAPI = capi;
GROW(rewards,
rewardSize,
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/gap/gaptest.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -267,7 +267,7 @@
/* set to 0 if you want to start gnunetd's by hand for debugging */
if (OK != initUtil(argc,
- argv,
+ argv,
&parseOptions))
return -1;
#if 1
@@ -335,7 +335,7 @@
}
releaseClientSocket(sock);
-
+
uri = uploadFile(12345);
CHECK(NULL != uri);
CHECK(OK == searchFile(&uri));
@@ -360,7 +360,7 @@
if (! termProcess(daemon2))
DIE_STRERROR("kill");
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
- }
+ }
doneUtil();
return ret;
}
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/identity/identity.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -77,12 +77,12 @@
P2P_hello_MESSAGE ** helos;
unsigned int heloCount;
-
+
/**
* for which protocols is this host known?
*/
unsigned short * protocols;
-
+
unsigned int protocolCount;
/**
@@ -169,8 +169,8 @@
GNUNET_ASSERT(numberOfHosts_ <= sizeOfHosts_);
for (i=0;i<numberOfHosts_;i++)
if ( (hostIdentityEquals(id,
- &hosts_[i]->identity)) )
- return hosts_[i];
+ &hosts_[i]->identity)) )
+ return hosts_[i];
return NULL;
}
@@ -193,7 +193,7 @@
entry = findHost(identity);
if (entry == NULL) {
entry = MALLOC(sizeof(HostEntry));
-
+
entry->identity = *identity;
entry->until = 0;
entry->delta = 30 * cronSECONDS;
@@ -232,7 +232,7 @@
GROW(entry->protocols,
entry->protocolCount,
entry->protocolCount+1);
- entry->protocols[entry->protocolCount-1]
+ entry->protocols[entry->protocolCount-1]
= protocol;
MUTEX_UNLOCK(&lock_);
}
@@ -241,7 +241,7 @@
* Increase the host credit by a value.
*
* @param hostId is the identity of the host
- * @param value is the int value by which the
+ * @param value is the int value by which the
* host credit is to be increased or decreased
* @returns the actual change in trust (positive or negative)
*/
@@ -266,7 +266,7 @@
}
if ( ((int) (host->trust & TRUST_ACTUAL_MASK)) + value < 0) {
value = - (host->trust & TRUST_ACTUAL_MASK);
- host->trust = 0
+ host->trust = 0
| TRUST_REFRESH_MASK; /* 0 remaining */
} else {
host->trust = ( (host->trust & TRUST_ACTUAL_MASK) + value)
@@ -320,7 +320,7 @@
}
}
- fullname = MALLOC(strlen(filename) +
+ fullname = MALLOC(strlen(filename) +
strlen(networkIdDirectory) + 1);
strcpy(fullname, networkIdDirectory);
strcat(fullname, filename);
@@ -372,7 +372,7 @@
*/
static void addHostTemporarily(const P2P_hello_MESSAGE * tmp) {
static int tempHostsNextSlot;
- P2P_hello_MESSAGE * msg;
+ P2P_hello_MESSAGE * msg;
HostEntry * entry;
int i;
int slot;
@@ -385,15 +385,15 @@
entry = findHost(&msg->senderIdentity);
if (entry == NULL) {
slot = tempHostsNextSlot;
- for (i=0;i<MAX_TEMP_HOSTS;i++)
+ for (i=0;i<MAX_TEMP_HOSTS;i++)
if (hostIdentityEquals(&tmp->senderIdentity,
&tempHosts[i].identity))
- slot = i;
+ slot = i;
if (slot == tempHostsNextSlot) {
tempHostsNextSlot++;
if (tempHostsNextSlot >= MAX_TEMP_HOSTS)
tempHostsNextSlot = 0;
- }
+ }
entry = &tempHosts[slot];
entry->identity = msg->senderIdentity;
entry->until = 0;
@@ -451,10 +451,10 @@
}
}
/* also remove hello file itself */
- fn = getHostFileName(identity,
+ fn = getHostFileName(identity,
protocol);
if (0 != UNLINK(fn))
- LOG_FILE_STRERROR(LOG_WARNING,
+ LOG_FILE_STRERROR(LOG_WARNING,
"unlink",
fn);
FREE(fn);
@@ -526,7 +526,7 @@
MUTEX_LOCK(&lock_);
addHostToKnown(&msg->senderIdentity,
ntohs(msg->protocol));
- host = findHost(&msg->senderIdentity);
+ host = findHost(&msg->senderIdentity);
GNUNET_ASSERT(host != NULL);
for (i=0;i<host->heloCount;i++) {
@@ -544,7 +544,7 @@
= MALLOC(P2P_hello_MESSAGE_size(msg));
memcpy(host->helos[i],
msg,
- P2P_hello_MESSAGE_size(msg));
+ P2P_hello_MESSAGE_size(msg));
MUTEX_UNLOCK(&lock_);
GNUNET_ASSERT(numberOfHosts_ <= sizeOfHosts_);
}
@@ -574,13 +574,13 @@
int * perm;
GNUNET_ASSERT(numberOfHosts_ <= sizeOfHosts_);
- MUTEX_LOCK(&lock_);
+ MUTEX_LOCK(&lock_);
if (YES == tryTemporaryList) {
if (protocol == ANY_PROTOCOL_NUMBER)
perm = permute(WEAK, MAX_TEMP_HOSTS);
else
perm = NULL;
- /* ok, then first try temporary hosts
+ /* ok, then first try temporary hosts
(in memory, cheapest!) */
for (i=0;i<MAX_TEMP_HOSTS;i++) {
if (perm == NULL)
@@ -609,7 +609,7 @@
(host->protocolCount == 0) ) {
MUTEX_UNLOCK(&lock_);
return NULL;
- }
+ }
if (protocol == ANY_PROTOCOL_NUMBER)
protocol = host->protocols[weak_randomi(host->protocolCount)];
@@ -625,9 +625,9 @@
return result;
}
}
-
+
/* do direct read */
- fn = getHostFileName(hostId,
+ fn = getHostFileName(hostId,
protocol);
size = readFile(fn,
sizeof(P2P_hello_MESSAGE),
@@ -642,25 +642,25 @@
_("Removed file `%s' containing invalid hello data.\n"),
fn);
else
- LOG_FILE_STRERROR(LOG_ERROR,
+ LOG_FILE_STRERROR(LOG_ERROR,
"unlink",
fn);
}
FREE(fn);
MUTEX_UNLOCK(&lock_);
- return NULL;
+ return NULL;
}
result = MALLOC(P2P_hello_MESSAGE_size(&buffer));
size = readFile(fn,
P2P_hello_MESSAGE_size(&buffer),
- result);
+ result);
if ((unsigned int)size != P2P_hello_MESSAGE_size(&buffer)) {
if (0 == UNLINK(fn))
LOG(LOG_WARNING,
_("Removed file `%s' containing invalid hello data.\n"),
fn);
else
- LOG_FILE_STRERROR(LOG_ERROR,
+ LOG_FILE_STRERROR(LOG_ERROR,
"unlink",
fn);
FREE(fn);
@@ -678,7 +678,7 @@
result,
P2P_hello_MESSAGE_size(&buffer));
MUTEX_UNLOCK(&lock_);
- return result;
+ return result;
}
@@ -756,7 +756,7 @@
entry->strict = strict;
hash2enc(&identity->hashPubKey,
&hn);
-#if DEBUG_IDENTITY
+#if DEBUG_IDENTITY
LOG(LOG_INFO,
"Blacklisting host `%s' for %llu seconds"
" until %llu (strict=%d).\n",
@@ -787,7 +787,7 @@
return NO;
}
cronTime(&now);
- if ( (now < entry->until) &&
+ if ( (now < entry->until) &&
(entry->strict == YES) ) {
MUTEX_UNLOCK(&lock_);
return YES;
@@ -806,7 +806,7 @@
static int whitelistHost(const PeerIdentity * identity) {
HostEntry * entry;
int i;
-#if DEBUG_IDENTITY
+#if DEBUG_IDENTITY
EncName enc;
#endif
@@ -826,7 +826,7 @@
MUTEX_UNLOCK(&lock_);
return SYSERR;
}
-#if DEBUG_IDENTITY
+#if DEBUG_IDENTITY
IFLOG(LOG_INFO,
hash2enc(&identity->hashPubKey,
&enc));
@@ -845,7 +845,7 @@
* Call a method for each known host.
*
* @param callback the method to call for each host
- * @param now the time to use for excluding hosts
+ * @param now the time to use for excluding hosts
* due to blacklisting, use 0
* to go through all hosts.
* @param data an argument to pass to the method
@@ -862,7 +862,7 @@
HostEntry * entry;
GNUNET_ASSERT(numberOfHosts_ <= sizeOfHosts_);
- count = 0;
+ count = 0;
MUTEX_LOCK(&lock_);
for (i=0;i<numberOfHosts_;i++) {
entry = hosts_[i];
@@ -910,7 +910,7 @@
YES,
data);
MUTEX_LOCK(&lock_);
- }
+ }
}
}
MUTEX_UNLOCK(&lock_);
@@ -990,7 +990,7 @@
* @param capi the core API
* @return NULL on errors, ID_API otherwise
*/
-Identity_ServiceAPI *
+Identity_ServiceAPI *
provide_module_identity(CoreAPIForApplication * capi) {
static Identity_ServiceAPI id;
char * gnHome;
@@ -1013,7 +1013,7 @@
id.changeHostTrust = &changeHostTrust;
id.getHostTrust = &getHostTrust;
- for (i=0;i<MAX_TEMP_HOSTS;i++)
+ for (i=0;i<MAX_TEMP_HOSTS;i++)
memset(&tempHosts[i],
0,
sizeof(HostEntry));
@@ -1033,13 +1033,13 @@
= getConfigurationString("GNUNETD",
"HOSTS");
if (networkIdDirectory == NULL) {
- networkIdDirectory
+ networkIdDirectory
= MALLOC(strlen(gnHome) + strlen(HOST_DIR) + 2);
strcpy(networkIdDirectory, gnHome);
strcat(networkIdDirectory, DIR_SEPARATOR_STR);
strcat(networkIdDirectory, HOST_DIR);
} else {
- tmp =
+ tmp =
expandFileName(networkIdDirectory);
FREE(networkIdDirectory);
networkIdDirectory = tmp;
Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/pingpong/pingpong.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -146,13 +146,13 @@
const P2P_pingpong_MESSAGE * msg) {
TSession * mytsession;
int ret;
-
+
mytsession = transport->connectFreely(peer, YES);
if (mytsession == NULL)
- return SYSERR;
+ return SYSERR;
ret = coreAPI->sendPlaintext(mytsession,
(char*)msg,
- sizeof(P2P_pingpong_MESSAGE));
+ sizeof(P2P_pingpong_MESSAGE));
transport->disconnect(mytsession);
return ret;
}
@@ -444,7 +444,7 @@
/**
* Initialize the pingpong module.
*/
-Pingpong_ServiceAPI *
+Pingpong_ServiceAPI *
provide_module_pingpong(CoreAPIForApplication * capi) {
static Pingpong_ServiceAPI ret;
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/session/connect.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -225,7 +225,7 @@
* session key message
* @return message on success, NULL on failure
*/
-static P2P_setkey_MESSAGE *
+static P2P_setkey_MESSAGE *
makeSessionKeySigned(const PeerIdentity * hostId,
const SESSIONKEY * sk,
TIME_T created,
@@ -261,7 +261,7 @@
size,
ping != NULL ? "ping":"",
pong != NULL ? "pong":"");
-#endif
+#endif
if (SYSERR == encryptPrivateKey(sk,
sizeof(SESSIONKEY),
&foreignHelo->publicKey,
@@ -277,7 +277,7 @@
msg->header.size = htons(size);
msg->header.type = htons(P2P_PROTO_setkey);
msg->creationTime = htonl(created);
- GNUNET_ASSERT(SYSERR !=
+ GNUNET_ASSERT(SYSERR !=
identity->signData(msg,
sizeof(P2P_setkey_MESSAGE)
- sizeof(Signature),
@@ -296,14 +296,14 @@
pt = MALLOC(size);
size = 0;
if (ping != NULL) {
- memcpy(&pt[size],
+ memcpy(&pt[size],
ping,
ntohs(ping->size));
size += ntohs(ping->size);
}
if (pong != NULL) {
memcpy(&pt[size],
- pong,
+ pong,
ntohs(pong->size));
size += ntohs(pong->size);
}
@@ -508,7 +508,7 @@
" verification (discarded).\n",
&enc);
if (stats != NULL)
- stats->change(stat_skeyRejected,
+ stats->change(stat_skeyRejected,
1);
return SYSERR; /* rejected */
}
@@ -533,7 +533,7 @@
crc32N(&key, SESSIONKEY_LEN));
#endif
BREAK();
- stats->change(stat_skeyRejected,
+ stats->change(stat_skeyRejected,
1);
return SYSERR;
}
@@ -567,7 +567,7 @@
printSKEY(&key),
*(int*)&sessionkeySigned->signature);
#endif
- GNUNET_ASSERT(-1 !=
+ GNUNET_ASSERT(-1 !=
decryptBlock
(&key,
&((char*)sessionkeySigned)[sizeof(P2P_setkey_MESSAGE)],
Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/session/sessiontest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -71,7 +71,7 @@
"OPDA8F1VIKESLSNBO",
&peer2.hashPubKey));
if (OK != initUtil(argc,
- argv,
+ argv,
&parseOptions))
return -1;
FREENONNULL(setConfigurationString("GNUNET",
@@ -85,7 +85,7 @@
/* in case existing hellos have expired */
gnunet_util_sleep(30 * cronSECONDS);
system("cp peer1/data/hosts/* peer2/data/hosts/");
- system("cp peer2/data/hosts/* peer1/data/hosts/");
+ system("cp peer2/data/hosts/* peer1/data/hosts/");
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
@@ -149,7 +149,7 @@
if (! termProcess(daemon2))
DIE_STRERROR("kill");
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
- }
+ }
doneUtil();
return ret;
}
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -321,7 +321,7 @@
dbhI->dbf = NULL;
return SYSERR;
}
-
+
dbhI->insert = mysql_stmt_init(dbhI->dbf);
dbhI->select = mysql_stmt_init(dbhI->dbf);
dbhI->selectc = mysql_stmt_init(dbhI->dbf);
@@ -433,7 +433,7 @@
dbhI->ubind[1].buffer_type = MYSQL_TYPE_BLOB;
dbhI->ubind[2].buffer_type = MYSQL_TYPE_BLOB;
dbhI->prepare = YES;
- } else
+ } else
dbhI->prepare = NO;
MUTEX_CREATE(&dbhI->DATABASE_Lock_);
return OK;
@@ -504,7 +504,7 @@
} else {
SNPRINTF(typestr,
32,
- "WHERE type=%u ",
+ "WHERE type=%u ",
type);
}
@@ -1005,7 +1005,7 @@
mysql_stmt_error(stmt));
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
return SYSERR;
- }
+ }
if (mysql_stmt_execute(stmt)) {
LOG(LOG_ERROR,
_("`%s' failed at %s:%d with error: %s\n"),
@@ -1054,7 +1054,7 @@
mysql_stmt_error(dbh->update));
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
return SYSERR;
- }
+ }
/* NOTE: as the table entry for 'prio' is defined as unsigned,
* mysql will zero the value if its about to go negative. (This
* will generate a warning though, but its probably not seen
@@ -1139,10 +1139,10 @@
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
bytesUsed = rowsInTable * avgRowLen;
-
+
if (stats)
stats->set(stat_size, bytesUsed);
-
+
return bytesUsed;
}
@@ -1304,7 +1304,7 @@
FREE(dbh->cnffile);
FREE(dbh);
dbh = NULL;
-
+
if (stats != NULL)
coreAPI->releaseService(stats);
}
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -97,8 +97,8 @@
SQstore_ServiceAPI * api) {
if (1 == api->del(key, val))
return OK;
- else
- return SYSERR;
+ else
+ return SYSERR;
}
static int priorityCheck(const HashCode512 * key,
@@ -109,8 +109,8 @@
id = (*closure);
if (id + 1 == ntohl(val->prio))
return OK;
- else
- return SYSERR;
+ else
+ return SYSERR;
}
static int multipleCheck(const HashCode512 * key,
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -150,7 +150,7 @@
value->type = htonl(sqlite3_column_int(stmt, 1));
value->prio = htonl(sqlite3_column_int(stmt, 2));
value->anonymityLevel = htonl(sqlite3_column_int(stmt, 3));
- value->expirationTime = htonll(sqlite3_column_int64(stmt, 4));
+ value->expirationTime = htonll(sqlite3_column_int64(stmt, 4));
memcpy(&datum->key,
sqlite3_column_blob(stmt, 5),
sizeof(HashCode512));
@@ -371,7 +371,7 @@
ntohll(datum->value.expirationTime),
lastPrio,
lastExp);
-#endif
+#endif
if (iter != NULL) {
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
@@ -495,8 +495,8 @@
hash2enc(key,
&enc));
LOG(LOG_DEBUG,
- "SQLite: retrieving content `%s'\n",
- &enc);
+ "SQLite: retrieving content `%s'\n",
+ &enc);
#endif
MUTEX_LOCK(&dbh->DATABASE_Lock_);
@@ -630,13 +630,13 @@
rowLen = 0;
contentSize = ntohl(value->size)-sizeof(Datastore_Value);
stmt = dbh->insertContent;
-
+
size = ntohl(value->size);
type = ntohl(value->type);
prio = ntohl(value->prio);
anon = ntohl(value->anonymityLevel);
expir = ntohll(value->expirationTime);
-
+
sqlite3_bind_int(stmt, 1, size);
sqlite3_bind_int(stmt, 2, type);
sqlite3_bind_int(stmt, 3, prio);
@@ -709,7 +709,7 @@
sqlite3_column_int(dbh->exists, 2) + sqlite3_column_int(dbh->exists, 3)
+
sqlite3_column_int(dbh->exists, 4) + sqlite3_column_int(dbh->exists, 5)
+
sqlite3_column_int(dbh->exists, 6) + 7 + 245 + 1;
-
+
if (dbh->payload > rowLen)
dbh->payload -= rowLen;
else
@@ -729,7 +729,7 @@
SQLITE_TRANSIENT);
n = sqlite3_step(stmt);
}
- /* FIXME: this operation fails to update dbh->payload properly! */
+ /* FIXME: this operation fails to update dbh->payload properly! */
} else {
unsigned int size, type, prio, anon;
unsigned long long expir;
@@ -746,7 +746,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);
@@ -832,7 +832,7 @@
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"SQLite: block updated\n");
#endif
@@ -849,7 +849,7 @@
sqlite3_stmt *stmt;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"SQLite: initializing database\n");
#endif
@@ -978,10 +978,10 @@
*/
void release_module_sqstore_sqlite() {
if (stats != NULL)
- coreAPI->releaseService(stats);
+ coreAPI->releaseService(stats);
sqlite_shutdown();
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"SQLite: database shutdown\n");
#endif
coreAPI = NULL;
Modified: GNUnet/src/applications/stats/clientapi.c
===================================================================
--- GNUnet/src/applications/stats/clientapi.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/stats/clientapi.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -233,7 +233,7 @@
&supported))
return SYSERR;
if (supported == YES) {
- ret = processor(i,
+ ret = processor(i,
(j == 2) ? YES : NO,
cls);
if (ret != OK)
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/tbench/tbench.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -319,7 +319,7 @@
#if DEBUG_TBENCH
LOG(LOG_DEBUG,
"Sending message %u of size %u in iteration %u\n",
- packetNum,
+ packetNum,
size,
iteration);
#endif
Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -152,7 +152,7 @@
"OPDA8F1VIKESLSNBO",
&peer2.hashPubKey));
if (OK != initUtil(argc,
- argv,
+ argv,
&parseOptions))
return -1;
FREENONNULL(setConfigurationString("GNUNET",
@@ -230,7 +230,7 @@
if (! termProcess(daemon2))
DIE_STRERROR("kill");
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
- }
+ }
doneUtil();
return ret;
}
Modified: GNUnet/src/applications/tbench/tbenchtest_udp.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest_udp.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/tbench/tbenchtest_udp.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -152,7 +152,7 @@
"OPDA8F1VIKESLSNBO",
&peer2.hashPubKey));
if (OK != initUtil(argc,
- argv,
+ argv,
&parseOptions))
return -1;
#if 0
@@ -233,7 +233,7 @@
if (! termProcess(daemon2))
DIE_STRERROR("kill");
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
- }
+ }
doneUtil();
return ret;
}
Modified: GNUnet/src/applications/testbed/socket.c
===================================================================
--- GNUnet/src/applications/testbed/socket.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/testbed/socket.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -142,7 +142,7 @@
/**
* Print a message in the testbed-shell.
*/
-void XPRINTF(const char * fmt,
+void XPRINTF(const char * fmt,
...) {
va_list args;
int n;
Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/topology_default/topology.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -187,8 +187,8 @@
&scanHelperSelect,
&indexMatch);
if (hostIdentityEquals(coreAPI->myIdentity,
- &indexMatch.match))
- return; /* should happen really rarely */
+ &indexMatch.match))
+ return; /* should happen really rarely */
if (coreAPI->computeIndex(&indexMatch.match) != index) {
BREAK(); /* should REALLY not happen */
return;
@@ -223,7 +223,7 @@
&enc);
LOG(LOG_DEBUG,
"Received pong from `%s', telling core that peer is still alive.\n",
- (char*)&enc);
+ (char*)&enc);
#endif
coreAPI->confirmSessionUp(hostId);
FREE(hostId);
@@ -256,11 +256,11 @@
hi = MALLOC(sizeof(PeerIdentity));
*hi = *peer;
#if DEBUG_TOPOLOGY
- hash2enc(&hi->hashPubKey,
+ hash2enc(&hi->hashPubKey,
&enc);
LOG(LOG_DEBUG,
"Sending ping to `%s' to prevent connection timeout.\n",
- (char*)&enc);
+ (char*)&enc);
#endif
if (OK != pingpong->ping(peer,
NO,
@@ -309,7 +309,7 @@
unsigned int active;
unsigned int known;
- active = coreAPI->forAllConnectedNodes(NULL, NULL);
+ active = coreAPI->forAllConnectedNodes(NULL, NULL);
if (active == 0)
return 0;
known = identity->forEachHost(0,
@@ -322,7 +322,7 @@
that we know, we probably also only know X%
of all peers that exist;
- Then the total number of machines is
+ Then the total number of machines is
1/X * known, or known * known / active.
Of course, we may know more than X% of the
@@ -335,7 +335,7 @@
- we connect to only 1% of the machines we have
heard of => network size = 100 * # active
*/
- if (known * known / active < known)
+ if (known * known / active < known)
return 0x7FFFFFFF; /* integer overflow, return max int */
return known * known / active;
}
Modified: GNUnet/src/applications/topology_f2f/topology.c
===================================================================
--- GNUnet/src/applications/topology_f2f/topology.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/topology_f2f/topology.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -258,7 +258,7 @@
slotCount = coreAPI->getSlotCount();
if (saturation > 0.001)
minint = (int) 1 / saturation;
- else
+ else
minint = 10;
if (minint == 0)
minint = 1;
@@ -326,8 +326,8 @@
}
FREE(fn);
pos = 0;
- while ( (pos < size) &&
- isspace(data[pos]))
+ while ( (pos < size) &&
+ isspace(data[pos]))
pos++;
while (pos <= size - sizeof(EncName)) {
memcpy(&enc,
@@ -351,8 +351,8 @@
&enc);
}
pos = pos + sizeof(EncName);
- while ( (pos < size) &&
- isspace(data[pos]))
+ while ( (pos < size) &&
+ isspace(data[pos]))
pos++;
}
return OK;
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/tracekit/tracekit.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -280,7 +280,7 @@
size = sizeof(P2P_tracekit_reply_MESSAGE) + count*sizeof(PeerIdentity);
reply = MALLOC(size);
reply->header.size
- = htons(size);
+ = htons(size);
reply->header.type
= htons(P2P_PROTO_tracekit_REPLY);
reply->initiatorId
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/applications/traffic/traffic.c 2005-08-31 21:26:22 UTC (rev
2035)
@@ -371,7 +371,7 @@
unsigned int nowUnit;
double totSize;
- if (timePeriod > HISTORY_SIZE)
+ if (timePeriod > HISTORY_SIZE)
timePeriod = HISTORY_SIZE;
MUTEX_LOCK(&lock);
if ( (messageType >= max_message_type) ||
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2005-08-31 21:25:11 UTC
(rev 2034)
+++ GNUnet/src/applications/transport/transport.c 2005-08-31 21:26:22 UTC
(rev 2035)
@@ -81,7 +81,7 @@
- sizeof(PublicKey)
- sizeof(P2P_MESSAGE_HEADER),
&tapi->helo->signature)) {
- FREE(tapi->helo);
+ FREE(tapi->helo);
tapi->helo = NULL;
BREAK();
}
@@ -228,7 +228,7 @@
useTempList);
if (helo != NULL) {
ret = transportConnect(helo);
- FREE(helo);
+ FREE(helo);
if (ret != NULL) {
FREE(perm);
MUTEX_UNLOCK(&tapis_lock);
@@ -304,7 +304,7 @@
if (tsession == NULL) {
LOG(LOG_DEBUG,
- "transportSend attempted on uni-directional pipe, failing.\n");
+ "transportSend attempted on uni-directional pipe, failing.\n");
return SYSERR; /* can't do that, can happen for unidirectional pipes
that call core with TSession being NULL. */
}
@@ -555,7 +555,7 @@
for (i=0;i<tcount;i++)
FREE(helos[i]);
FREE(helos);
- if (used == 0)
+ if (used == 0)
LOG(LOG_DEBUG,
"%s failed: no hellos fit in %u bytes\n",
maxLen);
@@ -604,7 +604,7 @@
/**
* Initialize the transport layer.
*/
-Transport_ServiceAPI *
+Transport_ServiceAPI *
provide_module_transport(CoreAPIForApplication * capi) {
static Transport_ServiceAPI ret;
TransportAPI * tapi;
Modified: GNUnet/src/conf/conf.c
===================================================================
--- GNUnet/src/conf/conf.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/conf.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -506,20 +506,20 @@
int conf_main()
{
char * filename;
-
+
filename = getConfigurationString("GNUNET-SETUP",
"FILENAME");
conf_read(filename);
input_mode = ask_all; /* for now */
rootEntry = &rootmenu;
- conf(&rootmenu);
+ conf(&rootmenu);
do {
conf_cnt = 0;
check_conf(&rootmenu);
} while (conf_cnt);
-
+
if (conf_write(filename)) {
- printf(_("Unable to save configuration file `%s': %s.\n"),
+ printf(_("Unable to save configuration file `%s': %s.\n"),
filename,
STRERROR(errno));
FREE(filename);
Modified: GNUnet/src/conf/confdata.c
===================================================================
--- GNUnet/src/conf/confdata.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/confdata.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -51,22 +51,22 @@
struct property *prop;
struct expr *e;
int i = 0;
-
+
GNUNET_ASSERT(name != NULL);
FREENONNULL(setConfigurationString("FILES",
"gnunet.conf",
name));
readConfigFile(name);
-
+
for_all_symbols(i, sym) {
sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED;
sym->flags &= ~SYMBOL_VALID;
-
+
if (isConfigurationItemSet(sym->sect, sym->name)) {
- val = getConfigurationString(sym->sect, sym->name);
+ val = getConfigurationString(sym->sect, sym->name);
if (!val)
val = STRDUP("");
-
+
switch (sym->type) {
case S_TRISTATE:
if (*val == 'm') {
@@ -90,8 +90,8 @@
}
else {
LOG(LOG_ERROR,
- _("%s: symbol value `%s' invalid for %s\n"),
- name,
+ _("%s: symbol value `%s' invalid for %s\n"),
+ name,
val,
sym->name);
sym->user.val = NULL;
@@ -107,7 +107,7 @@
sym->user.tri = no;
}
-
+
if (sym && sym_is_choice_value(sym)) {
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
switch (sym->user.tri) {
@@ -126,7 +126,7 @@
cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
cs->flags &= ~SYMBOL_NEW;
}
-
+
sym_calc_value(sym);
if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
if (sym->visible == no)
@@ -143,9 +143,9 @@
FREE(val);
}
}
-
+
sym_change_count = 1;
-
+
return 0;
}
@@ -156,40 +156,40 @@
struct menu *menu;
int type;
const char *str;
-
+
sym_clear_all_valid();
- out = FOPEN(filename, "w+");
- if (NULL == out)
+ out = FOPEN(filename, "w+");
+ if (NULL == out)
return 1;
- fprintf(out,
+ fprintf(out,
"#%s"
"# Automatically generated by gnunet-setup%s"
- "#%s",
- NEWLINE,
- NEWLINE,
- NEWLINE);
+ "#%s",
+ NEWLINE,
+ NEWLINE,
+ NEWLINE);
menu = rootmenu.list;
- while (menu) {
+ while (menu) {
sym = menu->sym;
- if (!sym) {
+ if (!sym) {
str = menu_get_prompt(menu);
if (str && strlen(str) > 0) {
- fprintf(out,
+ fprintf(out,
"%s"
"#%s"
"# %s%s"
- "#%s",
+ "#%s",
NEWLINE,
NEWLINE,
- str,
- NEWLINE,
+ str,
+ NEWLINE,
NEWLINE);
}
if (menu->section && strlen(menu->section) > 0)
- fprintf(out,
+ fprintf(out,
"[%s]%s",
- menu->section,
+ menu->section,
NEWLINE);
} else if (!(sym->flags & SYMBOL_CHOICE)) {
sym_calc_value_ext(sym, 1);
@@ -205,26 +205,26 @@
case S_TRISTATE:
switch (sym_get_tristate_value(sym)) {
case no:
- fprintf(out,
+ fprintf(out,
"%s = NO",
sym->name);
break;
case mod:
- fprintf(out,
+ fprintf(out,
"%s = m",
sym->name);
break;
case yes:
- fprintf(out,
- "%s = YES",
+ fprintf(out,
+ "%s = YES",
sym->name);
break;
}
break;
case S_STRING:
- fprintf(out,
- "%s = \"%s\"",
- sym->name,
+ fprintf(out,
+ "%s = \"%s\"",
+ sym->name,
sym_get_string_value(sym));
break;
case S_HEX:
@@ -232,21 +232,21 @@
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
fprintf(out,
"%s = 0x%s",
- sym->name,
+ sym->name,
str);
break;
}
case S_INT:
- fprintf(out,
- "%s = %s",
+ fprintf(out,
+ "%s = %s",
sym->name,
sym_get_string_value(sym));
break;
}
- fprintf(out,
- "%s",
+ fprintf(out,
+ "%s",
NEWLINE);
- }
+ }
if (menu->list) {
menu = menu->list;
continue;
@@ -260,9 +260,9 @@
}
}
}
-
+
fclose(out);
sym_change_count = 0;
-
+
return 0;
}
Modified: GNUnet/src/conf/expr.c
===================================================================
--- GNUnet/src/conf/expr.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/expr.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -878,7 +878,7 @@
if (!e) {
e = expr_alloc_symbol(sym);
- if (type == E_UNEQUAL)
+ if (type == E_UNEQUAL)
e = expr_alloc_one(E_NOT, e);
return e;
}
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/gconf.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of GNUnet.
(C) 2005 Christian Grothoff (and other contributing authors)
@@ -229,16 +229,16 @@
{
GList *btn_children, *align;
GtkImage *ret = NULL;
-
+
/* button -> alignment -> hbox -> image */
-
+
btn_children = gtk_container_get_children(GTK_CONTAINER(button));
for (align = btn_children; align; align = g_list_next(align))
{
if (GTK_IS_ALIGNMENT(align->data))
{
GList *align_children, *hbox;
-
+
align_children = gtk_container_get_children(GTK_CONTAINER(align->data));
for (hbox = align_children; hbox; hbox = g_list_next(hbox))
{
@@ -259,7 +259,7 @@
}
}
g_list_free(btn_children);
-
+
return ret;
}
@@ -323,7 +323,7 @@
(gchar **) xpm_single_view);
gtk_image_set_from_pixmap(image, pixmap, mask);
}
-
+
image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button5")));
if (image)
{
@@ -333,7 +333,7 @@
(gchar **) xpm_split_view);
gtk_image_set_from_pixmap(image, pixmap, mask);
}
-
+
image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button6")));
if (image)
{
@@ -464,7 +464,7 @@
renderer,
"text", COL_OPTION,
#if BUG916
- "foreground-gdk", COL_COLOR,
+ "foreground-gdk", COL_COLOR,
#endif
NULL);
@@ -528,7 +528,7 @@
"Name", renderer,
"text", COL_NAME,
#if BUG916
- "foreground-gdk", COL_COLOR,
+ "foreground-gdk", COL_COLOR,
#endif
NULL);
renderer = gtk_cell_renderer_text_new();
@@ -753,7 +753,7 @@
filename = getConfigurationString("GNUNET-SETUP",
"FILENAME");
if (conf_write(filename))
- text_insert_msg("Error",
+ text_insert_msg("Error",
"Unable to save configuration!");
FREE(filename);
config_changed = FALSE;
@@ -1135,7 +1135,7 @@
if (!gtk_tree_model_get_iter(model2, &iter, path))
return FALSE;
-
+
gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
col = column2index(column);
@@ -1617,7 +1617,7 @@
(view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/
if ( ( (view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
- || (view_mode == FULL_VIEW)
+ || (view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW) ) {
indent++;
display_tree(child);
Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/gnunet-setup.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -157,7 +157,7 @@
conf_parse(DATADIR "/config-client.in");
}
dirname = STRDUP(filename);
-
+
c = strlen(dirname) - 1;
while(c > -1) {
char ch = dirname[c];
@@ -167,10 +167,10 @@
}
c--;
}
-
+
if (c)
mkdirp(dirname);
-
+
if((0 != ACCESS(filename,
W_OK)) &&
((0 == ACCESS(filename, F_OK)) || (0 != ACCESS(dirname, W_OK)))) {
Modified: GNUnet/src/conf/gnunet-win-tool.c
===================================================================
--- GNUnet/src/conf/gnunet-win-tool.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/gnunet-win-tool.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -221,7 +221,7 @@
fclose(pFile);
free(pMem);
-
+
printf("OK.\n");
}
Modified: GNUnet/src/conf/images.c
===================================================================
--- GNUnet/src/conf/images.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/images.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of GNUnet.
(C) 2005 Christian Grothoff (and other contributing authors)
Modified: GNUnet/src/conf/lex.zconf.c
===================================================================
--- GNUnet/src/conf/lex.zconf.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/lex.zconf.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -42,7 +42,7 @@
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
@@ -148,7 +148,7 @@
#define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n)
-
+
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
@@ -215,7 +215,7 @@
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -2094,7 +2094,7 @@
#endif
static void yyunput (int c,char *buf_ptr );
-
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
@@ -2199,7 +2199,7 @@
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
-
+
int str = 0;
int ts, i;
@@ -2904,7 +2904,7 @@
{
register yy_state_type yy_current_state;
register char *yy_cp;
-
+
yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp
)
@@ -2923,7 +2923,7 @@
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
register int yy_is_jam;
-
+
yy_current_state = yy_nxt[yy_current_state][1];
yy_is_jam = (yy_current_state <= 0);
@@ -2933,7 +2933,7 @@
static void yyunput (int c, register char * yy_bp )
{
register char *yy_cp;
-
+
yy_cp = (yy_c_buf_p);
/* undo effects of setting up zconftext */
@@ -2976,7 +2976,7 @@
{
int c;
-
+
*(yy_c_buf_p) = (yy_hold_char);
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -3043,12 +3043,12 @@
/** Immediately switch to a different input stream.
* @param input_file A readable stream.
- *
+ *
* @note This function does not reset the start condition to @c INITIAL .
*/
void zconfrestart (FILE * input_file )
{
-
+
if ( ! YY_CURRENT_BUFFER ){
zconfensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
@@ -3061,11 +3061,11 @@
/** Switch to a different input buffer.
* @param new_buffer The new input buffer.
- *
+ *
*/
void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
-
+
/* TODO. We should be able to replace this entire function body
* with
* zconfpop_buffer_state();
@@ -3105,13 +3105,13 @@
/** Allocate and initialize an input buffer state.
* @param file A readable stream.
* @param size The character buffer size in bytes. When in doubt, use @c
YY_BUF_SIZE.
- *
+ *
* @return the allocated buffer state.
*/
YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size )
{
YY_BUFFER_STATE b;
-
+
b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in
zconf_create_buffer()" );
@@ -3134,11 +3134,11 @@
/** Destroy the buffer.
* @param b a buffer created with zconf_create_buffer()
- *
+ *
*/
void zconf_delete_buffer (YY_BUFFER_STATE b )
{
-
+
if ( ! b )
return;
@@ -3159,7 +3159,7 @@
{
int oerrno = errno;
-
+
zconf_flush_buffer(b );
b->yy_input_file = file;
@@ -3175,13 +3175,13 @@
}
b->yy_is_interactive = 0;
-
+
errno = oerrno;
}
/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ *
*/
void zconf_flush_buffer (YY_BUFFER_STATE b )
{
@@ -3210,7 +3210,7 @@
* the current state. This function will allocate the stack
* if necessary.
* @param new_buffer The new state.
- *
+ *
*/
void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
{
@@ -3240,7 +3240,7 @@
/** Removes and deletes the top of the stack, if present.
* The next element becomes the new top.
- *
+ *
*/
void zconfpop_buffer_state (void)
{
@@ -3264,7 +3264,7 @@
static void zconfensure_buffer_stack (void)
{
int num_to_alloc;
-
+
if (!(yy_buffer_stack)) {
/* First allocation is just for 2 elements, since we don't know
if this
@@ -3303,13 +3303,13 @@
/** Setup the input buffer state to scan directly from a user-specified
character buffer.
* @param base the character buffer
* @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ *
+ * @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )
{
YY_BUFFER_STATE b;
-
+
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -3338,14 +3338,14 @@
/** Setup the input buffer state to scan a string. The next call to zconflex()
will
* scan from a @e copy of @a str.
* @param str a NUL-terminated string to scan
- *
+ *
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
* zconf_scan_bytes() instead.
*/
YY_BUFFER_STATE zconf_scan_string (yyconst char * yy_str )
{
-
+
return zconf_scan_bytes(yy_str,strlen(yy_str) );
}
@@ -3353,7 +3353,7 @@
* scan from a @e copy of @a bytes.
* @param bytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes.
- *
+ *
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len )
@@ -3362,7 +3362,7 @@
char *buf;
yy_size_t n;
int i;
-
+
/* Get memory for full buffer, including space for trailing EOB's. */
n = len + 2;
buf = (char *) zconfalloc(n );
@@ -3416,16 +3416,16 @@
/* Accessor methods (get/set functions) to struct members. */
/** Get the current line number.
- *
+ *
*/
int zconfget_lineno (void)
{
-
+
return zconflineno;
}
/** Get the input stream.
- *
+ *
*/
FILE *zconfget_in (void)
{
@@ -3433,7 +3433,7 @@
}
/** Get the output stream.
- *
+ *
*/
FILE *zconfget_out (void)
{
@@ -3441,7 +3441,7 @@
}
/** Get the length of the current token.
- *
+ *
*/
int zconfget_leng (void)
{
@@ -3449,7 +3449,7 @@
}
/** Get the current token.
- *
+ *
*/
char *zconfget_text (void)
@@ -3459,18 +3459,18 @@
/** Set the current line number.
* @param line_number
- *
+ *
*/
void zconfset_lineno (int line_number )
{
-
+
zconflineno = line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
- *
+ *
* @see zconf_switch_to_buffer
*/
void zconfset_in (FILE * in_str )
@@ -3496,7 +3496,7 @@
/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
int zconflex_destroy (void)
{
-
+
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
zconf_delete_buffer(YY_CURRENT_BUFFER );
@@ -3625,7 +3625,7 @@
char *realfn;
struct file *file;
struct buffer *buf;
-
+
realfn = expandDollar("Meta", STRDUP(name));
if (strlen(realfn) == 0) {
FREE(realfn);
@@ -3658,7 +3658,7 @@
file->lineno = 1;
file->parent = current_file;
current_file = file;
-
+
FREE(realfn);
}
Modified: GNUnet/src/conf/mconf.c
===================================================================
--- GNUnet/src/conf/mconf.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/mconf.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of GNUnet.
(C) 2005 Christian Grothoff (and other contributing authors)
@@ -788,16 +788,16 @@
"FILENAME");
conf_read(filename);
FREE(filename);
-
+
backtitle = malloc(128);
strcpy(backtitle, "GNUnet Configuration");
-
+
mode = getenv("MENUCONFIG_MODE");
if (mode) {
if (!strcasecmp(mode, "single_menu"))
single_menu_mode = 1;
}
-
+
#ifndef MINGW
{
struct sigaction sa;
@@ -806,22 +806,22 @@
sa.sa_flags = SA_RESTART;
sigaction(SIGWINCH, &sa, NULL);
}
-
+
tcgetattr(1, &ios_org);
#endif
atexit(conf_cleanup);
init_dialog();
-
+
init_wsize();
conf(&rootmenu);
-
+
do {
stat = dialog_yesno(NULL,
"Do you wish to save your new configuration?",
5, 60);
} while (stat < 0);
end_dialog();
-
+
if (stat == 0) {
conf_write(NULL);
printf("\n\n"
Modified: GNUnet/src/conf/mconf_util.c
===================================================================
--- GNUnet/src/conf/mconf_util.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/mconf_util.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -266,12 +266,12 @@
while (word && *word) {
sp = strchr(word, ' ');
sp_nl = strchr(word, '\n');
-
+
if (sp_nl && (sp_nl < sp || !sp))
sp = sp_nl;
else
sp_nl = NULL;
-
+
if (sp)
*sp++ = 0;
Modified: GNUnet/src/conf/menu.c
===================================================================
--- GNUnet/src/conf/menu.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/menu.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -380,7 +380,7 @@
struct file *file_lookup(const char *name)
{
struct file *file;
-
+
for (file = file_list; file; file = file->next) {
if (!strcmp(name, file->name)) {
return file;
@@ -392,6 +392,6 @@
file->name = (char *) name;
file->next = file_list;
file_list = file;
-
+
return file;
}
Modified: GNUnet/src/conf/symbol.c
===================================================================
--- GNUnet/src/conf/symbol.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/symbol.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -629,11 +629,11 @@
scope = strstr(name, "::");
if (scope) {
int len;
-
+
sect = scope;
while(sect >= name)
sect--;
-
+
len = scope - name;
sect = (char *) malloc(len + 1);
memcpy(sect, name, len);
@@ -691,7 +691,7 @@
symbol->next = symbol_hash[hash];
symbol_hash[hash] = symbol;
-
+
if (sect_alloc)
free(sect);
@@ -712,11 +712,11 @@
scope = strstr(name, "::");
if (scope) {
int len;
-
+
sect = scope;
while(sect >= name)
sect--;
-
+
len = scope - name;
sect = (char *) malloc(len + 1);
memcpy(sect, name, len);
Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/wizard.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -55,14 +55,14 @@
char * group_name = NULL;
static int nic_item_count = 0;
-void insert_nic(const char *name,
- int defaultNIC,
+void insert_nic(const char *name,
+ int defaultNIC,
void * cls)
{
gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
-
+
defaultNIC = wiz_is_nic_default(name, defaultNIC);
-
+
/* Make default selection */
if (defaultNIC)
{
@@ -266,14 +266,14 @@
grp = getgrgid(getegid());
if ( (grp != NULL) &&
(grp->gr_name != NULL) )
- group_name = STRDUP(grp->gr_name);
+ group_name = STRDUP(grp->gr_name);
else
group_name = NULL;
}
} else {
group_name = STRDUP(gname);
}
-
+
#else
if (NULL == uname || strlen(uname) == 0)
user_name = STRDUP("");
@@ -365,12 +365,12 @@
#endif
gtk_set_locale ();
-
+
filename = getConfigurationString("GNUNET-SETUP",
"FILENAME");
conf_read(filename);
FREE(filename);
-
+
sym = sym_find("EXPERIMENTAL", "Meta");
sym_set_tristate_value(sym, yes);
sym = sym_find("ADVANCED", "Meta");
Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/wizard_callbacks.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -165,17 +165,17 @@
if (conf_write(filename)) {
char * err;
const char * prefix;
-
+
prefix = _("Unable to save configuration file `%s':");
-
+
err = malloc(strlen(filename) + strlen(prefix) + 1);
sprintf(err, prefix, filename);
showErr(err, STRERROR(errno));
free(err);
-
- free(filename);
+
+ free(filename);
return 0;
- }
+ }
free(filename);
return 1;
}
@@ -392,12 +392,12 @@
on_entUser_changed (GtkEditable * editable, gpointer user_data)
{
struct symbol *sym;
-
+
if (user_name)
free(user_name);
user_name = strdup(gtk_editable_get_chars(editable, 0, -1));
-
+
sym = sym_lookup("USER", "GNUNETD", 0);
sym_set_string_value(sym, user_name);
}
@@ -407,12 +407,12 @@
on_entGroup_changed (GtkEditable * editable, gpointer user_data)
{
struct symbol *sym;
-
+
if (group_name)
free(group_name);
group_name = strdup(gtk_editable_get_chars(editable, 0, -1));
-
+
sym = sym_lookup("GROUP", "GNUNETD", 0);
sym_set_string_value(sym, group_name);
}
Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/wizard_curs.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -46,24 +46,24 @@
static struct dialog_list_item **nic_items;
static int nic_item_count = 0;
-void showCursErr(const char *prefix,
+void showCursErr(const char *prefix,
const char *error) {
char *err;
err = malloc(strlen(prefix) + strlen(error) + 2);
- sprintf(err,
- "%s %s",
- prefix,
- error);
+ sprintf(err,
+ "%s %s",
+ prefix,
+ error);
dialog_msgbox(_("Error"),
- err,
- rows,
- cols - 5,
- 1);
+ err,
+ rows,
+ cols - 5,
+ 1);
free(err);
}
-void insert_nic_curs(const char *name,
+void insert_nic_curs(const char *name,
int defaultNIC,
void * cls)
{
@@ -95,13 +95,13 @@
char *defuser;
const char *confUser;
char *defgroup;
- const char *confGroup;
+ const char *confGroup;
filename = getConfigurationString("GNUNET-SETUP",
"FILENAME");
conf_read(filename);
FREE(filename);
-
+
sym = sym_find("EXPERIMENTAL", "Meta");
sym_set_tristate_value(sym, yes);
sym = sym_find("ADVANCED", "Meta");
@@ -112,15 +112,15 @@
init_dialog();
init_wsize();
dialog_clear();
-
- if (dialog_msgbox(_("GNUnet configuration"),
+
+ if (dialog_msgbox(_("GNUnet configuration"),
_("Welcome to GNUnet!\n\nThis assistant will ask you a few
basic questions "
"in order to configure GNUnet.\n\nPlease visit our
homepage at\n\t"
"http://gnunet.org/\nand join our community at\n\t"
"http://gnunet.org/drupal/\n\nHave a lot of fun,\n\nthe
GNUnet team"),
rows, cols - 5, 1) == -1)
goto end;
-
+
dialog_clear();
enumNetworkIfs(insert_nic_curs, NULL);
@@ -132,7 +132,7 @@
_("Choose the network interface that connects your
computer to "
"the internet from the list below."), rows, cols - 5,
10,
0, active_ptr, nic_item_count, nic_items);
-
+
if (ret == 2) {
/* Help */
dialog_msgbox(_("Help"), _("The \"Network interface\" is the device "
@@ -149,7 +149,7 @@
char *nic;
#endif
for(idx = 0; idx < nic_item_count; idx++) {
-
+
if (nic_items[idx]->selected) {
#ifdef MINGW
char *src = strrchr(nic_items[idx]->name, '-') + 2;
@@ -165,7 +165,7 @@
sym = sym_lookup("INTERFACES", "LOAD", 0);
sym_set_string_value(sym, nic);
}
-
+
free(nic_items[idx]->name);
free(nic_items[idx]);
}
@@ -174,21 +174,21 @@
break;
}
}
-
+
if (ret == 1 || ret == -1)
goto end;
}
else {
/* We are not root, just ask for the interface */
while(true) {
- ret = dialog_inputbox(_("GNUnet configuration"),
+ ret = dialog_inputbox(_("GNUnet configuration"),
_("What is the name of " \
"the network interface that connects your
computer to the Internet?"),
rows, cols - 5, "eth0");
-
+
if (ret == 1) {
/* Help */
- dialog_msgbox(_("Help"),
+ dialog_msgbox(_("Help"),
_("The \"Network interface\" is the device "
"that connects your computer to the internet. This is
usually a modem, "
"an ISDN card or a network card in case you are using
DSL."),
@@ -197,18 +197,18 @@
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym = sym_lookup("INTERFACE", "NETWORK", 0);
sym_set_string_value(sym, dialog_input_result);
sym = sym_lookup("INTERFACES", "LOAD", 0);
sym_set_string_value(sym, dialog_input_result);
}
-
+
dialog_clear();
-
+
/* IP address */
if ((sym = sym_find("IP", "NETWORK"))) {
sym_calc_value_ext(sym, 1);
@@ -216,16 +216,16 @@
}
else
defval = NULL;
-
+
while(true) {
- ret = dialog_inputbox(_("GNUnet configuration"),
+ ret = dialog_inputbox(_("GNUnet configuration"),
_("What is this computer's "
"public IP address or hostname?\n\nIf in doubt,
leave this empty."),
rows, cols - 5, defval ? defval : "");
-
+
if (ret == 1) {
/* Help */
- dialog_msgbox(_("Help"),
+ dialog_msgbox(_("Help"),
_("If your provider always assigns the same "
"IP-Address to you (a \"static\" IP-Address), enter it
into the "
"\"IP-Address\" field. If your IP-Address changes every
now and then "
@@ -237,14 +237,14 @@
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym_set_string_value(sym, dialog_input_result);
-
+
dialog_clear();
-
+
/* NAT? */
sym = sym_find("LIMITED", "NAT");
while(true) {
@@ -255,16 +255,16 @@
"on the internet cannot connect to this computer, say
\"yes\" here. "
"Answer \"no\" on direct connections through modems,
ISDN cards and "
"DNAT (also known as \"port forwarding\")."), rows,
cols - 5);
-
+
if (ret != -2)
break;
}
-
+
if (ret == -1)
goto end;
else
sym_set_tristate_value(sym, !ret); /* ret is inverted */
-
+
/* Upstream */
if ((sym = sym_find("MAXNETUPBPSTOTAL", "LOAD"))) {
sym_calc_value_ext(sym, 1);
@@ -272,12 +272,12 @@
}
else
defval = NULL;
-
+
while(true) {
- ret = dialog_inputbox(_("GNUnet configuration"),
+ ret = dialog_inputbox(_("GNUnet configuration"),
_("How much upstream "
"(Bytes/s) may be used?"), rows, cols - 5, defval ?
defval : "");
-
+
if (ret == 1) {
/* Help */
dialog_msgbox(_("Help"), _("You can limit GNUnet's resource usage "
@@ -290,14 +290,14 @@
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym_set_string_value(sym, dialog_input_result);
-
+
dialog_clear();
-
+
/* Downstram */
if ((sym = sym_find("MAXNETDOWNBPSTOTAL", "LOAD"))) {
sym_calc_value_ext(sym, 1);
@@ -305,14 +305,14 @@
}
else
defval = NULL;
-
+
while(true) {
ret = dialog_inputbox(_("GNUnet configuration"), _("How much downstream "
"(Bytes/s) may be
used?"), rows, cols - 5, defval ? defval : "");
-
+
if (ret == 1) {
/* Help */
- dialog_msgbox(_("Help"),
+ dialog_msgbox(_("Help"),
_("You can limit GNUnet's resource usage "
"here.\n\nThe \"downstream\" is the data channel through
which data "
"is *received* from the internet. The limit is either the
total maximum "
@@ -323,18 +323,18 @@
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym_set_string_value(sym, dialog_input_result);
-
+
dialog_clear();
-
+
/* Bandwidth allocation */
sym = sym_find("BASICLIMITING", "LOAD");
while (true) {
- ret = dialog_yesno(_("GNUnet configuration"),
+ ret = dialog_yesno(_("GNUnet configuration"),
_("Share denoted bandwidth "
"with other applications?\n\nSay \"yes\" here, if you
don't want other "
"network traffic to interfere with GNUnet's operation,
but still wish to "
@@ -345,18 +345,18 @@
"want to limit the traffic that GNUnet can inflict on
your internet "
"connection whenever your high-speed LAN gets used
(e.g. by NFS)."),
rows, cols - 5);
-
+
if (ret != -2)
break;
}
-
+
if (ret == -1)
goto end;
else
sym_set_tristate_value(sym, !ret); /* ret is inverted */
-
+
dialog_clear();
-
+
/* Max CPU */
if ((sym = sym_find("MAXCPULOAD", "LOAD"))) {
sym_calc_value_ext(sym, 1);
@@ -364,12 +364,12 @@
}
else
defval = NULL;
-
+
while(true) {
- ret = dialog_inputbox(_("GNUnet configuration"),
+ ret = dialog_inputbox(_("GNUnet configuration"),
_("How much CPU (in %) may "
"be used?"), rows, cols - 5, defval ? defval : "");
-
+
if (ret == 1) {
/* Help */
dialog_msgbox(_("Help"),
@@ -380,18 +380,18 @@
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym_set_string_value(sym, dialog_input_result);
-
+
dialog_clear();
-
+
/* Migration */
sym = sym_find("ACTIVEMIGRATION", "FS");
while(true) {
- ret = dialog_yesno(_("GNUnet configuration"),
+ ret = dialog_yesno(_("GNUnet configuration"),
_("Store migrated content?"
"\n\nGNUnet is able to store data from other peers in
your datastore. "
"This is useful if an adversary has access to your
inserted content and "
@@ -399,18 +399,18 @@
"on, the content could have \"migrated\" over the
internet to your node"
" without your knowledge.\nIt also helps to spread
popular content over "
"different peers to enhance availability."), rows,
cols - 5);
-
+
if (ret != -2)
break;
}
-
+
if (ret == -1)
goto end;
else
sym_set_tristate_value(sym, !ret); /* ret is inverted */
dialog_clear();
-
+
/* Quota */
if ((sym = sym_find("QUOTA", "FS"))) {
sym_calc_value_ext(sym, 1);
@@ -418,28 +418,28 @@
}
else
defval = NULL;
-
+
while(true) {
- ret = dialog_inputbox(_("GNUnet configuration"),
+ ret = dialog_inputbox(_("GNUnet configuration"),
_("What's the maximum "
"datastore size in MB?\n\nThe GNUnet datastore
contains all data that "
"GNUnet generates (index data, inserted and
migrated content)."),
rows, cols - 5, defval ? defval : "");
-
+
if (ret == 1) {
/* Help - not available */
}
else if (ret <= 0)
break;
}
-
+
if (ret == -1)
goto end;
-
+
sym_set_string_value(sym, dialog_input_result);
-
+
dialog_clear();
-
+
/* Autostart */
if (isOSAutostartCapable()) {
while(true) {
@@ -450,23 +450,23 @@
"automatically started when you turn on your
computer. If you say \"no\""
" here, you have to launch GNUnet yourself each time
you want to use it."),
rows, cols - 5);
-
+
if (ret != -2)
break;
}
-
+
if (ret == -1)
goto end;
else
autostart = !ret; /* ret is inverted */
-
+
dialog_clear();
}
-
+
/* User */
if (isOSUserAddCapable()) {
while(true) {
-
+
sym = sym_find("USER", "GNUNETD");
if (sym)
{
@@ -475,7 +475,7 @@
}
else
confUser = NULL;
-
+
#ifndef MINGW
if ((NULL == confUser) || (strlen(confUser) == 0))
{
@@ -497,7 +497,7 @@
else
defuser = STRDUP(confUser);
#endif
-
+
ret = dialog_inputbox(_("GNUnet configuration"),
_("Define the user owning the GNUnet service.\n\n"
"For security reasons, it is a good idea to let
this setup create "
@@ -509,7 +509,7 @@
"Leave the fields empty to run GNUnet with system
privileges.\n\n"
"GNUnet user:"), rows, cols - 5, defuser);
FREE(defuser);
-
+
if (ret == 1) {
/* Help */
} else if (ret <= 0) {
@@ -517,12 +517,12 @@
break;
}
}
-
+
if (ret == -1)
goto end;
-
+
dialog_clear();
-
+
/* Group */
if (isOSGroupAddCapable()) {
while(true) {
@@ -553,7 +553,7 @@
else
defgroup = STRDUP(confGroup);
#else
- if ( (NULL == confGroup) ||
+ if ( (NULL == confGroup) ||
(strlen(confGroup) == 0) )
defgroup = STRDUP("");
else
@@ -579,48 +579,48 @@
break;
}
}
-
+
if (ret == -1)
goto end;
-
+
dialog_clear();
}
}
-
+
dialog_clear();
-
+
/* Advanced */
while(true) {
- ret = dialog_yesno(_("GNUnet configuration"),
+ ret = dialog_yesno(_("GNUnet configuration"),
_("If you are an experienced "
"user, you may want to tweak your GNUnet installation
using the enhanced "
"configurator.\n\nDo you want to start it after saving
your configuration?"),
rows, cols - 5);
-
+
if (ret != -2)
break;
}
-
+
if (ret == -1)
goto end;
else
adv = !ret;
-
+
dialog_clear();
end_dialog();
-
+
/* Save config */
- if ( (user_name != NULL) &&
+ if ( (user_name != NULL) &&
(strlen(user_name) > 0) )
if (!isOSUserAddCapable())
showCursErr(_("Unable to create user account:"), STRERROR(errno));
-
+
if (!isOSAutostartCapable())
showCursErr(_("Unable to change startup process:"), STRERROR(errno));
-
+
init_dialog();
dialog_clear();
-
+
while(true) {
confFile = getConfigurationString("GNUNET-SETUP",
"FILENAME");
@@ -628,37 +628,37 @@
char * err;
const char * prefix;
const char * strerr;
-
+
prefix = _("Unable to save configuration file %s: %s.\n\nTry again?");
strerr = STRERROR(errno);
-
+
err = malloc(strlen(confFile) + strlen(prefix) + strlen(strerr) + 1);
sprintf(err, prefix, confFile, strerr);
-
+
ret = dialog_yesno(_("GNUnet configuration"),
- err,
- rows,
+ err,
+ rows,
cols - 5);
-
+
free(err);
- }
+ }
else
ret = 1;
-
+
if (ret == 1 || ret == -1)
break;
}
-
+
end:
end_dialog();
-
+
FREENONNULL(user_name);
FREENONNULL(group_name);
-
+
if (adv) {
mconf_main();
}
-
+
return 0;
}
Modified: GNUnet/src/conf/wizard_util.c
===================================================================
--- GNUnet/src/conf/wizard_util.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/conf/wizard_util.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -37,7 +37,7 @@
int wiz_is_nic_default(const char *name, int suggestion) {
const char *nic = NULL;
struct symbol *sym = sym_find("INTERFACE", "NETWORK");
-
+
if (sym)
{
sym_calc_value_ext(sym, 1);
@@ -66,7 +66,7 @@
suggestion = 1; /* This is the previous selection */
}
}
-
+
return suggestion;
}
@@ -79,9 +79,9 @@
* @return 1 on success, 0 on error
*/
int wiz_autostartService(int doAutoStart, char *username, char *groupname) {
- int ret = autostartService(doAutoStart,
- username,
- groupname);
+ int ret = autostartService(doAutoStart,
+ username,
+ groupname);
if (ret ) {
#ifdef MINGW
char *err;
@@ -114,16 +114,16 @@
break;
default:
err = winErrorStr(_("Unknown error"), GetLastError());
- }
- MessageBox(GetActiveWindow(),
- err,
+ }
+ MessageBox(GetActiveWindow(),
+ err,
_("Error"),
MB_ICONSTOP | MB_OK);
free(err);
#endif
-
+
return 0;
- }
+ }
return 1;
}
@@ -135,7 +135,7 @@
*/
int wiz_createGroupUser(char *group_name, char *user_name) {
int ret = createGroupUser(group_name, user_name);
-
+
if (ret) {
#ifdef MINGW
char *err;
@@ -157,14 +157,14 @@
default:
err = winErrorStr(_("Unknown error while creating a new user"),
GetLastError());
}
-
+
if (err) {
MessageBox(0, err, _("Error"), MB_ICONSTOP | MB_OK);
free(err);
}
-#endif
+#endif
return 0;
- }
+ }
return 1;
}
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2005-08-31 21:25:11 UTC (rev
2034)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2005-08-31 21:26:22 UTC (rev
2035)
@@ -254,7 +254,7 @@
* How much has been done so far.
*/
unsigned long long completed;
-
+
/**
* Which file was uploaded?
*/
@@ -517,7 +517,7 @@
/**
* Clear all completed top-level downloads from the FSUI list.
- *
+ *
* @param callback function to call on each completed download
* that is being cleared.
* @return SYSERR on error, otherwise number of downloads cleared
@@ -528,10 +528,10 @@
/**
- * Get parent of active download.
+ * Get parent of active download.
* @return NULL if there is no parent
*/
-const struct FSUI_DownloadList *
+const struct FSUI_DownloadList *
FSUI_getDownloadParent(const struct FSUI_DownloadList * child); /* download.c
*/
/**
@@ -663,7 +663,7 @@
* @param meta meta-data about the namespace (maybe NULL)
* @return URI on success, NULL on error (namespace already exists)
*/
-struct ECRS_URI *
+struct ECRS_URI *
FSUI_createNamespace(struct FSUI_Context * ctx,
unsigned int anonymityLevel,
const char * namespaceName,
@@ -798,7 +798,7 @@
* Toggle tracking URIs.
*
* @param onOff YES to enable tracking, NO to disable
- * disabling tracking
+ * disabling tracking
*/
void FSUI_trackURIS(int onOff); /* file_info.c */
Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/include/gnunet_util.h 2005-08-31 21:26:22 UTC (rev 2035)
@@ -79,7 +79,7 @@
/**
* Named constants for return values. The following
* invariants hold: "NO == 0" (to allow "if (NO)")
- * "OK != SYSERR", "OK != NO", "NO != SYSERR"
+ * "OK != SYSERR", "OK != NO", "NO != SYSERR"
* and finally "YES != NO".
*/
#define OK 1
@@ -642,7 +642,7 @@
* will NOT be discarded if this method is invoked twice.
* @param fn the file to read
* @return YES on success, NO otherwise
- */
+ */
int readConfigFile(const char *fn);
/**
@@ -2386,9 +2386,9 @@
*/
char *winErrorStr(char *prefix, int dwErr);
-/**
+/**
* Checks if gnunetd is running
- *
+ *
* Uses CS_PROTO_traffic_COUNT query to determine if gnunetd is
* running.
*
@@ -2398,7 +2398,7 @@
/**
* Start gnunetd process
- *
+ *
* @param daemonize YES if gnunetd should be daemonized
* @return pid_t of gnunetd if NOT daemonized, 0 if
* daemonized sucessfully, -1 on error
@@ -2406,7 +2406,7 @@
int startGNUnetDaemon(int daemonize);
-/**
+/**
* Stop gnunetd
*
* Note that returning an error does NOT mean that
@@ -2430,7 +2430,7 @@
/**
* Wait until the gnunet daemon is
* running.
- *
+ *
* @param timeout how long to wait at most
* @return OK if gnunetd is now running
*/
@@ -2442,11 +2442,11 @@
* matter) with the given PID has terminated. Assumes that
* the daemon was started with startGNUnetDaemon in no-daemonize mode.
* On arbitrary PIDs, this function may fail unexpectedly.
- *
+ *
* @return YES if gnunetd shutdown with
* return value 0, SYSERR if waitpid
* failed, NO if gnunetd shutdown with
- * some error
+ * some error
*/
int waitForGNUnetDaemonTermination(int pid);
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/server/connection.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -335,7 +335,7 @@
SESSIONKEY skey_remote;
/** at which time was the remote sessionkey created */
TIME_T skey_remote_created;
- /** is this host alive? timestamp of the time of the last-active
+ /** is this host alive? timestamp of the time of the last-active
point (as witnessed by some higher-level application, typically
topology+pingpong) */
cron_t isAlive;
@@ -850,7 +850,7 @@
solutions for any MIN_SAMPLE_TIME! */
if (be->MAX_SEND_FREQUENCY > MIN_SAMPLE_TIME / MINIMUM_SAMPLE_COUNT)
be->MAX_SEND_FREQUENCY = MIN_SAMPLE_TIME / MINIMUM_SAMPLE_COUNT;
-
+
if ( (be->lastSendAttempt + be->MAX_SEND_FREQUENCY > cronTime(NULL)) &&
(be->sendBufferSize < MAX_SEND_BUFFER_SIZE/4) ) {
#if DEBUG_CONNECTION
@@ -875,7 +875,7 @@
int i;
int j;
int approxProb;
-
+
totalMessageSize = 0;
(*priority) = 0;
@@ -949,8 +949,8 @@
(*priority) = solveKnapsack(be,
be->session.mtu -
sizeof(P2P_PACKET_HEADER));
#if DEBUG_COLLECT_PRIO == YES
- FPRINTF(prioFile,
- "%llu 1 %d\n",
+ FPRINTF(prioFile,
+ "%llu 1 %d\n",
cronTime(NULL),
priority);
#endif
@@ -960,8 +960,8 @@
be->session.mtu - sizeof(P2P_PACKET_HEADER));
#if DEBUG_COLLECT_PRIO == YES
FPRINTF(prioFile,
- "%llu 2 %d\n",
- cronTime(NULL),
+ "%llu 2 %d\n",
+ cronTime(NULL),
priority);
#endif
}
@@ -1005,7 +1005,7 @@
}
/**
- * Expire old messages from SendBuffer (to avoid
+ * Expire old messages from SendBuffer (to avoid
* running out of memory).
*/
static void expireSendBufferEntries(BufferEntry * be) {
@@ -1024,7 +1024,7 @@
"policy prevents sending message (priority too low: %d)\n",
priority);
#endif
-
+
l = getCPULoad();
/* cleanup queue */
if (l >= 50) {
@@ -1038,21 +1038,21 @@
if (be->max_bpm > 2) {
msgCap += 2 * (int) log((double)be->max_bpm);
if (msgCap >= MAX_SEND_BUFFER_SIZE-1)
- msgCap = MAX_SEND_BUFFER_SIZE-2;
+ msgCap = MAX_SEND_BUFFER_SIZE-2;
/* try to make sure that there
is always room... */
}
freeSlots = 0;
/* allow at least msgCap msgs in buffer */
- for (i=0;i<be->sendBufferSize;i++)
+ for (i=0;i<be->sendBufferSize;i++)
if (be->sendBuffer[i] == NULL)
freeSlots++;
for (i=0;i<be->sendBufferSize;i++) {
entry = be->sendBuffer[i];
if (entry == NULL)
- continue;
+ continue;
if (be->sendBufferSize <= msgCap + freeSlots)
break;
if (entry->transmissionTime < expired) {
@@ -1071,16 +1071,16 @@
be->sendBuffer[i] = NULL;
freeSlots++;
}
- }
+ }
/* cleanup/compact sendBuffer */
j = 0;
for (i=0;i<be->sendBufferSize;i++)
- if (be->sendBuffer[i] != NULL)
- be->sendBuffer[j++] = be->sendBuffer[i];
+ if (be->sendBuffer[i] != NULL)
+ be->sendBuffer[j++] = be->sendBuffer[i];
GROW(be->sendBuffer,
be->sendBufferSize,
- j);
+ j);
}
/**
@@ -1205,7 +1205,7 @@
(entry->closure == NULL) ) {
FREE(entry);
be->sendBuffer[i] = NULL;
- }
+ }
}
}
@@ -1224,7 +1224,7 @@
int ret;
int j;
int changed;
-
+
if (be->session.tsession == NULL) {
be->session.tsession
= transport->connectFreely(&be->session.sender,
@@ -1245,11 +1245,11 @@
entry = entries[i];
if (entry->len > be->session.mtu - sizeof(P2P_PACKET_HEADER)) {
ret--;
- for (j=i;j<ret;j++)
+ for (j=i;j<ret;j++)
entries[j] = entries[j+1]; /* preserve ordering */
GROW(be->sendBuffer,
be->sendBufferSize,
- ret);
+ ret);
/* calling fragment will change be->sendBuffer;
thus we need to restart from the beginning afterwards... */
fragmentation->fragment(&be->session.sender,
@@ -1324,7 +1324,7 @@
be->available_send_window,
be->session.mtu);
#endif
-
+
totalMessageSize = selectMessagesToSend(be,
&priority);
if (totalMessageSize == 0) {
@@ -1334,7 +1334,7 @@
}
totalMessageSize += sizeof(P2P_PACKET_HEADER);
- /* check if we (sender) have enough bandwidth available
+ /* check if we (sender) have enough bandwidth available
if so, trigger callbacks on selected entries; if either
fails, return (but clean up garbage) */
if ( (SYSERR == outgoingCheck(priority)) ||
@@ -1361,7 +1361,7 @@
for (i=0;i<be->sendBufferSize;i++) {
SendEntry * entry = be->sendBuffer[perm[i]];
-
+
if (entry == NULL)
continue;
if (entry->knapsackSolution == YES) {
@@ -1745,16 +1745,16 @@
hangup.header.type
= htons(P2P_PROTO_hangup);
- hangup.header.size
+ hangup.header.size
= htons(sizeof(P2P_hangup_MESSAGE));
identity->getPeerIdentity(identity->getPublicPrivateKey(),
&hangup.sender);
se = MALLOC(sizeof(SendEntry));
- se->len
+ se->len
= sizeof(P2P_hangup_MESSAGE);
se->flags
= SE_FLAG_PLACE_TAIL;
- se->pri
+ se->pri
= EXTREME_PRIORITY;
se->transmissionTime
= cronTime(NULL); /* now */
@@ -1866,7 +1866,7 @@
return;
}
- activePeerCount = forAllConnectedHosts(NULL, NULL);
+ activePeerCount = forAllConnectedHosts(NULL, NULL);
if (activePeerCount == 0) {
MUTEX_UNLOCK(&lock);
return; /* nothing to be done here. */
@@ -1923,7 +1923,7 @@
minCon = minConnect();
if (minCon > activePeerCount)
minCon = activePeerCount;
- schedulableBandwidth
+ schedulableBandwidth
= max_bpm - minCon * MIN_BPM_PER_PEER;
load = getNetworkLoadDown();
if (load > 100) {
@@ -1966,7 +1966,7 @@
(adjustedRR[u] > 2 * MAX_BUF_FACT *
entries[u]->max_transmitted_limit) &&
(adjustedRR[u] > 2 * MAX_BUF_FACT *
- entries[u]->idealized_limit) ) {
+ entries[u]->idealized_limit) ) {
EncName enc;
entries[u]->violations++;
@@ -2003,9 +2003,9 @@
entries[u]->violations--;
}
}
-
+
if (adjustedRR[u] < MIN_BPM_PER_PEER/2)
- adjustedRR[u] = MIN_BPM_PER_PEER/2;
+ adjustedRR[u] = MIN_BPM_PER_PEER/2;
/* even if we received NO traffic, allow
at least MIN_BPM_PER_PEER */
}
@@ -2073,7 +2073,7 @@
/* assign rest disregarding traffic limits */
perm = permute(WEAK, activePeerCount);
for (u=0;u<activePeerCount;u++)
- entries[perm[u]]->idealized_limit
+ entries[perm[u]]->idealized_limit
+= (unsigned int) (schedulableBandwidth/activePeerCount);
schedulableBandwidth = 0;
FREE(perm);
@@ -2081,7 +2081,7 @@
}
} /* didAssign == NO? */
if (firstRound == YES) {
- /* keep some bandwidth off the market
+ /* keep some bandwidth off the market
for new connections */
schedulableBandwidth /= 2;
}
@@ -2094,7 +2094,7 @@
good since it creates opportunities. */
if (activePeerCount > 0)
for (u=0;u<minCon;u++)
- entries[randomi(activePeerCount)]->idealized_limit
+ entries[randomi(activePeerCount)]->idealized_limit
+= MIN_BPM_PER_PEER;
/* prepare for next round */
@@ -2172,7 +2172,7 @@
now - root->isAlive);
shutdownConnection(root);
/* the host may still be worth trying again soon: */
- identity->whitelistHost(&root->session.sender);
+ identity->whitelistHost(&root->session.sender);
}
break;
default: /* not up, not down - partial SETKEY exchange */
@@ -2314,7 +2314,7 @@
}
} else {
be->lastPacketsBitmap =
- be->lastPacketsBitmap
+ be->lastPacketsBitmap
<< (sequenceNumber - be->lastSequenceNumberReceived);
be->lastSequenceNumberReceived = sequenceNumber;
}
@@ -2440,7 +2440,7 @@
(be->status != STAT_UP) ) {
be->status = STAT_UP;
be->lastSequenceNumberReceived = 0;
- be->lastSequenceNumberSend = 1;
+ be->lastSequenceNumberSend = 1;
}
}
MUTEX_UNLOCK(&lock);
@@ -2619,7 +2619,7 @@
max_bpm = new_max_bpm;
newMAXHOSTS
= max_bpm / (MIN_BPM_PER_PEER*2);
- /* => for 1000 bps, we get 12 (rounded DOWN to 8) connections! */
+ /* => for 1000 bps, we get 12 (rounded DOWN to 8) connections! */
if (newMAXHOSTS < 2)
newMAXHOSTS = 2; /* strict minimum is 2 */
if (newMAXHOSTS > 256)
@@ -3053,7 +3053,7 @@
char * closure;
unsigned short len;
- if (msg == NULL) {
+ if (msg == NULL) {
/* little hack for topology,
which cannot do this directly
due to cyclic dependencies! */
@@ -3065,7 +3065,7 @@
if (len == 0)
return;
closure = MALLOC(len);
- memcpy(closure,
+ memcpy(closure,
msg,
len);
unicastCallback(receiver,
Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/server/core.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -192,7 +192,7 @@
#endif
unloadDynamicLibrary(library);
FREE(name);
- FREE(nxt);
+ FREE(nxt);
}
return ok;
}
Modified: GNUnet/src/server/gnunet-update.c
===================================================================
--- GNUnet/src/server/gnunet-update.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/server/gnunet-update.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -179,7 +179,7 @@
rpos);
if (pos == NULL)
pos = STRDUP(rpos);
-
+
name = MALLOC(strlen(pos) + strlen("module_") + 1);
strcpy(name, "module_");
strcat(name, pos);
Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/server/gnunetd.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -100,7 +100,7 @@
*/
void gnunet_main() {
int filedes[2]; /* pipe between client and parent */
-
+
/* init 0: change user */
#ifndef MINGW
char *user = getConfigurationString("GNUNETD", "USER");
Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/server/handler.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -298,7 +298,7 @@
unsigned short handlerType) {
int pos;
int ret;
-
+
if (handlerType == 3)
return isCSHandlerRegistered(type);
if (handlerType > 3) {
@@ -306,7 +306,7 @@
return SYSERR;
}
ret = 0;
- MUTEX_LOCK(&handlerLock);
+ MUTEX_LOCK(&handlerLock);
if (type < plaintextmax_registeredType) {
pos = 0;
while (plaintextHandlers[type][pos] != NULL)
@@ -317,7 +317,7 @@
}
if (type < max_registeredType) {
pos = 0;
- while (handlers[type][pos] != NULL)
+ while (handlers[type][pos] != NULL)
pos++;
if ( (handlerType == 1) ||
(handlerType == 2) )
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/transports/http.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -460,7 +460,7 @@
(httpSession->httpReadBuff[k] != '\r') )
k++;
if ( (k < httpSession->httpRPos-1) &&
- (k > i+2) &&
+ (k > i+2) &&
(httpSession->httpReadBuff[k] == '\r') &&
(httpSession->httpReadBuff[k+1] == '\n') ) {
unsigned int len;
@@ -475,14 +475,14 @@
(len == 0) )
continue;
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"http receiving chunk of %u bytes\n",
len);
#endif
if (len >= MAX_BUFFER_SIZE) {
BREAK(); /* FIMXE: inline method and do proper
error handling! */
- httpSession->httpRPos = 0;
+ httpSession->httpRPos = 0;
} else {
GROW(httpSession->rbuff,
httpSession->rsize,
@@ -492,7 +492,7 @@
memcpy(httpSession->rbuff,
&httpSession->httpReadBuff[k+2],
len);
- httpSession->rpos = len;
+ httpSession->rpos = len;
memmove(httpSession->httpReadBuff,
&httpSession->httpReadBuff[k+2+len],
httpSession->httpRPos - (k+2+len));
@@ -530,7 +530,7 @@
ret = READ(httpSession->sock,
&httpSession->httpReadBuff[httpSession->httpRPos],
httpSession->httpRSize - httpSession->httpRPos);
- if ( (ret > 0) &&
+ if ( (ret > 0) &&
(stats != NULL) )
stats->change(stat_bytesReceived,
ret);
@@ -552,7 +552,7 @@
ret = READ(httpSession->sock,
&httpSession->rbuff[httpSession->rpos],
httpSession->rsize - httpSession->rpos);
- if ( (ret > 0) &&
+ if ( (ret > 0) &&
(stats != NULL) )
stats->change(stat_bytesReceived,
ret);
@@ -567,12 +567,12 @@
return SYSERR; /* error! */
}
}
-#if DEBUG_HTTP
+#if DEBUG_HTTP
LOG(LOG_DEBUG,
"Got message of %u out of %u bytes\n",
httpSession->rpos,
httpSession->rsize);
-#endif
+#endif
if ( (httpSession->rsize == 0) ||
(httpSession->rpos != httpSession->rsize) ) {
/* only have partial message yet */
@@ -1007,10 +1007,10 @@
len += ssize;
incrementBytesSent(len);
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"http sending chunk of %u bytes\n",
ssize);
-#endif
+#endif
success = SEND_NONBLOCKING(httpSession->sock,
httpSession->wbuff,
len,
@@ -1024,7 +1024,7 @@
}
if (success == NO)
ret = 0;
- if (stats != NULL)
+ if (stats != NULL)
stats->change(stat_bytesSent,
ret);
if (ret > 0) {
@@ -1040,7 +1040,7 @@
len = 0;
}
}
-
+
httpSession->wpos = len;
if (len > 0)
signalSelect(); /* select set changed! */
@@ -1101,7 +1101,7 @@
}
LOG(LOG_DEBUG,
"HTTP uses IP address %u.%u.%u.%u.\n",
- PRIP(ntohl(*(int*)&haddr->ip)));
+ PRIP(ntohl(*(int*)&haddr->ip)));
haddr->port = htons(port);
haddr->reserved = htons(0);
msg->senderAddressSize = htons(sizeof(HostAddress));
@@ -1249,7 +1249,7 @@
}
if (((HTTPSession*)tsession->internal)->sock == -1) {
- if (stats != NULL)
+ if (stats != NULL)
stats->change(stat_bytesDropped,
size);
return SYSERR; /* other side closed connection */
@@ -1259,7 +1259,7 @@
msg,
size);
if (ok != OK) {
- if (stats != NULL)
+ if (stats != NULL)
stats->change(stat_bytesDropped,
size);
}
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/transports/smtp.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -353,7 +353,7 @@
goto try_again;
}
- if ( (i == 0) || (i == (size_t) -1) )
+ if ( (i == 0) || (i == (size_t) -1) )
return SYSERR;
while (i > 0) {
if (buff[pos++] == '\n')
@@ -363,11 +363,11 @@
}
END:
buff[pos] = '\0';
- if (strncmp(expect,
- &buff[0],
+ if (strncmp(expect,
+ &buff[0],
strlen(expect)) == 0)
return OK;
- else
+ else
return SYSERR;
}
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/transports/tcp.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -399,7 +399,7 @@
ret = READ(tcpSession->sock,
&tcpSession->rbuff[tcpSession->pos],
tcpSession->rsize - tcpSession->pos);
- if ( (ret > 0) &&
+ if ( (ret > 0) &&
(stats != NULL) )
stats->change(stat_bytesReceived,
ret);
@@ -432,7 +432,7 @@
tcpSession->pos += ret;
while (tcpSession->pos > 2) {
- len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ sizeof(TCPP2P_PACKET);
if (len > tcpSession->rsize) /* if message larger than read buffer, grow!
*/
GROW(tcpSession->rbuff,
@@ -459,7 +459,7 @@
welcome = (TCPWelcome*) &tcpSession->rbuff[0];
if ( (ntohs(welcome->header.reserved) != 0) ||
- (ntohs(welcome->header.size)
+ (ntohs(welcome->header.size)
!= sizeof(TCPWelcome) - sizeof(TCPP2P_PACKET)) ) {
LOG(LOG_WARNING,
_("Expected welcome message on tcp connection, "
@@ -483,7 +483,7 @@
&tcpSession->rbuff[sizeof(TCPWelcome)],
tcpSession->pos - sizeof(TCPWelcome));
tcpSession->pos -= sizeof(TCPWelcome);
- len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ sizeof(TCPP2P_PACKET);
}
if ( (tcpSession->pos < 2) ||
@@ -755,8 +755,8 @@
Let's sleep and try again. */
gnunet_util_sleep(20);
goto try_again_1;
- }
- if (stats != NULL)
+ }
+ if (stats != NULL)
stats->change(stat_bytesSent,
ret);
@@ -827,15 +827,15 @@
int success;
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpDirectSend called to transmit %u bytes.\n",
ssize);
-#endif
+#endif
if (tcp_shutdown == YES) {
#if DEBUG_TCP
LOG(LOG_DEBUG,
- "tcpDirectSend called while TCP transport is shutdown.\n");
-#endif
+ "tcpDirectSend called while TCP transport is shutdown.\n");
+#endif
return SYSERR;
}
if (tcpSession->sock == -1) {
@@ -855,8 +855,8 @@
#if DEBUG_TCP
LOG(LOG_DEBUG,
"write already pending, will not take additional message.\n");
-#endif
- if (stats != NULL)
+#endif
+ if (stats != NULL)
stats->change(stat_bytesDropped,
ssize);
MUTEX_UNLOCK(&tcplock);
@@ -880,7 +880,7 @@
}
if (success == NO)
ret = 0;
- if (stats != NULL)
+ if (stats != NULL)
stats->change(stat_bytesSent,
ret);
@@ -901,7 +901,7 @@
ssize - ret);
tcpSession->wpos = ssize - ret;
signalSelect(); /* select set changed! */
- }
+ }
cronTime(&tcpSession->lastUse);
MUTEX_UNLOCK(&tcplock);
incrementBytesSent(ssize);
@@ -924,10 +924,10 @@
int ok;
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpDirectSendReliable called to transmit %u bytes.\n",
ssize);
-#endif
+#endif
if (tcp_shutdown == YES) {
#if DEBUG_TCP
LOG(LOG_INFO,
@@ -957,9 +957,9 @@
mp,
ssize);
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpDirectSendReliable appended message to send buffer.\n");
-#endif
+#endif
ok = OK;
} else {
@@ -1162,11 +1162,11 @@
/* send our node identity to the other side to fully establish the
connection! */
- welcome.header.size
+ welcome.header.size
= htons(sizeof(TCPWelcome) - sizeof(TCPP2P_PACKET));
- welcome.header.reserved
+ welcome.header.reserved
= htons(0);
- welcome.clientIdentity
+ welcome.clientIdentity
= *(coreAPI->myIdentity);
if (SYSERR == tcpDirectSend(tcpSession,
&welcome,
@@ -1198,10 +1198,10 @@
int ok;
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpSend called to transmit %u bytes.\n",
size);
-#endif
+#endif
if (size >= MAX_BUFFER_SIZE) {
BREAK();
return SYSERR;
@@ -1209,28 +1209,28 @@
if (tcp_shutdown == YES) {
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpSend called while TCP is shutdown.\n");
-#endif
- if (stats != NULL)
+#endif
+ if (stats != NULL)
stats->change(stat_bytesDropped,
size);
return SYSERR;
- }
+ }
if (size == 0) {
BREAK();
return SYSERR;
}
if (((TCPSession*)tsession->internal)->sock == -1) {
#if DEBUG_TCP
- LOG(LOG_DEBUG,
+ LOG(LOG_DEBUG,
"tcpSend called after other side closed connection.\n");
-#endif
- if (stats != NULL)
+#endif
+ if (stats != NULL)
stats->change(stat_bytesDropped,
size);
return SYSERR; /* other side closed connection */
- }
+ }
mp = MALLOC(sizeof(TCPP2P_PACKET) + size);
memcpy(&mp[1],
msg,
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/transports/udp.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -647,7 +647,7 @@
stat_bytesDropped
= stats->create(gettext_noop("# bytes dropped by UDP (outgoing)"));
}
-
+
MUTEX_CREATE(&configLock);
reloadConfiguration();
mtu = getConfigurationInt("UDP",
Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/configuration.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -432,15 +432,15 @@
* will NOT be discarded if this method is invoked twice.
* @param fn the file to read
* @return YES on success, NO otherwise
- */
+ */
int readConfigFile(const char *fn) {
if (0 != cfg_parse_file(fn))
return NO;
parseConfigInit = YES;
-
+
setConfigurationString("Meta", "DATADIR", DATADIR);
-
+
return YES;
}
@@ -472,15 +472,15 @@
if (ACCESS(expCfgName, R_OK)) {
expCfgName = eName;
if (ACCESS(expCfgName, R_OK)) {
- if (0 == ACCESS(DEFAULT_DAEMON_CONFIG_FILE, W_OK))
+ if (0 == ACCESS(DEFAULT_DAEMON_CONFIG_FILE, W_OK))
expCfgName = DEFAULT_DAEMON_CONFIG_FILE;
- if (0 == ACCESS(VAR_DAEMON_CONFIG_FILE, W_OK))
+ if (0 == ACCESS(VAR_DAEMON_CONFIG_FILE, W_OK))
expCfgName = VAR_DAEMON_CONFIG_FILE;
- if (0 == ACCESS(eName, W_OK))
+ if (0 == ACCESS(eName, W_OK))
expCfgName = eName;
}
}
- }
+ }
}
} else {
eName = expandFileName(DEFAULT_CLIENT_CONFIG_FILE);
@@ -541,7 +541,7 @@
if (!readConfigFile(configuration_filename))
errexit("Failed to parse configuration file `%s'.\n",
configuration_filename);
-
+
MUTEX_UNLOCK(&configLock);
}
Modified: GNUnet/src/util/daemon.c
===================================================================
--- GNUnet/src/util/daemon.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/daemon.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -29,9 +29,9 @@
#include "gnunet_protocols.h"
-/**
+/**
* Checks if gnunetd is running
- *
+ *
* Uses CS_PROTO_traffic_COUNT query to determine if gnunetd is
* running.
*
@@ -45,8 +45,8 @@
sock = getClientSocket();
if(sock == NULL) {
BREAK();
- return SYSERR;
- }
+ return SYSERR;
+ }
csHdr.size
= htons(sizeof(CS_MESSAGE_HEADER));
@@ -56,14 +56,14 @@
&csHdr)) {
releaseClientSocket(sock);
return SYSERR;
- }
- if (SYSERR == readTCPResult(sock,
+ }
+ if (SYSERR == readTCPResult(sock,
&ret)) {
releaseClientSocket(sock);
return SYSERR;
}
releaseClientSocket(sock);
-
+
return OK;
}
@@ -71,7 +71,7 @@
#if LINUX || OSX || SOLARIS || SOMEBSD
/**
* Fork a gnunetd process
- *
+ *
* @param daemonize YES if gnunetd should be daemonized
* @return pid_t of gnunetd if NOT daemonized, 0 if
* daemonized sucessfully, -1 on error
@@ -86,11 +86,11 @@
char * cp;
path = NULL;
- cp = getConfigurationString("MAIN",
+ cp = getConfigurationString("MAIN",
"ARGV[0]");
if (cp != NULL) {
int i = strlen(cp);
- while ( (i >= 0) &&
+ while ( (i >= 0) &&
(cp[i] != DIR_SEPARATOR) )
i--;
if ( i != -1 ) {
@@ -129,8 +129,8 @@
}
errno = 0;
nice(10); /* return value is not well-defined */
- if (errno != 0)
- LOG_STRERROR(LOG_WARNING, "nice");
+ if (errno != 0)
+ LOG_STRERROR(LOG_WARNING, "nice");
if (path != NULL)
execv(path,
args);
@@ -176,7 +176,7 @@
/**
* Start gnunetd process
- *
+ *
* @param daemonize YES if gnunetd should be daemonized
* @return pid_t of gnunetd if NOT daemonized, 0 if
* daemonized sucessfully, -1 on error
@@ -195,11 +195,11 @@
_getcwd(szCWd, _MAX_PATH);
chdir(szWd);
-
+
if (daemonize == NO) {
args[0] = "-d";
idx = 1;
-
+
cp = getConfigurationString("GNUNET",
"GNUNETD-CONFIG");
if (cp) {
@@ -208,24 +208,24 @@
idx=3;
}
}
-
+
args[idx] = NULL;
pid = spawnvp(_P_NOWAIT, szCall, (const char *const *) args);
chdir(szCWd);
-
+
FREENONNULL(cp);
-
+
return (daemonize == NO) ? pid : 0;
#else
/* any system out there that does not support THIS!? */
system("gnunetd"); /* we may not have nice,
so let's be minimalistic here. */
return 0;
-#endif
+#endif
}
-/**
+/**
* Stop gnunetd
*
* Note that returning an error does NOT mean that
@@ -247,11 +247,11 @@
GNUNET_TCP_SOCKET * sock;
CS_MESSAGE_HEADER csHdr;
int ret;
-
+
sock = getClientSocket();
- if (sock == NULL)
- return SYSERR;
- csHdr.size
+ if (sock == NULL)
+ return SYSERR;
+ csHdr.size
= htons(sizeof(CS_MESSAGE_HEADER));
csHdr.type
= htons(CS_PROTO_SHUTDOWN_REQUEST);
@@ -272,7 +272,7 @@
/**
* Wait until the gnunet daemon is
* running.
- *
+ *
* @param timeout how long to wait at most
* @return OK if gnunetd is now running
*/
@@ -291,11 +291,11 @@
* matter) with the given PID has terminated. Assumes that
* the daemon was started with startGNUnetDaemon in no-daemonize mode.
* On arbitrary PIDs, this function may fail unexpectedly.
- *
+ *
* @return YES if gnunetd shutdown with
* return value 0, SYSERR if waitpid
* failed, NO if gnunetd shutdown with
- * some error
+ * some error
*/
int waitForGNUnetDaemonTermination(int pid) {
pid_t p;
Modified: GNUnet/src/util/daemontest.c
===================================================================
--- GNUnet/src/util/daemontest.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/daemontest.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -45,10 +45,10 @@
int main(int argc, char *argv[]) {
int daemon;
- if (OK != initUtil(argc,
- argv,
+ if (OK != initUtil(argc,
+ argv,
&parseCommandLine))
- return -1;
+ return -1;
daemon = startGNUnetDaemon(NO);
GNUNET_ASSERT(daemon > 0);
GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
Modified: GNUnet/src/util/dso.c
===================================================================
--- GNUnet/src/util/dso.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/dso.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -63,8 +63,8 @@
lt_dlsetsearchpath(old_dlsearchpath);
if (old_dlsearchpath != NULL)
free(old_dlsearchpath);
- if (0 != using_valgrind)
- lt_dlexit ();
+ if (0 != using_valgrind)
+ lt_dlexit ();
}
Modified: GNUnet/src/util/hashing.c
===================================================================
--- GNUnet/src/util/hashing.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/hashing.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -328,7 +328,7 @@
int fh;
struct sha512_ctx ctx;
- if (OK != getFileSize(filename,
+ if (OK != getFileSize(filename,
&len))
return SYSERR;
fh = fileopen(filename,
Modified: GNUnet/src/util/initialize.c
===================================================================
--- GNUnet/src/util/initialize.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/initialize.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -104,13 +104,13 @@
void setProcessPrio() {
char *str;
int prio = 0;
-
+
/* Get setting as string */
- str = getConfigurationString(testConfigurationString("GNUNETD",
- "_MAGIC_",
- "YES")
- ? "GNUNETD"
- : "GNUNET",
+ str = getConfigurationString(testConfigurationString("GNUNETD",
+ "_MAGIC_",
+ "YES")
+ ? "GNUNETD"
+ : "GNUNET",
"PROCESS-PRIORITY");
if (str) {
/* We support four levels (NORMAL, ABOVE NORMAL, BELOW NORMAL, HIGH and
IDLE)
@@ -147,7 +147,7 @@
#endif
else {
prio = atoi(str);
-
+
#ifdef MINGW
/* Convert the nice increment to a priority class */
if (prio == 0)
@@ -162,7 +162,7 @@
prio = HIGH_PRIORITY_CLASS;
#endif
}
-
+
/* Set process priority */
#ifdef MINGW
SetPriorityClass(GetCurrentProcess(), prio);
@@ -170,7 +170,7 @@
nice(prio);
#endif
FREE(str);
- }
+ }
}
/**
@@ -211,7 +211,7 @@
initLogging();
if (testConfigurationString("GNUNETD",
"_MAGIC_",
- "YES"))
+ "YES"))
initStatusCalls();
initState();
return OK;
@@ -220,8 +220,8 @@
void doneUtil() {
if (testConfigurationString("GNUNETD",
"_MAGIC_",
- "YES"))
- doneStatusCalls();
+ "YES"))
+ doneStatusCalls();
doneCron();
doneState();
LOG(LOG_MESSAGE,
Modified: GNUnet/src/util/kblockkey.c
===================================================================
--- GNUnet/src/util/kblockkey.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/kblockkey.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -428,7 +428,7 @@
* Deterministically (!) create a hostkey using only the
* given HashCode as input to the PRNG.
*/
-static PrivateKeyEncoded *
+static PrivateKeyEncoded *
makeKblockKeyInternal(const HashCode512 * hc) {
KBlock_secret_key sk;
HashCode512 hx;
@@ -445,7 +445,7 @@
-- we simply cannot afford 2048 bits
even on modern hardware, and especially
not since clearly a dictionary attack
- will still be much cheaper
+ will still be much cheaper
than breaking a 1024 bit RSA key.
If an adversary can spend the time to
break a 1024 bit RSA key just to forge
Modified: GNUnet/src/util/logging.c
===================================================================
--- GNUnet/src/util/logging.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/logging.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -281,14 +281,14 @@
MUTEX_LOCK(&logMutex);
if (testConfigurationString("GNUNETD",
"_MAGIC_",
- "YES"))
+ "YES"))
base = "GNUNETD";
else
base = "GNUNET";
loglevelname
= getConfigurationString(base,
"LOGLEVEL");
- if (loglevelname == NULL)
+ if (loglevelname == NULL)
loglevelname = strdup("WARNING");
loglevel__
= getLoglevel(loglevelname);
Modified: GNUnet/src/util/osconfig.c
===================================================================
--- GNUnet/src/util/osconfig.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/osconfig.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -38,7 +38,7 @@
#else
char entry[11], *dst;
FILE *f;
-
+
if (system("ifconfig > /dev/null 2> /dev/null"))
if (system("/sbin/ifconfig > /dev/null 2> /dev/null") == 0)
f = popen("/sbin/ifconfig 2> /dev/null", "r");
@@ -46,20 +46,20 @@
f = NULL;
else
f = popen("ifconfig 2> /dev/null", "r");
-
+
if (!f)
return;
-
+
while(1)
{
int i = 0;
int c = fgetc(f);
-
+
if (c == EOF)
break;
-
+
dst = entry;
-
+
/* Read interface name until the first space (or colon under OS X) */
while (c != EOF && c != '\n' &&
#ifdef OSX
@@ -74,14 +74,14 @@
c = fgetc(f);
}
*dst = 0;
-
+
if (entry[0])
callback(entry, strcmp(entry, "eth0") == 0, cls);
-
+
while(c != '\n' && c != EOF)
c = fgetc(f);
}
-
+
pclose(f);
#endif
}
@@ -96,7 +96,7 @@
/* Debian */
if (ACCESS("/etc/init.d/", W_OK) == 0)
return 1;
- }
+ }
return 0;
#else
#ifdef WINDOWS
@@ -122,10 +122,10 @@
{
char *err = NULL;
DWORD dwErr = 0;
-
+
if (username && !strlen(username))
username = NULL;
-
+
/* Install service */
switch(InstallAsService(username))
{
@@ -140,14 +140,14 @@
default:
return -1;
}
-
+
/* Grant permissions to the GNUnet directory */
if ((!err || dwErr == ERROR_SERVICE_EXISTS) && username)
{
char szHome[_MAX_PATH + 1];
-
+
plibc_conv_to_win_path("/", szHome);
-
+
if (!AddPathAccessRights(szHome, username, GENERIC_ALL))
return 3;
}
@@ -156,9 +156,9 @@
{
char szPath[_MAX_PATH + 1];
HKEY hKey;
-
+
plibc_conv_to_win_path("/bin/gnunetd.exe", szPath);
-
+
if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 0, KEY_EXECUTE,
&hKey) == ERROR_SUCCESS)
@@ -166,11 +166,11 @@
if (RegSetValueEx(hKey, "GNUnet", 0, REG_SZ, szPath, strlen(szPath)) !=
ERROR_SUCCESS)
return 4;
-
+
RegCloseKey(hKey);
}
else
- return 4;
+ return 4;
}
}
else
@@ -195,13 +195,13 @@
else
{
HKEY hKey;
-
+
if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\Run",
0, KEY_SET_VALUE,
&hKey) == ERROR_SUCCESS)
{
RegDeleteValue(hKey, "GNUnet");
-
+
RegCloseKey(hKey);
}
}
@@ -264,7 +264,7 @@
return 1;
}
else {
- if ( (UNLINK("/etc/init.d/gnunetd") != -1) ||
+ if ( (UNLINK("/etc/init.d/gnunetd") != -1) ||
(errno != ENOENT)) {
if (ACCESS("/usr/sbin/update-rc.d", X_OK) == 0) {
errno = system("/usr/sbin/update-rc.d gnunetd remove");
@@ -386,9 +386,9 @@
ret = (char *) malloc(mem);
snprintf(ret, mem, "%s: %s (#%u)", prefix, err, dwErr);
-
+
LocalFree(err);
-
+
return ret;
#else
return NULL;
Modified: GNUnet/src/util/port.c
===================================================================
--- GNUnet/src/util/port.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/port.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -31,13 +31,13 @@
unsigned short getGNUnetPort() {
unsigned short port;
const char *setting;
-
+
if (testConfigurationString("GNUNETD",
"_MAGIC_",
"YES"))
setting = "PORT";
else
- setting = "CLIENT-PORT";
+ setting = "CLIENT-PORT";
port = (unsigned short) getConfigurationInt("NETWORK",
setting);
Modified: GNUnet/src/util/statuscalls.c
===================================================================
--- GNUnet/src/util/statuscalls.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/statuscalls.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -52,7 +52,7 @@
/**
* where to read network interface information from
- * under Linux
+ * under Linux
*/
#define PROC_NET_DEV "/proc/net/dev"
@@ -68,14 +68,14 @@
static NetworkStats globalTrafficBetweenProc;
/**
- * tracking
+ * tracking
*/
-static NetworkStats * ifcs;
+static NetworkStats * ifcs;
/**
- * how many interfaces do we have?
+ * how many interfaces do we have?
*/
-static int ifcsSize;
+static int ifcsSize;
/**
* Current load of the machine, -1 for error
@@ -101,7 +101,7 @@
* How to measure traffic (YES == only gnunetd,
* NO == try to include all apps)
*/
-static int useBasicMethod = YES;
+static int useBasicMethod = YES;
/**
* Lock.
@@ -179,12 +179,12 @@
data++;
if (2 != SSCANF(data,
"%llu %*s %*s %*s %*s %*s %*s %*s %llu",
- &rxnew,
+ &rxnew,
&txnew)) {
LOG(LOG_ERROR,
_("Failed to parse interface data from `%s' at %s:%d.\n"),
- PROC_NET_DEV,
- __FILE__,
+ PROC_NET_DEV,
+ __FILE__,
__LINE__);
continue;
}
@@ -197,7 +197,7 @@
}
}
MUTEX_UNLOCK(&statusMutex);
-
+
#elif MINGW
unsigned long long rxnew;
unsigned long long txnew;
@@ -226,11 +226,11 @@
pTable->table[dwIfIdx].dwPhysAddrLen);
if (0 == memcmp(bPhysAddr,
- &l,
+ &l,
sizeof(unsigned long long))) {
- ifcs[i].last_in
+ ifcs[i].last_in
= pTable->table[dwIfIdx].dwInOctets;
- ifcs[i].last_out
+ ifcs[i].last_out
= pTable->table[dwIfIdx].dwOutOctets;
resetBetweenProc();
break;
@@ -240,29 +240,29 @@
GlobalFree(pTable);
} else { /* Win 95 */
if ( ( command = popen("netstat -e", "rt") ) == NULL ) {
- LOG_FILE_STRERROR(LOG_ERROR,
- "popen",
+ LOG_FILE_STRERROR(LOG_ERROR,
+ "popen",
"netstat -e");
MUTEX_UNLOCK(&statusMutex);
return;
}
while (!feof(command)) {
- if (NULL == fgets(line,
- MAX_PROC_LINE,
+ if (NULL == fgets(line,
+ MAX_PROC_LINE,
command))
break;
/* PORT-ME: any way to do this per-ifc? */
if (iLine == 1) {
- sscanf("%*s%i%i",
- &rxnew,
+ sscanf("%*s%i%i",
+ &rxnew,
&txnew);
- ifcs[0].last_in
+ ifcs[0].last_in
= rxnew;
- ifcs[0].last_out
+ ifcs[0].last_out
= txnew;
resetBetweenProc();
break;
- }
+ }
iLine++;
}
pclose(command);
@@ -287,7 +287,7 @@
return;
}
MUTEX_LOCK(&statusMutex);
-
+
#ifdef LINUX
/* under linux, first try %idle/usage using /proc/stat;
if that does not work, disable /proc/stat for the future
@@ -303,18 +303,18 @@
rewind(proc_stat);
fflush(proc_stat);
if (NULL == fgets(line, 128, proc_stat)) {
- LOG_FILE_STRERROR(LOG_ERROR,
+ LOG_FILE_STRERROR(LOG_ERROR,
"fgets",
"/proc/stat");
fclose(proc_stat);
proc_stat = NULL; /* don't try again */
} else {
if (sscanf(line, "%*s %i %i %i %i",
- &user_read,
- &system_read,
+ &user_read,
+ &system_read,
&nice_read,
&idle_read) != 4) {
- LOG_FILE_STRERROR(LOG_ERROR,
+ LOG_FILE_STRERROR(LOG_ERROR,
"fgets-sscanf",
"/proc/stat");
fclose(proc_stat);
@@ -402,9 +402,9 @@
goto ABORT_KSTAT; /* no stats found => abort */
deltaidle = idlecount - last_idlecount;
deltatotal = totalcount - last_totalcount;
- if ( (deltatotal > 0) &&
+ if ( (deltatotal > 0) &&
(last_totalcount > 0) )
- currentLoad = (int) (100 * deltaidle / deltatotal);
+ currentLoad = (int) (100 * deltaidle / deltatotal);
else
currentLoad = -1;
last_idlecount = idlecount;
@@ -456,7 +456,7 @@
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION theInfo;
if (GNNtQuerySystemInformation(SystemProcessorPerformanceInformation,
- &theInfo,
+ &theInfo,
sizeof(theInfo),
NULL) == NO_ERROR) {
/* PORT-ME MINGW: Multi-processor? */
@@ -468,7 +468,7 @@
dDiffUser = dUser - dLastUser;
if ( ( (dDiffKernel + dDiffUser) > 0) &&
- (dLastIdle + dLastKernel + dLastUser > 0) )
+ (dLastIdle + dLastKernel + dLastUser > 0) )
currentLoad = 100.0 - (dDiffIdle / (dDiffKernel + dDiffUser)) * 100.0;
else
currentLoad = -1; /* don't know (yet) */
@@ -494,8 +494,8 @@
DWORD dwDataSize, dwType, dwDummy;
/* Start query */
- if (RegOpenKeyEx(HKEY_DYN_DATA,
- "PerfStats\\StartSrv",
+ if (RegOpenKeyEx(HKEY_DYN_DATA,
+ "PerfStats\\StartSrv",
0,
KEY_ALL_ACCESS,
&hKey) != ERROR_SUCCESS) {
@@ -508,51 +508,51 @@
}
}
- RegOpenKeyEx(HKEY_DYN_DATA,
- "PerfStats\\StartStat",
- 0,
+ RegOpenKeyEx(HKEY_DYN_DATA,
+ "PerfStats\\StartStat",
+ 0,
KEY_ALL_ACCESS,
&hKey);
dwDataSize = sizeof(dwDummy);
RegQueryValueEx(hKey,
- "KERNEL\\CPUUsage",
- NULL,
- &dwType,
+ "KERNEL\\CPUUsage",
+ NULL,
+ &dwType,
(LPBYTE) &dwDummy,
&dwDataSize);
RegCloseKey(hKey);
/* Get CPU usage */
- RegOpenKeyEx(HKEY_DYN_DATA,
+ RegOpenKeyEx(HKEY_DYN_DATA,
"PerfStats\\StatData",
- 0,
+ 0,
KEY_ALL_ACCESS,
&hKey);
dwDataSize = sizeof(currentLoad);
RegQueryValueEx(hKey,
- "KERNEL\\CPUUsage",
- NULL,
+ "KERNEL\\CPUUsage",
+ NULL,
&dwType,
(LPBYTE) ¤tLoad,
&dwDataSize);
RegCloseKey(hKey);
/* Stop query */
- RegOpenKeyEx(HKEY_DYN_DATA,
+ RegOpenKeyEx(HKEY_DYN_DATA,
"PerfStats\\StopStat",
- 0,
+ 0,
KEY_ALL_ACCESS,
&hKey);
- RegOpenKeyEx(HKEY_DYN_DATA,
- "PerfStats\\StopSrv",
- 0,
+ RegOpenKeyEx(HKEY_DYN_DATA,
+ "PerfStats\\StopSrv",
+ 0,
KEY_ALL_ACCESS,
&hKey);
dwDataSize = sizeof(dwDummy);
RegQueryValueEx(hKey,
- "KERNEL\\CPUUsage",
- NULL,
- &dwType,
+ "KERNEL\\CPUUsage",
+ NULL,
+ &dwType,
(LPBYTE)&dwDummy,
&dwDataSize);
RegCloseKey(hKey);
@@ -587,7 +587,7 @@
MUTEX_LOCK(&statusMutex);
for (i=0;i<ifcsSize;i++)
FREE(ifcs[i].name);
- GROW(ifcs,
+ GROW(ifcs,
ifcsSize,
0);
interfaces
@@ -645,7 +645,7 @@
= getConfigurationInt("LOAD",
"MAXCPULOAD");
if (maxCPULoad == 0)
- maxCPULoad = 100;
+ maxCPULoad = 100;
MUTEX_UNLOCK(&statusMutex);
}
@@ -699,10 +699,10 @@
currentLoadSum += overload;
maxExpect = ( (now - lastCall) * maxNetDownBPS ) / cronSECONDS;
lastCall = now;
- if (currentLoadSum < maxExpect)
+ if (currentLoadSum < maxExpect)
overload = 0;
- else
- overload = currentLoadSum - maxExpect;
+ else
+ overload = currentLoadSum - maxExpect;
lastValue = currentLoadSum * 100 / maxExpect;
ret = lastValue;
MUTEX_UNLOCK(&statusMutex);
@@ -724,7 +724,7 @@
unsigned long long currentLoadSum;
int i;
int ret;
-
+
MUTEX_LOCK(&statusMutex);
currentLoadSum = globalTrafficBetweenProc.last_in;
for (i=0;i<ifcsSize;i++)
@@ -757,10 +757,10 @@
currentLoadSum += overload;
maxExpect = ( (now - lastCall) * maxNetDownBPS ) / cronSECONDS;
lastCall = now;
- if (currentLoadSum < maxExpect)
+ if (currentLoadSum < maxExpect)
overload = 0;
- else
- overload = currentLoadSum - maxExpect;
+ else
+ overload = currentLoadSum - maxExpect;
lastValue = currentLoadSum * 100 / maxExpect;
ret = lastValue;
MUTEX_UNLOCK(&statusMutex);
@@ -819,9 +819,9 @@
"fopen",
"/proc/stat");
proc_net_dev = fopen(PROC_NET_DEV, "r");
- if (NULL == proc_net_dev)
- LOG_FILE_STRERROR(LOG_ERROR,
- "fopen",
+ if (NULL == proc_net_dev)
+ LOG_FILE_STRERROR(LOG_ERROR,
+ "fopen",
PROC_NET_DEV);
#endif
MUTEX_CREATE_RECURSIVE(&statusMutex);
@@ -843,7 +843,7 @@
*/
void doneStatusCalls() {
int i;
-
+
unregisterConfigurationUpdateCallback(&resetStatusCalls);
delCronJob(&cronLoadUpdate,
10 * cronSECONDS,
Modified: GNUnet/src/util/storage.c
===================================================================
--- GNUnet/src/util/storage.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/storage.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -85,7 +85,7 @@
else
strcpy(fn, DIR_SEPARATOR_STR);
#endif
- if (filename[0] == DIR_SEPARATOR)
+ if (filename[0] == DIR_SEPARATOR)
/* if filename starts with a "/", don't copy it */
strcat(fn, &filename[1]);
else
@@ -94,7 +94,7 @@
fn = STRDUP(filename);
if (0 != STAT(fn, &buf)) {
- LOG_FILE_STRERROR(LOG_EVERYTHING,
+ LOG_FILE_STRERROR(LOG_EVERYTHING,
"stat",
fn);
FREE(fn);
@@ -145,8 +145,8 @@
fn = STRDUP(filename);
if (0 != STAT(fn, &buf)) {
- LOG_FILE_STRERROR(LOG_EVERYTHING,
- "stat",
+ LOG_FILE_STRERROR(LOG_EVERYTHING,
+ "stat",
fn);
FREE(fn);
return SYSERR;
@@ -500,19 +500,19 @@
S_IRUSR | S_IWUSR);
if (handle == -1) {
LOG_FILE_STRERROR(LOG_WARNING,
- "open",
+ "open",
fileName);
return SYSERR;
}
/* write the buffer take length from the beginning */
if (n != WRITE(handle, buffer, n)) {
- LOG_FILE_STRERROR(LOG_WARNING,
- "write",
+ LOG_FILE_STRERROR(LOG_WARNING,
+ "write",
fileName);
closefile(handle);
return SYSERR;
}
- CHMOD(fileName,
+ CHMOD(fileName,
atoo(mode));
closefile(handle);
return OK;
@@ -538,8 +538,8 @@
if (dirName == NULL)
return SYSERR;
if (0 != STAT(dirName, &istat)) {
- LOG_FILE_STRERROR(LOG_WARNING,
- "stat",
+ LOG_FILE_STRERROR(LOG_WARNING,
+ "stat",
dirName);
return SYSERR;
}
@@ -553,8 +553,8 @@
errno = 0;
dinfo = OPENDIR(dirName);
if ((errno == EACCES) || (dinfo == NULL)) {
- LOG_FILE_STRERROR(LOG_WARNING,
- "opendir",
+ LOG_FILE_STRERROR(LOG_WARNING,
+ "opendir",
dirName);
return SYSERR;
}
@@ -586,10 +586,10 @@
n = strlen(dir) + strlen(fil) + 2;
fn = MALLOC(n);
- SNPRINTF(fn,
- n,
+ SNPRINTF(fn,
+ n,
"%s/%s",
- dir,
+ dir,
fil);
if (SYSERR == rm_minus_rf(fn)) {
FREE(fn);
@@ -628,8 +628,8 @@
}
return SYSERR;
} else {
- LOG_FILE_STRERROR(LOG_WARNING,
- "unlink",
+ LOG_FILE_STRERROR(LOG_WARNING,
+ "unlink",
fileName);
return SYSERR;
}
@@ -665,16 +665,16 @@
unit = _(/* size unit */ "g");
if (size > 5 * 1024) {
size = size / 1024;
- unit = _(/* size unit */ "t");
- }
+ unit = _(/* size unit */ "t");
+ }
}
}
}
ret = MALLOC(32);
- SNPRINTF(ret,
- 32,
+ SNPRINTF(ret,
+ 32,
"%llu%s",
- size,
+ size,
unit);
return ret;
}
@@ -704,7 +704,7 @@
);
if (in == -1)
return SYSERR;
- out = fileopen(dst,
+ out = fileopen(dst,
#ifdef O_LARGEFILE
O_LARGEFILE |
#endif
Modified: GNUnet/src/util/timer.c
===================================================================
--- GNUnet/src/util/timer.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/timer.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -201,16 +201,16 @@
unit = _(/* time unit */ "h");
if (delta > 5 * 24) {
delta = delta / 24;
- unit = _(/* time unit */ " days");
- }
+ unit = _(/* time unit */ " days");
+ }
}
}
}
ret = MALLOC(32);
- SNPRINTF(ret,
- 32,
+ SNPRINTF(ret,
+ 32,
"%llu%s",
- delta,
+ delta,
unit);
return ret;
}
Modified: GNUnet/src/util/weakkeytest.c
===================================================================
--- GNUnet/src/util/weakkeytest.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/weakkeytest.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -38,7 +38,7 @@
static void printWeakKey(SESSIONKEY* key) {
int i;
for (i = 0; i < SESSIONKEY_LEN; i++) {
- printf("%x ",
+ printf("%x ",
(int)(key->key[i]));
}
}
@@ -129,7 +129,7 @@
for (number_of_runs = 0; number_of_runs < MAX_WEAK_KEY_TRIALS;
number_of_runs++) {
- if (number_of_runs % 1000 == 0)
+ if (number_of_runs % 1000 == 0)
fprintf(stderr, ".");
/*printf("Got to run number %d.\n", number_of_runs);*/
makeSessionkey(&sessionkey);
@@ -141,7 +141,7 @@
if (rc) {
printf("testweakkey: gcry_cipher_open failed on trial %d. %s\n",
- number_of_runs,
+ number_of_runs,
gcry_strerror(rc));
rc = 0;
continue;
@@ -190,16 +190,16 @@
}
else {
printf("\n%d weak keys found in %d runs.\n",
- weak_keys,
+ weak_keys,
MAX_WEAK_KEY_TRIALS);
}
}
if (testWeakKey() == 0)
ret = 0;
- else
- ret = -1;
- doneLockingGcrypt();
+ else
+ ret = -1;
+ doneLockingGcrypt();
return ret;
}
Modified: GNUnet/src/util/win/winproc.c
===================================================================
--- GNUnet/src/util/win/winproc.c 2005-08-31 21:25:11 UTC (rev 2034)
+++ GNUnet/src/util/win/winproc.c 2005-08-31 21:26:22 UTC (rev 2035)
@@ -140,7 +140,7 @@
GetProcAddress(hAdvapi, "ControlService");
GNOpenService = (TOpenService)
GetProcAddress(hAdvapi, "OpenServiceA");
-
+
GNLsaOpenPolicy = (TLsaOpenPolicy)
GetProcAddress(hAdvapi, "LsaOpenPolicy");
GNLsaAddAccountRights = (TLsaAddAccountRights)
@@ -184,7 +184,7 @@
GNStartServiceCtrlDispatcher = NULL;
GNControlService = NULL;
GNOpenService = NULL;
-
+
GNLsaOpenPolicy = NULL;
GNLsaAddAccountRights = NULL;
GNLsaRemoveAccountRights = NULL;
@@ -202,7 +202,7 @@
GNAddAccessAllowedAce = NULL;
GNSetNamedSecurityInfo = NULL;
}
-
+
/* Account function */
hNetapi = LoadLibrary("netapi32.dll");
if (hNetapi)
@@ -217,7 +217,7 @@
GNNetUserAdd = NULL;
GNNetUserSetInfo = NULL;
}
-
+
return ret;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2035 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/dht/module applications/dht/tools applications/fragmentation applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/identity applications/pingpong applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/stats applications/tbench applications/testbed applications/topology_default applications/topology_f2f applications/tracekit applications/traffic applications/transport conf include server transports util util/win,
grothoff <=