[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3970 - in GNUnet: contrib src/applications/datastore src/a
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3970 - in GNUnet: contrib src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/dstore src/applications/fs src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/lib src/applications/fs/module src/applications/fs/tools src/applications/fs/uritrack src/applications/gap src/applications/session src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/transport src/include src/server src/setup/gtk src/setup/ncurses src/setup/text src/transports src/util/crypto src/util/disk src/util/loggers src/util/network src/util/network_client src/util/os |
|
Date: |
Sun, 17 Dec 2006 17:57:45 -0800 (PST) |
Author: grothoff
Date: 2006-12-17 17:57:17 -0800 (Sun, 17 Dec 2006)
New Revision: 3970
Modified:
GNUnet/contrib/config-client.scm
GNUnet/src/applications/datastore/prefetch.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dstore.c
GNUnet/src/applications/dht/module/routing.c
GNUnet/src/applications/dht/module/service.c
GNUnet/src/applications/dht/module/service.h
GNUnet/src/applications/dht/module/table.c
GNUnet/src/applications/dht/tools/dht_api.c
GNUnet/src/applications/dstore/dstore.c
GNUnet/src/applications/dstore/dstore_test.c
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/ecrs_core_test.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/serialize.c
GNUnet/src/applications/fs/fsui/serializetest2.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/module/anonymity.c
GNUnet/src/applications/fs/module/migration.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/applications/fs/uritrack/tracktest.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/pid_table.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/include/ecrs_core.h
GNUnet/src/include/gnunet_collection_lib.h
GNUnet/src/include/gnunet_dstore_service.h
GNUnet/src/include/gnunet_kvstore_service.h
GNUnet/src/include/gnunet_util_error_loggers.h
GNUnet/src/server/connection.c
GNUnet/src/server/gnunet-update.c
GNUnet/src/server/tcpserver.c
GNUnet/src/server/tcpserver.h
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/ncurses/wizard_curs.c
GNUnet/src/setup/text/conf.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/tcp6.c
GNUnet/src/transports/tcp_old.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
GNUnet/src/util/crypto/kblockkey.c
GNUnet/src/util/crypto/symciphertest.c
GNUnet/src/util/disk/storage.c
GNUnet/src/util/loggers/memory.c
GNUnet/src/util/network/io.c
GNUnet/src/util/network_client/tcpio.c
GNUnet/src/util/os/cpustatus.c
GNUnet/src/util/os/osconfig.c
GNUnet/src/util/os/statuscalls.c
Log:
whitespace
Modified: GNUnet/contrib/config-client.scm
===================================================================
--- GNUnet/contrib/config-client.scm 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/contrib/config-client.scm 2006-12-18 01:57:17 UTC (rev 3970)
@@ -206,7 +206,19 @@
'()
'advanced) )
+(define (daemon-config builder)
+ (builder
+ "DAEMON"
+ "CONFIGFILE"
+ (_ "What is the path to the configuration file for gnunetd?")
+ (_ "This option is used when clients need to start gnunetd.")
+ '()
+ #t
+ "/etc/gnunetd.conf"
+ '()
+ 'always) )
+
(define (general builder)
(builder
""
@@ -214,6 +226,7 @@
(_ "General options")
(nohelp)
(list
+ (daemon-config builder)
(network-port builder)
(network-host builder)
)
Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/datastore/prefetch.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -212,7 +212,7 @@
if (minIdx == -1) {
MUTEX_UNLOCK(lock);
#if DEBUG_PREFETCH
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Failed to find content in prefetch buffer\n");
#endif
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/dht/module/cs.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -89,7 +89,7 @@
DHT_CLIENT_PUT_RECORD * record = cls;
int i;
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Signaling client put completion: %d\n",
record->replicas);
@@ -182,7 +182,7 @@
memcpy(&msg[1],
value,
ntohl(value->size));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' processes reply '%.*s'\n",
__FUNCTION__,
@@ -212,7 +212,7 @@
if (OK != sendAck(record->client,
&record->table,
SYSERR)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_IMMEDIATE | GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
"sendAck");
Modified: GNUnet/src/applications/dht/module/dstore.c
===================================================================
--- GNUnet/src/applications/dht/module/dstore.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/dht/module/dstore.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -62,7 +62,7 @@
size,
data);
}
-
+
/**
* Initialize dstore DHT component.
*
Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/dht/module/routing.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -55,7 +55,7 @@
/**
* If local peer is NOT interested in results, this callback
- * will be NULL.
+ * will be NULL.
*/
ResultHandler receiver;
@@ -77,7 +77,7 @@
/**
* Priority of requested content
- */
+ */
unsigned int prio;
/**
@@ -113,7 +113,7 @@
/**
* Key for the content.
- */
+ */
HashCode512 key;
} DHT_PUT_MESSAGE;
@@ -134,7 +134,7 @@
/**
* Key for the content.
- */
+ */
HashCode512 key;
} DHT_RESULT_MESSAGE;
@@ -146,7 +146,7 @@
/**
* Information about where to send the results back to.
- */
+ */
DHT_Source_Route source;
/**
@@ -173,7 +173,7 @@
/**
* rt_size records of active queries
- */
+ */
static DHTQueryRecord ** records;
/**
@@ -279,7 +279,7 @@
FREE(records[rt_pos]->get);
GROW(records[rt_pos]->results,
records[rt_pos]->result_count,
- 0);
+ 0);
} else {
records[rt_pos] = MALLOC(sizeof(DHTQueryRecord));
}
@@ -307,7 +307,7 @@
* Larger factors will result in more aggressive routing of GET
* operations (each peer will either forward to GET_TRIES peers that
* are closer to the key).
- */
+ */
#define GET_TRIES 4
/**
@@ -337,7 +337,7 @@
if (OK != select_dht_peer(&next[i],
&get->key,
&next[0],
- i))
+ i))
break;
if (-1 == hashCodeCompareDistance(&next[i].hashPubKey,
&coreAPI->myIdentity->hashPubKey,
@@ -360,10 +360,10 @@
/**
* Larger factors will result in more replication and
- * more aggressive routing of PUT operations (each
+ * more aggressive routing of PUT operations (each
* peer will either forward to PUT_TRIES peers that
* are closer to the key, or replicate the content).
- */
+ */
#define PUT_TRIES 2
/**
@@ -394,7 +394,7 @@
&coreAPI->myIdentity->hashPubKey,
&put->key))
store = 1; /* we're closer than the selected target */
- else
+ else
coreAPI->unicast(&next[i],
msg,
0, /* FIXME: priority */
@@ -437,13 +437,13 @@
ResultHandler handler,
void * cls) {
DHT_GET_MESSAGE get;
-
+
get.header.size = htons(sizeof(DHT_GET_MESSAGE));
get.header.type = htons(P2P_PROTO_DHT_GET);
get.type = htonl(type);
get.prio = htonl(0); /* FIXME */
get.reserved = htonl(0);
- get.key = *key;
+ get.key = *key;
handleGet(NULL,
&get.header);
}
@@ -457,7 +457,7 @@
ResultHandler handler,
void * cls) {
int i;
-
+
MUTEX_LOCK(lock);
for (i=0;i<rt_size;i++) {
if (records[i] == NULL)
@@ -491,7 +491,7 @@
cron_t expirationTime,
const char * data) {
DHT_PUT_MESSAGE * put;
-
+
put = MALLOC(sizeof(DHT_PUT_MESSAGE) + size);
put->header.size = htons(sizeof(DHT_PUT_MESSAGE) + size);
put->header.type = htons(P2P_PROTO_DHT_PUT);
@@ -500,7 +500,7 @@
put->timeout = htonll(expirationTime - get_time());
memcpy(&put[1],
data,
- size);
+ size);
handlePut(NULL,
&put->header);
FREE(put);
Modified: GNUnet/src/applications/dht/module/service.c
===================================================================
--- GNUnet/src/applications/dht/module/service.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/dht/module/service.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -20,7 +20,7 @@
/**
* @file module/service.c
- * @brief internal GNUnet DHT service
+ * @brief internal GNUnet DHT service
* @author Christian Grothoff
*
* TODO: support async get timeout (gap never stops otherwise!)
@@ -78,7 +78,7 @@
* @param closure extra argument to callback
* @return handle to stop the async get
*/
-static struct DHT_GET_RECORD *
+static struct DHT_GET_RECORD *
dht_get_async_start(unsigned int type,
const HashCode512 * key,
cron_t timeout,
@@ -105,7 +105,7 @@
/**
* Stop async DHT-get. Frees associated resources.
*/
-static int
+static int
dht_get_async_stop(struct DHT_GET_RECORD * record) {
dht_get_stop(&record->key,
record->type,
Modified: GNUnet/src/applications/dht/module/service.h
===================================================================
--- GNUnet/src/applications/dht/module/service.h 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/dht/module/service.h 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -20,7 +20,7 @@
/**
* @file module/service.h
- * @brief internal GNUnet DHT service
+ * @brief internal GNUnet DHT service
* @author Christian Grothoff
*/
Modified: GNUnet/src/applications/dht/module/table.c
===================================================================
--- GNUnet/src/applications/dht/module/table.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/dht/module/table.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -32,7 +32,7 @@
* - no "put" confirmation, try a get to confirm important put!
* - modules:
* + table.c: DHT-peer table, peer discovery cron jobs;
- * code tries to fill table "as much as possible" over time;
+ * code tries to fill table "as much as possible" over time;
* TODO: expose and improve reliabily metrics (to be added later)
* + dstore.c + plugin: SQL-based datastore: key, value, expiration
* (bounded FIFO-datastore, when full, kill oldest entry first)
@@ -72,7 +72,7 @@
#define MAINTAIN_PEER_TIMEOUT MAINTAIN_FREQUENCY * MAINTAIN_CHANCE * 4
/**
- * What is the maximum number of known DHT-enabled peers
+ * What is the maximum number of known DHT-enabled peers
* advertised for each DISCOVERY message?
*/
#define MAINTAIN_ADV_CAP 8
@@ -198,7 +198,7 @@
* be participating in the DHT.
*/
typedef struct {
-
+
MESSAGE_HEADER header;
unsigned int space_available;
@@ -211,7 +211,7 @@
* is being requested.
*/
typedef struct {
-
+
MESSAGE_HEADER header;
unsigned int reserved;
@@ -231,8 +231,8 @@
for (i=0;i<sizeof(HashCode512)*8;i++) {
diff = getHashCodeBit(h1, i) - getHashCodeBit(h2, i);
- if (diff != 0)
- return i;
+ if (diff != 0)
+ return i;
}
return sizeof(HashCode512)*8;
}
@@ -240,7 +240,7 @@
/**
* @return NULL if peer is the current host
*/
-static PeerBucket *
+static PeerBucket *
findBucketFor(const PeerIdentity * peer) {
unsigned int index;
int i;
@@ -249,10 +249,10 @@
&coreAPI->myIdentity->hashPubKey);
i = bucketCount-1;
while ( (buckets[i].bstart >= index) &&
- (i > 0) )
+ (i > 0) )
i--;
if ( (buckets[i].bstart < index) &&
- (buckets[i].bend >= index) )
+ (buckets[i].bend >= index) )
return &buckets[i];
return NULL;
}
@@ -261,7 +261,7 @@
* Find the PeerInfo for the given peer. Returns NULL if peer is not
* in our DHT routing table.
*/
-static PeerInfo *
+static PeerInfo *
findPeerEntryInBucket(PeerBucket * bucket,
const PeerIdentity * peer) {
unsigned int i;
@@ -280,7 +280,7 @@
* Find the PeerInfo for the given peer. Returns NULL if peer is not
* in our DHT routing table.
*/
-static PeerInfo *
+static PeerInfo *
findPeerEntry(const PeerIdentity * peer) {
return findPeerEntryInBucket(findBucketFor(peer),
peer);
@@ -288,7 +288,7 @@
/**
* Return a number that is the larger the closer the
- * "have" hash code is to the "target". The basic
+ * "have" hash code is to the "target". The basic
* idea is that if "have" would be in the n-th lowest
* bucket of "target", the returned value should be
* 2^n. However, the largest number we can return
@@ -384,7 +384,7 @@
*set = pi->id;
MUTEX_UNLOCK(lock);
return OK;
- }
+ }
selected -= distance;
}
}
@@ -413,7 +413,7 @@
return;
}
pc = total_peers;
- if (pc > MAINTAIN_ADV_CAP)
+ if (pc > MAINTAIN_ADV_CAP)
pc = MAINTAIN_ADV_CAP;
if (pc == 0)
pc = 1;
@@ -432,7 +432,7 @@
if (OK != select_dht_peer(&pos[i],
&other->hashPubKey,
pos,
- i))
+ i))
pc--;
else
i++;
@@ -519,7 +519,7 @@
return NO;
if (now - pi->lastActivity > MAINTAIN_PEER_TIMEOUT)
return YES;
- if (now - pi->lastActivity > MAINTAIN_PEER_TIMEOUT / 2)
+ if (now - pi->lastActivity > MAINTAIN_PEER_TIMEOUT / 2)
pingPeer(pi);
return NO;
}
@@ -559,9 +559,9 @@
bucket = findBucketFor(peer);
if (bucket == NULL)
return; /* peers[i] == self */
- if (bucket->peers_size >= MAINTAIN_BUCKET_SIZE)
+ if (bucket->peers_size >= MAINTAIN_BUCKET_SIZE)
checkExpiration(bucket);
- if (bucket->peers_size >= MAINTAIN_BUCKET_SIZE)
+ if (bucket->peers_size >= MAINTAIN_BUCKET_SIZE)
return; /* do not care */
if (NULL != findPeerEntryInBucket(bucket,
peer))
@@ -571,7 +571,7 @@
ANY_PROTOCOL_NUMBER,
NO);
if (hello == NULL) {
- /* if identity not known, ask sender for HELLO of other peer */
+ /* if identity not known, ask sender for HELLO of other peer */
ask.header.size = htons(sizeof(P2P_DHT_ASK_HELLO));
ask.header.type = htons(sizeof(P2P_PROTO_DHT_ASK_HELLO));
ask.reserved = 0;
@@ -637,7 +637,7 @@
MUTEX_LOCK(lock);
considerPeer(sender, sender);
peers = (const PeerIdentity*) &disco[1];
- for (i=0;i<pc;i++)
+ for (i=0;i<pc;i++)
considerPeer(sender, &peers[i]);
MUTEX_UNLOCK(lock);
return OK;
@@ -650,7 +650,7 @@
const MESSAGE_HEADER * msg) {
const P2P_DHT_ASK_HELLO * ask;
P2P_hello_MESSAGE * hello;
-
+
if (ntohs(msg->size) != sizeof(P2P_DHT_ASK_HELLO))
return SYSERR;
ask = (const P2P_DHT_ASK_HELLO *) msg;
@@ -722,7 +722,7 @@
int done_dht_table() {
unsigned int i;
unsigned int j;
-
+
coreAPI->unregisterHandler(P2P_PROTO_DHT_DISCOVERY,
&handleDiscovery);
coreAPI->unregisterHandler(P2P_PROTO_DHT_ASK_HELLO,
@@ -739,7 +739,7 @@
identity = NULL;
coreAPI->releaseService(pingpong);
pingpong = NULL;
- for (i=0;i<bucketCount;i++) {
+ for (i=0;i<bucketCount;i++) {
for (j=0;j<buckets[i].peers_size;j++)
FREE(buckets[i].peers[j]);
GROW(buckets[i].peers,
Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -121,7 +121,7 @@
}
if ( (sizeof(CS_dht_reply_results_MESSAGE) > ntohs(reply->size)) ||
(CS_PROTO_dht_REPLY_GET != ntohs(reply->type)) ) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Unexpected reply to `%s' operation.\n"),
"GET");
Modified: GNUnet/src/applications/dstore/dstore.c
===================================================================
--- GNUnet/src/applications/dstore/dstore.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/dstore/dstore.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -43,7 +43,7 @@
/**
* Maximum bytes available
- */
+ */
static unsigned long long quota;
/**
@@ -76,30 +76,30 @@
FREE(fn);
fn = STRDUP("/tmp/dstoreXXXXXX");
fd = mkstemp(fn);
- if (fd != -1)
+ if (fd != -1)
CLOSE(fd);
}
static void db_init(sqlite3 * dbh) {
sqlite3_exec(dbh,
- "PRAGMA temp_store=MEMORY",
+ "PRAGMA temp_store=MEMORY",
NULL,
NULL,
NULL);
sqlite3_exec(dbh,
- "PRAGMA synchronous=OFF",
+ "PRAGMA synchronous=OFF",
NULL,
- NULL,
+ NULL,
NULL);
sqlite3_exec(dbh,
- "PRAGMA count_changes=OFF",
- NULL,
- NULL,
+ "PRAGMA count_changes=OFF",
+ NULL,
+ NULL,
NULL);
sqlite3_exec(dbh,
- "PRAGMA page_size=4092",
+ "PRAGMA page_size=4092",
NULL,
- NULL,
+ NULL,
NULL);
sqlite3_exec(dbh,
"CREATE TABLE ds071 ("
@@ -114,13 +114,13 @@
NULL);
sqlite3_exec(dbh,
"CREATE INDEX idx_key ON ds071 (key)",
- NULL,
- NULL,
+ NULL,
+ NULL,
NULL);
sqlite3_exec(dbh,
"CREATE INDEX idx_puttime ON ds071 (puttime)",
- NULL,
- NULL,
+ NULL,
+ NULL,
NULL);
}
@@ -142,7 +142,7 @@
if (SQLITE_OK != sqlite3_open(fn,
&dbh)) {
db_reset(dbh);
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return SYSERR;
}
db_init(dbh);
@@ -213,7 +213,7 @@
* Iterate over the results for a particular key
* in the datastore.
*
- * @param key
+ * @param key
* @param type entries of which type are relevant?
* @param iter maybe NULL (to just count)
* @return the number of results, SYSERR if the
@@ -234,7 +234,7 @@
if (SQLITE_OK != sqlite3_open(fn,
&dbh)) {
db_reset(dbh);
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return SYSERR;
}
db_init(dbh);
@@ -261,7 +261,7 @@
continue;
}
expire = sqlite3_column_int64(stmt, 3);
- if (expire < get_time())
+ if (expire < get_time())
continue;
dat = sqlite3_column_blob(stmt, 5);
handler(key,
Modified: GNUnet/src/applications/dstore/dstore_test.c
===================================================================
--- GNUnet/src/applications/dstore/dstore_test.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/dstore/dstore_test.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -57,7 +57,7 @@
HashCode512 k;
HashCode512 n;
cron_t exp;
- unsigned int i;
+ unsigned int i;
exp = get_time() + 5 * cronMINUTES;
memset(&k,
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/collection/collection.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -101,7 +101,7 @@
/**
* Metadata describing the collection
*/
- struct ECRS_MetaData * meta;
+ struct ECRS_MetaData * meta;
/**
* Files in the collection.
@@ -128,7 +128,7 @@
static struct GC_Configuration * cfg;
-static char *
+static char *
getCollectionFileName() {
char * fn;
char * fnBase;
@@ -187,7 +187,7 @@
UNLINK(fn);
FREE(fn);
return;
- }
+ }
fd = open(fn, O_RDONLY | O_LARGEFILE);
if (fd == -1) {
GE_BREAK(ectx, 0);
@@ -233,7 +233,7 @@
len = ntohl(*(int*)pos);
if (len > 1024) {
GE_BREAK(ectx, 0);
- len = 1024;
+ len = 1024;
}
collectionData->name = MALLOC(len+1);
pos += sizeof(int);
@@ -251,13 +251,13 @@
GE_BREAK(ectx, 0);
mlen = rsize;
}
- collectionData->meta
+ collectionData->meta
= ECRS_deserializeMetaData(ectx,
pos,
mlen);
rsize -= mlen;
pos += mlen;
- GE_BREAK(ectx,
+ GE_BREAK(ectx,
collectionData->meta != NULL);
for (i=0;i<collectionData->file_count;i++) {
if (rsize < 2 * sizeof(int)) {
@@ -287,28 +287,28 @@
collectionData->files[i].uri
= ECRS_stringToUri(ectx,
tmp);
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
collectionData->files[i].uri != NULL);
FREE(tmp);
collectionData->files[i].meta
= ECRS_deserializeMetaData(ectx,
pos,
mlen);
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
collectionData->files[i].meta != NULL);
pos += mlen;
rsize -= mlen;
}
- GE_ASSERT(ectx, rsize == 0);
+ GE_ASSERT(ectx, rsize == 0);
MUNMAP(buf, (size_t) size);
CLOSE(fd);
FREE(fn);
/* kill invalid entries (meta or uri == NULL) */
for (i=0;i<collectionData->file_count;i++) {
if ( (collectionData->files[i].uri != NULL) &&
- (collectionData->files[i].meta != NULL) )
+ (collectionData->files[i].meta != NULL) )
continue;
- if (collectionData->files[i].uri != NULL)
+ if (collectionData->files[i].uri != NULL)
ECRS_freeUri(collectionData->files[i].uri);
if (collectionData->files[i].meta != NULL)
ECRS_freeMetaData(collectionData->files[i].meta);
@@ -338,9 +338,9 @@
unsigned int i;
char * tmp;
- if (collectionData == NULL)
+ if (collectionData == NULL)
return;
-
+
/* write collection data */
mlen = ECRS_sizeofMetaData(collectionData->meta,
NO);
@@ -354,7 +354,7 @@
FREE(buf);
return;
}
-
+
fn = getCollectionFileName();
fd = open(fn,
O_CREAT | O_LARGEFILE | O_WRONLY | O_TRUNC,
@@ -367,11 +367,11 @@
FREE(fn);
FREE(buf);
return;
- }
+ }
GE_BREAK(ectx,
collectionData->file_count <= 1024 * 1024 * 4);
- WRITE(fd,
- collectionData,
+ WRITE(fd,
+ collectionData,
sizeof(CollectionData));
WRITEINT(fd, collectionData->file_count);
WRITEINT(fd, collectionData->changed);
@@ -394,7 +394,7 @@
FREE(buf);
break;
}
- tmp = ECRS_uriToString(collectionData->files[i].uri);
+ tmp = ECRS_uriToString(collectionData->files[i].uri);
WRITEINT(fd, strlen(tmp));
WRITEINT(fd, mlen);
GE_BREAK(ectx, strlen(tmp) < 16 * 1024);
@@ -438,8 +438,8 @@
struct ECRS_URI * rootURI;
HashCode512 nextId;
TIME_T now;
-
- MUTEX_LOCK(lock);
+
+ MUTEX_LOCK(lock);
CO_stopCollection(); /* cancel old collection */
GE_ASSERT(ectx, name != NULL);
advertisement = ECRS_parseCharKeywordURI(ectx,
@@ -458,28 +458,28 @@
&nextId);
if (rootURI == NULL) {
ECRS_freeUri(advertisement);
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return SYSERR;
}
ECRS_freeUri(advertisement);
ECRS_freeUri(rootURI);
collectionData = MALLOC(sizeof(CollectionInfo));
- memset(collectionData,
+ memset(collectionData,
0,
sizeof(CollectionInfo));
makeRandomId(&collectionData->data.lastId);
collectionData->data.nextId = nextId;
- collectionData->data.updateInterval
+ collectionData->data.updateInterval
= htonl(updateInterval);
collectionData->data.anonymityLevel
= htonl(anonymityLevel);
- collectionData->data.priority
+ collectionData->data.priority
= htonl(prio);
- collectionData->meta
+ collectionData->meta
= ECRS_dupMetaData(meta);
- collectionData->name
+ collectionData->name
= STRDUP(name);
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return OK;
}
@@ -491,9 +491,9 @@
int CO_stopCollection() {
unsigned int i;
- MUTEX_LOCK(lock);
+ MUTEX_LOCK(lock);
if (collectionData == NULL) {
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return SYSERR;
}
ECRS_deleteNamespace(ectx,
@@ -510,7 +510,7 @@
FREE(collectionData->name);
FREE(collectionData);
collectionData = NULL;
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return OK;
}
@@ -522,7 +522,7 @@
char * CO_getCollection() {
char * name;
- MUTEX_LOCK(lock);
+ MUTEX_LOCK(lock);
if (collectionData == NULL) {
MUTEX_UNLOCK(lock);
return NULL;
@@ -568,7 +568,7 @@
TIME(&now);
if ( (ntohl(collectionData->data.updateInterval) != ECRS_SBLOCK_UPDATE_NONE)
&&
(ntohl(collectionData->data.updateInterval) !=
ECRS_SBLOCK_UPDATE_SPORADIC) &&
- (ntohl(collectionData->data.lastPublication) +
ntohl(collectionData->data.updateInterval) < now) ) {
+ (ntohl(collectionData->data.lastPublication) +
ntohl(collectionData->data.updateInterval) < now) ) {
MUTEX_UNLOCK(lock);
return;
}
@@ -603,7 +603,7 @@
collectionData->file_count,
collectionData->files,
collectionData->meta));
- if (-1 == WRITE(fd,
+ if (-1 == WRITE(fd,
dirData,
dirLen)) {
GE_LOG_STRERROR(ectx,
@@ -681,13 +681,13 @@
}
MUTEX_LOCK(lock);
if (collectionData == NULL) {
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return;
}
for (i=0;i<collectionData->file_count;i++) {
if (ECRS_equalsUri(fi->uri,
collectionData->files[i].uri)) {
- MUTEX_UNLOCK(lock);
+ MUTEX_UNLOCK(lock);
return;
}
}
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/ecrs/download.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -1255,7 +1255,7 @@
struct stat buf;
#if DEBUG_DOWNLOAD
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' running for file `%s'\n",
__FUNCTION__,
@@ -1394,7 +1394,7 @@
} else { /* delete empty directories */
char * rdir;
int len;
-
+
rdir = STRDUP(realFN);
len = strlen(rdir);
do {
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -623,7 +623,7 @@
while ( (pos < dataSize) &&
(i < ic) ) {
len = strlen(&data[pos])+1;
- md->items[i].type = (EXTRACTOR_KeywordType)
+ md->items[i].type = (EXTRACTOR_KeywordType)
ntohl(UNALIGNED(((unsigned int*)data)[i]));
md->items[i].data = STRDUP(&data[pos]);
pos += len;
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -157,7 +157,7 @@
memset(&chk, 0, sizeof(CHK));
if (YES != disk_file_test(ectx,
filename)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("`%s' is not a file.\n"),
filename);
@@ -176,7 +176,7 @@
}
sock = client_connection_create(ectx, cfg);
if (sock == NULL) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_ERROR | GE_BULK | GE_USER,
_("Failed to connect to gnunetd."));
return SYSERR;
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/ecrs_core.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -56,7 +56,7 @@
GE_ASSERT(NULL, len >= sizeof(DBlock));
GE_ASSERT(NULL, (data!=NULL) && (query != NULL));
hash(&data[1],
- len - sizeof(DBlock),
+ len - sizeof(DBlock),
&hc);
hashToKey(&hc,
&skey,
@@ -69,9 +69,9 @@
val->expirationTime = htonl(0);
db = (DBlock*) &val[1];
db->type = htonl(D_BLOCK);
- GE_ASSERT(NULL,
+ GE_ASSERT(NULL,
len - sizeof(DBlock) < MAX_BUFFER_SIZE);
- GE_ASSERT(NULL,
+ GE_ASSERT(NULL,
len - sizeof(DBlock)
== encryptBlock(&data[1],
len - sizeof(DBlock),
@@ -323,7 +323,7 @@
if (! equalsHashCode512(&keys[1],
&h))
return SYSERR;
- return OK;
+ return OK;
case D_BLOCK:
case K_BLOCK:
case KN_BLOCK:
Modified: GNUnet/src/applications/fs/ecrs_core_test.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core_test.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/ecrs_core_test.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -34,7 +34,7 @@
return 0;
}
-int main(int argc,
+int main(int argc,
char * argv[]) {
int failureCount = 0;
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -88,7 +88,7 @@
}
fullName = MALLOC(strlen(parent->filename) + 2
+ strlen(filename));
- strcpy(fullName,
+ strcpy(fullName,
parent->filename);
strcat(fullName,
filename);
@@ -194,7 +194,7 @@
static int
testTerminate(void * cls) {
FSUI_DownloadList * dl = cls;
-
+
if ( (dl->state == FSUI_ERROR) ||
(dl->state == FSUI_ABORTED) )
return SYSERR; /* aborted - delete! */
@@ -212,7 +212,7 @@
FSUI_Event event;
struct GE_Context * ectx;
struct GE_Memory * mem;
- struct GE_Context * ee;
+ struct GE_Context * ee;
dl->startTime = get_time() - dl->runTime;
ectx = dl->ctx->ectx;
@@ -266,7 +266,7 @@
if (error == NULL)
error = _("Download failed (no reason given)");
event.data.DownloadError.message = error;
-
+
dl->ctx->ecb(dl->ctx->ecbClosure,
&event);
} else if (dl->state == FSUI_ABORTED) { /* aborted */
@@ -625,7 +625,7 @@
dl->ctx->activeDownloadThreads--;
MUTEX_UNLOCK(ctx->lock);
dl->handle = NULL;
- if (dl->state == FSUI_ACTIVE)
+ if (dl->state == FSUI_ACTIVE)
dl->state = FSUI_PENDING;
else
dl->state++; /* add _JOINED */
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -249,7 +249,7 @@
FSUI_Event event;
int ret;
struct GE_Memory * mem;
- struct GE_Context * ee;
+ struct GE_Context * ee;
mem = GE_memory_create(2);
ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
@@ -405,7 +405,7 @@
ctx->activeSearches = pos->next;
else
prev->next = pos->next;
- for (i=0;i<sl->my_downloads_size;i++)
+ for (i=0;i<sl->my_downloads_size;i++)
sl->my_downloads[i]->search = NULL;
GROW(sl->my_downloads,
sl->my_downloads_size,
Modified: GNUnet/src/applications/fs/fsui/serialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serialize.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/fsui/serialize.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -131,7 +131,7 @@
pos = ctx->activeSearches;
while (pos != list->search) {
if ( (pos->sizeResultsReceived <= 1024 * 1024) &&
- (pos->sizeUnmatchedResultsReceived <= 1024 * 1024) )
+ (pos->sizeUnmatchedResultsReceived <= 1024 * 1024) )
i++;
pos = pos->next;
if (pos == NULL) {
Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -21,7 +21,7 @@
/**
* @file applications/fs/fsui/serializetest2.c
* @brief testcase for fsui download persistence for recursive
- * download linked to search
+ * download linked to search
* @author Christian Grothoff
*/
@@ -68,7 +68,7 @@
static void * eventCallback(void * cls,
const FSUI_Event * event) {
if (no_check)
- return NULL;
+ return NULL;
switch(event->type) {
case FSUI_search_suspended:
search = NULL;
@@ -93,7 +93,7 @@
download);
have_error = 1;
}
- if (event->data.DownloadSuspended.dc.pos == download)
+ if (event->data.DownloadSuspended.dc.pos == download)
download = NULL;
break;
case FSUI_search_resumed:
@@ -309,8 +309,8 @@
struct FSUI_UnindexList * unindex = NULL;
struct FSUI_UploadList * upload = NULL;
int suspendRestart = 0;
-
+
ok = YES;
cfg = GC_create_C_impl();
if (-1 == GC_parse_configuration(cfg,
@@ -452,7 +452,7 @@
}
/* END OF TEST CODE */
FAILURE:
- if (ctx != NULL)
+ if (ctx != NULL)
FSUI_stop(ctx);
if (uri != NULL)
ECRS_freeUri(uri);
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -69,7 +69,7 @@
int ret;
unsigned long long size;
struct GE_Memory * mem;
- struct GE_Context * ee;
+ struct GE_Context * ee;
if (OK != disk_file_size(utc->ctx->ectx,
utc->filename,
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -85,7 +85,7 @@
struct FSUI_UploadList * pos;
int handle;
struct GE_Memory * mem;
- struct GE_Context * ee;
+ struct GE_Context * ee;
fis = NULL;
size = 0;
@@ -222,7 +222,7 @@
size_t tpos;
char * error;
struct GE_Memory * mem;
- struct GE_Context * ee;
+ struct GE_Context * ee;
ectx = utc->shared->ctx->ectx;
GE_ASSERT(ectx, utc->filename != NULL);
@@ -588,7 +588,7 @@
"EXTRACTORS",
NULL,
&config);
- if (config != NULL)
+ if (config != NULL)
extractors = EXTRACTOR_loadConfigLibraries(extractors,
config);
}
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/fs/lib/fslib.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -147,7 +147,7 @@
return NULL;
}
-SEARCH_CONTEXT *
+SEARCH_CONTEXT *
FS_SEARCH_makeContext(struct GE_Context * ectx,
struct GC_Configuration * cfg,
struct MUTEX * lock) {
@@ -200,7 +200,7 @@
* @param callback method to call for each result
* @param prio priority to use for the search
*/
-SEARCH_HANDLE *
+SEARCH_HANDLE *
FS_start_search(SEARCH_CONTEXT * ctx,
unsigned int type,
unsigned int keyCount,
Modified: GNUnet/src/applications/fs/module/anonymity.c
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/module/anonymity.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -62,14 +62,14 @@
&peers,
&sizes,
&timevect)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Failed to get traffic stats.\n"));
return SYSERR;
}
if (level > 1000) {
if (peers < level / 1000) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u,
%u peers). "
"Result dropped.\n",
@@ -78,7 +78,7 @@
return SYSERR;
}
if (count < level % 1000) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u,
%u messages). "
"Result dropped.\n",
@@ -88,7 +88,7 @@
}
} else {
if (count < level) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u,
%u messages). "
"Result dropped.\n",
Modified: GNUnet/src/applications/fs/module/migration.c
===================================================================
--- GNUnet/src/applications/fs/module/migration.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/module/migration.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -142,9 +142,9 @@
ntohl(content->type));
#endif
if (ntohl(content->type) == ONDEMAND_BLOCK) {
- if (ONDEMAND_getIndexed(datastore,
+ if (ONDEMAND_getIndexed(datastore,
content,
- &key,
+ &key,
&enc) != OK) {
FREE(content);
content = NULL;
@@ -162,7 +162,7 @@
if (size > padding) {
MUTEX_UNLOCK(lock);
#if DEBUG_MIGRATION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Available content of size %u too big for available space (%u)\n",
size,
@@ -198,7 +198,7 @@
padding);
FREE(gw);
#if DEBUG_MIGRATION
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"gap's tryMigrate returned %u\n",
ret);
@@ -240,7 +240,7 @@
if (stats != NULL) {
stat_migration_count
= stats->create(gettext_noop("# blocks migrated"));
- stat_on_demand_migration_attempts
+ stat_on_demand_migration_attempts
= stats->create(gettext_noop("# on-demand block migration attempts"));
}
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -142,11 +142,11 @@
UNLINK(serverFN);
if (0 != SYMLINK(fn, serverFN)) {
GE_LOG_STRERROR_FILE(cectx,
- GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
+ GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
"symlink",
fn);
- GE_LOG_STRERROR_FILE(cectx,
- GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
+ GE_LOG_STRERROR_FILE(cectx,
+ GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
"symlink",
serverFN);
FREE(serverFN);
@@ -369,7 +369,7 @@
}
odb = (OnDemandBlock*) dbv;
fn = getOnDemandFile(&odb->fileId);
- if ( (YES != disk_file_test(ectx,
+ if ( (YES != disk_file_test(ectx,
fn)) ||
(-1 == (fileHandle = disk_file_open(ectx,
fn,
@@ -674,7 +674,7 @@
GE_WARNING | GE_BULK | GE_USER,
hash2enc(&key,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
_("Unindexed ODB block `%s' from offset %llu already missing from
datastore.\n"),
&enc,
Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -208,7 +208,7 @@
/* stop collections */
if (stop_collection && (! start_collection)) {
- if (OK == CO_stopCollection())
+ if (OK == CO_stopCollection())
printf(_("Collection stopped.\n"));
else
printf(_("Failed to stop collection (not active?).\n"));
@@ -300,7 +300,7 @@
FREE(create_name);
create_name = NULL;
} else {
- if (start_collection)
+ if (start_collection)
printf(_("You must specify a name for the collection (`%s' option).\n"),
"-C");
}
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -194,7 +194,7 @@
IPC_SEMAPHORE_DOWN(sem, YES);
fn = getUriDbName(ectx, cfg);
if (YES == disk_file_test(ectx,
- fn)) {
+ fn)) {
if (0 != UNLINK(fn))
GE_LOG_STRERROR_FILE(ectx,
GE_ERROR | GE_USER | GE_ADMIN | GE_BULK,
Modified: GNUnet/src/applications/fs/uritrack/tracktest.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/tracktest.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/fs/uritrack/tracktest.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -61,7 +61,7 @@
fi2.uri)) ) {
notifications++;
return OK;
- }
+ }
return OK;
}
@@ -115,7 +115,7 @@
ECRS_addToMetaData(fi2.meta,
EXTRACTOR_MIMETYPE,
"foo/bar");
-
+
URITRACK_clearTrackedURIS(NULL,
cfg);
URITRACK_registerTrackCallback(NULL,
@@ -181,7 +181,7 @@
return 0;
}
-int main(int argc,
+int main(int argc,
char * argv[]) {
int failureCount = 0;
@@ -192,7 +192,7 @@
return -1;
}
failureCount += testTracking();
- GC_free(cfg);
+ GC_free(cfg);
if (failureCount != 0)
return 1;
return 0;
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/applications/gap/gap.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -545,13 +545,13 @@
if (getBit(qr, getIndex(id)) == 1) {
#if DEBUG_GAP
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&encp);
hash2enc(&qr->msg->queries[0],
&encq));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"Sending query `%s' to `%s'\n",
&encq,
@@ -696,7 +696,7 @@
coreAPI->forAllConnectedNodes
(&sendToSelected,
qr);
- if (qr == &dummy) {
+ if (qr == &dummy) {
change_pid_rc(dummy.noTarget, -1);
FREE(dummy.msg);
}
@@ -951,7 +951,7 @@
if (ite->destination[i] == sender)
return SYSERR;
if (ite->hostsWaiting >= MAX_HOSTS_WAITING) {
- decrement_pid_rcs(ite->destination,
+ decrement_pid_rcs(ite->destination,
ite->hostsWaiting);
if (stats != NULL)
stats->change(stat_memory_destinations, - ite->hostsWaiting);
@@ -966,7 +966,7 @@
ite->primaryKey = *query;
if (stats != NULL)
stats->change(stat_memory_destinations, - ite->hostsWaiting);
- decrement_pid_rcs(ite->destination,
+ decrement_pid_rcs(ite->destination,
ite->hostsWaiting);
GROW(ite->destination,
ite->hostsWaiting,
@@ -1315,11 +1315,11 @@
resolve_pid(ite->destination[j],
&recv);
#if DEBUG_GAP
- IF_GELOG(ectx,
+ IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&recv.hashPubKey,
&enc));
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
"GAP sending reply to `%s'\n",
&enc);
Modified: GNUnet/src/applications/gap/pid_table.c
===================================================================
--- GNUnet/src/applications/gap/pid_table.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/gap/pid_table.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -40,12 +40,12 @@
typedef struct {
/**
- * the identifier itself
+ * the identifier itself
*/
HashCode512 id;
/**
- * reference counter
+ * reference counter
*/
unsigned int rc;
} PID_Entry;
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/applications/session/connect.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -108,7 +108,7 @@
/**
* Who is the intended recipient?
- */
+ */
PeerIdentity target;
/**
@@ -596,7 +596,7 @@
return SYSERR;
}
sessionkeySigned = (P2P_setkey_MESSAGE *) msg;
-
+
if ( (ntohs(msg->size) == sizeof(P2P_new_setkey_MESSAGE)) ||
(ntohs(msg->size) == sizeof(P2P_new_setkey_MESSAGE) +
pingpong->ping_size) ||
(ntohs(msg->size) == sizeof(P2P_new_setkey_MESSAGE) +
pingpong->ping_size * 2) ) {
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -506,7 +506,7 @@
/**
- * Iterate over the items in the datastore
+ * Iterate over the items in the datastore
* using the given query to select and order
* the items.
*
@@ -548,7 +548,7 @@
}
scratch = MALLOC(256);
SNPRINTF(scratch,
- 256,
+ 256,
query,
typestr);
mysql_query(dbhI.dbf,
@@ -577,8 +577,8 @@
return count;
}
if ( (iter != NULL) &&
- (SYSERR == iter(&datum->key,
- &datum->value,
+ (SYSERR == iter(&datum->key,
+ &datum->value,
closure) ) ) {
count = SYSERR;
FREE(datum);
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -584,7 +584,7 @@
else
strcat(scratch, " ORDER BY prio ASC, expire ASC, hash ASC");
} else {
- if (inverseOrder)
+ if (inverseOrder)
strcat(scratch, " ORDER BY expire DESC, prio DESC, hash ASC");
else
strcat(scratch, " ORDER BY expire ASC, prio ASC, hash ASC");
@@ -942,7 +942,7 @@
unsigned long long expir;
sqliteHandle *dbh;
#if DEBUG_SQLITE
- EncName enc;
+ EncName enc;
IF_GELOG(ectx,
GE_DEBUG | GE_BULK | GE_USER,
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/applications/transport/transport.c 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -340,7 +340,7 @@
* Create a hello advertisement for the given
* transport type for this node.
*/
-static P2P_hello_MESSAGE *
+static P2P_hello_MESSAGE *
transportCreatehello(unsigned short ttype) {
TransportAPI * tapi;
P2P_hello_MESSAGE * helo;
Modified: GNUnet/src/include/ecrs_core.h
===================================================================
--- GNUnet/src/include/ecrs_core.h 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/include/ecrs_core.h 2006-12-18 01:57:17 UTC (rev 3970)
@@ -113,7 +113,7 @@
} KBlock;
typedef struct {
-
+
/**
* Type of the block (SBLOCK), in network byte order.
*/
@@ -122,7 +122,7 @@
/**
* RSA signature (from pseudonym controlling the namespace)
*/
- Signature signature;
+ Signature signature;
/**
* Public key of the pseudonym; S = H(subspace);
@@ -130,7 +130,7 @@
PublicKey subspace;
/* from here on signed */
-
+
/**
* R = H(N-I)^S, used for routing!
*/
@@ -139,7 +139,7 @@
/**
* Time at which this SBlock was created;
- * in network byte order
+ * in network byte order
*/
TIME_T creationTime;
@@ -150,19 +150,19 @@
* for entries without a fixed update frequency; in network byte
* order
*/
- TIME_T updateInterval;
+ TIME_T updateInterval;
/**
* N, the identifier that will be used for the
* next revision of this SBlock.
*/
- HashCode512 nextIdentifier;
+ HashCode512 nextIdentifier;
/**
* I, the increment between identifiers (used to enable
* skipping of blocks by appying multiple increments.
- */
- HashCode512 identifierIncrement;
+ */
+ HashCode512 identifierIncrement;
/* 0-terminated URI follows here! */
Modified: GNUnet/src/include/gnunet_collection_lib.h
===================================================================
--- GNUnet/src/include/gnunet_collection_lib.h 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/include/gnunet_collection_lib.h 2006-12-18 01:57:17 UTC (rev
3970)
@@ -46,7 +46,7 @@
* Shutdown collection module.
*/
void CO_done(void);
-
+
/**
* Start a collection (also automatically stops
@@ -56,14 +56,14 @@
unsigned int priority,
TIME_T updateInterval,
const char * name,
- const struct ECRS_MetaData * meta);
+ const struct ECRS_MetaData * meta);
/**
* Stop collection.
*
* @return OK on success, SYSERR if no collection is active
*/
-int CO_stopCollection(void);
+int CO_stopCollection(void);
/**
* Are we using a collection?
Modified: GNUnet/src/include/gnunet_dstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_dstore_service.h 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/include/gnunet_dstore_service.h 2006-12-18 01:57:17 UTC (rev
3970)
@@ -68,7 +68,7 @@
* Iterate over the results for a particular key
* in the datastore.
*
- * @param key
+ * @param key
* @param type entries of which type are relevant?
* @param iter maybe NULL (to just count)
* @return the number of results, SYSERR if the
Modified: GNUnet/src/include/gnunet_kvstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_kvstore_service.h 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/include/gnunet_kvstore_service.h 2006-12-18 01:57:17 UTC (rev
3970)
@@ -52,8 +52,8 @@
* @param vallen the length von val
* @return OK on success
*/
-typedef int (*KVCallback)(void *closure,
- void *val,
+typedef int (*KVCallback)(void *closure,
+ void *val,
int vallen);
@@ -66,7 +66,7 @@
* @param table the name of the Key/Value-Table
* @return a handle
*/
- KVHandle *(*getTable)(const char *database,
+ KVHandle *(*getTable)(const char *database,
const char *table);
/**
@@ -80,7 +80,7 @@
* @param closure optional parameter for handler
*/
void * (*get)(KVHandle *kv,
- void *key,
+ void *key,
int keylen,
unsigned int sort,
unsigned int limit,
@@ -98,7 +98,7 @@
* @return OK on success, SYSERR otherwise
*/
int (* put)(KVHandle *kv,
- void *key,
+ void *key,
int keylen,
void *val,
int vallen,
Modified: GNUnet/src/include/gnunet_util_error_loggers.h
===================================================================
--- GNUnet/src/include/gnunet_util_error_loggers.h 2006-12-18 01:56:58 UTC
(rev 3969)
+++ GNUnet/src/include/gnunet_util_error_loggers.h 2006-12-18 01:57:17 UTC
(rev 3970)
@@ -132,7 +132,7 @@
/**
* Get a particular log message from the store.
*/
-const char *
+const char *
GE_memory_get(struct GE_Memory * memory,
unsigned int index);
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/server/connection.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -65,7 +65,7 @@
#define DEBUG_CONNECTION NO
/**
- * output knapsack priorities into a file?
+ * output knapsack priorities into a file?
*/
#define DEBUG_COLLECT_PRIO NO
@@ -283,38 +283,38 @@
typedef struct {
/**
- * how long is this message part expected to be?
+ * how long is this message part expected to be?
*/
unsigned short len;
/**
- * flags
+ * flags
*/
unsigned short flags;
/**
- * how important is this message part?
+ * how important is this message part?
*/
unsigned int pri;
/**
- * when do/did we intend to transmit?
+ * when do/did we intend to transmit?
*/
cron_t transmissionTime;
-
+
/**
- * callback to call to create the message part
+ * callback to call to create the message part
*/
BuildMessageCallback callback;
/**
* argument to callback, call FREENONNULL(closure) if we
- * can not transmit this MessagePart.
+ * can not transmit this MessagePart.
*/
void * closure;
/**
- * YES if selected by knapsack for sending
+ * YES if selected by knapsack for sending
*/
int knapsackSolution;
} SendEntry;
@@ -348,77 +348,77 @@
*/
typedef struct BufferEntry_ {
/**
- * Session for the connection
+ * Session for the connection
*/
Session session;
/**
- * the current session key used for encryption
+ * the current session key used for encryption
*/
SESSIONKEY skey_local;
/**
- * at which time was the local sessionkey created
+ * at which time was the local sessionkey created
*/
TIME_T skey_local_created;
/**
- * the current session key used for decryption
+ * the current session key used for decryption
*/
SESSIONKEY skey_remote;
-
+
/**
- * at which time was the remote sessionkey created
+ * 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
* point (as witnessed by some higher-level application, typically
- * topology+pingpong)
+ * topology+pingpong)
*/
cron_t isAlive;
/**
- * Status of the connection (STAT_XXX)
+ * Status of the connection (STAT_XXX)
*/
unsigned int status;
/**
- * last sequence number received on this connection (highest)
+ * last sequence number received on this connection (highest)
*/
unsigned int lastSequenceNumberReceived;
/**
* bit map indicating which of the 32 sequence numbers before the last
* were received (good for accepting out-of-order packets and
- * estimating reliability of the connection)
+ * estimating reliability of the connection)
*/
unsigned int lastPacketsBitmap;
/**
- * last sequence number transmitted
+ * last sequence number transmitted
*/
unsigned int lastSequenceNumberSend;
/**
- * number of entries in the send buffer
+ * number of entries in the send buffer
*/
unsigned int sendBufferSize;
/**
- * buffer of entries waiting to be transmitted
+ * buffer of entries waiting to be transmitted
*/
SendEntry **sendBuffer;
/**
* time of the last send-attempt (to avoid
- * solving knapsack's too often)
+ * solving knapsack's too often)
*/
cron_t lastSendAttempt;
/**
- * a hash collision overflow chain
+ * a hash collision overflow chain
*/
struct BufferEntry_ *overflowChain;
@@ -426,7 +426,7 @@
/* *********** outbound bandwidth limits ********** */
/**
- * byte-per-minute limit for this connection
+ * byte-per-minute limit for this connection
*/
unsigned int max_bpm;
@@ -438,7 +438,7 @@
long long available_send_window;
/**
- * time of the last increment of available_send_window
+ * time of the last increment of available_send_window
*/
cron_t last_bps_update;
@@ -446,23 +446,23 @@
/**
* how much traffic (bytes) did we receive on this connection since
- * the last update-round?
+ * the last update-round?
*/
long long recently_received;
/**
- * How valueable were the messages of this peer recently?
+ * How valueable were the messages of this peer recently?
*/
double current_connection_value;
/**
* the highest bandwidth limit that a well-behaved peer
- * must have received by now
+ * must have received by now
*/
unsigned int max_transmitted_limit;
/**
- * what is the limit that we are currently shooting for? (bytes per minute)
+ * what is the limit that we are currently shooting for? (bytes per minute)
*/
unsigned int idealized_limit;
@@ -473,7 +473,7 @@
unsigned int violations;
/**
- * are we currently in "sendBuffer" for this entry?
+ * are we currently in "sendBuffer" for this entry?
*/
int inSendBuffer;
@@ -489,7 +489,7 @@
* @param be the buffer entry
* @param data context for callee
*/
-typedef void (*BufferEntryCallback) (BufferEntry * be,
+typedef void (*BufferEntryCallback) (BufferEntry * be,
void *data);
/* ***************** globals ********************** */
@@ -605,10 +605,10 @@
/* ******************** CODE ********************* */
#if DEBUG_CONNECTION
-static void printMsg(const char *prefix,
+static void printMsg(const char *prefix,
const PeerIdentity * sender,
- const SESSIONKEY * key,
- const INITVECTOR * iv,
+ const SESSIONKEY * key,
+ const INITVECTOR * iv,
int crc) {
char skey[65];
char *dst;
@@ -619,7 +619,7 @@
&enc);
dst = skey;
for(idx = 0; idx < SESSIONKEY_LEN; idx++) {
- sprintf(dst,
+ sprintf(dst,
"%02x",
key->key[idx]);
dst += 2;
@@ -2075,7 +2075,7 @@
entries = MALLOC(sizeof(BufferEntry *) * activePeerCount);
utl.pos = 0;
utl.e = entries;
- forAllConnectedHosts(&gatherEntries,
+ forAllConnectedHosts(&gatherEntries,
&utl);
/* compute latest shares based on traffic preferences */
@@ -2111,19 +2111,19 @@
load = os_network_monitor_get_load(load_monitor,
Download);
if (load > 100) /* take counter measure */
- schedulableBandwidth = schedulableBandwidth * 100 / load;
+ schedulableBandwidth = schedulableBandwidth * 100 / load;
#if 0
printf("Scheduling %llu bytes per minute\n",
schedulableBandwidth);
#endif
/* compute recent activity profile of the peer */
adjustedRR = MALLOC(sizeof(long long) * activePeerCount);
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
timeDifference != 0);
for (u=0;u<activePeerCount;u++) {
- adjustedRR[u]
+ adjustedRR[u]
= entries[u]->recently_received * cronMINUTES / timeDifference / 2;
-
+
#if DEBUG_CONNECTION
if (adjustedRR[u] > entries[u]->idealized_limit) {
IF_GELOG(ectx,
@@ -2161,7 +2161,7 @@
adjustedRR[u],
entries[u]->max_transmitted_limit, entries[u]->idealized_limit);
identity->blacklistHost(&entries[u]->session.sender,
- 1 / topology->getSaturation(),
+ 1 / topology->getSaturation(),
YES);
shutdownConnection(entries[u]);
activePeerCount--;
@@ -2205,7 +2205,7 @@
didAssign = YES;
/* in the first round we cap by 2* previous utilization */
firstRound = YES;
- for (u = 0; u < activePeerCount; u++)
+ for (u = 0; u < activePeerCount; u++)
entries[u]->idealized_limit = 0;
while ( (schedulableBandwidth > CONNECTION_MAX_HOSTS_ * 100) &&
(activePeerCount > 0) &&
@@ -2234,7 +2234,7 @@
}
if (share > entries[u]->idealized_limit) {
decrementSB += share - entries[u]->idealized_limit;
- didAssign = YES;
+ didAssign = YES;
entries[u]->idealized_limit = share;
}
}
@@ -2332,10 +2332,10 @@
if ( (decrementSB == 0) &&
(weak_randomi(timeDifference + 1) != 0) )
decrementSB = 1;
- if (entries[u]->recently_received >= decrementSB)
+ if (entries[u]->recently_received >= decrementSB)
entries[u]->recently_received -= decrementSB;
- else
- entries[u]->recently_received = 0;
+ else
+ entries[u]->recently_received = 0;
}
/* free memory */
@@ -2422,7 +2422,7 @@
/* switch state form UP to DOWN: too much inactivity */
IF_GELOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
- hash2enc(&root->session.sender.hashPubKey,
+ hash2enc(&root->session.sender.hashPubKey,
&enc));
GE_LOG(ectx,
GE_DEBUG | GE_REQUEST | GE_USER,
@@ -2437,7 +2437,7 @@
if ( (root->available_send_window >= 60000) &&
(root->sendBufferSize < 4) &&
(scl_nextHead != NULL) &&
- (os_network_monitor_get_load(load_monitor,
+ (os_network_monitor_get_load(load_monitor,
Upload) < IDLE_LOAD_THRESHOLD) &&
(os_cpu_get_load(ectx, cfg) < IDLE_LOAD_THRESHOLD) ) {
/* create some traffic by force! */
@@ -2524,9 +2524,9 @@
GE_ASSERT(ectx, sender != NULL);
hash2enc(&sender->hashPubKey, &enc);
if(size < sizeof(P2P_PACKET_HEADER)) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER,
- _("Message from `%s' discarded: invalid format.\n"),
+ _("Message from `%s' discarded: invalid format.\n"),
&enc);
return SYSERR;
}
@@ -2542,9 +2542,9 @@
stats->change(stat_received, size);
#if DEBUG_CONNECTION
- GE_LOG(ectx,
- GE_DEBUG | GE_REQUEST | GE_USER,
- "Decrypting message from host `%s'\n",
+ GE_LOG(ectx,
+ GE_DEBUG | GE_REQUEST | GE_USER,
+ "Decrypting message from host `%s'\n",
&enc);
#endif
MUTEX_LOCK(lock);
@@ -2570,7 +2570,7 @@
tmp);
hash(tmp, size - sizeof(HashCode512), &hc);
if(!((res != OK) && equalsHashCode512(&hc, &msg->hash))) {
- GE_LOG(ectx,
+ GE_LOG(ectx,
GE_INFO | GE_BULK | GE_USER,
"Decrypting message from host `%s' failed, wrong sessionkey!\n",
&enc);
@@ -2662,12 +2662,12 @@
&((P2P_hangup_MESSAGE *) msg)->sender,
sizeof(PeerIdentity)))
return SYSERR;
- IF_GELOG(ectx,
- GE_INFO | GE_BULK | GE_USER,
- hash2enc(&sender->hashPubKey,
+ IF_GELOG(ectx,
+ GE_INFO | GE_BULK | GE_USER,
+ hash2enc(&sender->hashPubKey,
&enc));
- GE_LOG(ectx,
- GE_INFO | GE_BULK | GE_USER,
+ GE_LOG(ectx,
+ GE_INFO | GE_BULK | GE_USER,
"received HANGUP from `%s'\n",
&enc);
MUTEX_LOCK(lock);
@@ -2693,7 +2693,7 @@
* YES if it is the key for sending
*/
void assignSessionKey(const SESSIONKEY * key,
- const PeerIdentity * peer,
+ const PeerIdentity * peer,
TIME_T age,
int forSending) {
BufferEntry *be;
@@ -3081,9 +3081,9 @@
stat_decrypted
= stats->create(gettext_noop(/* bytes successfully decrypted */
"# bytes decrypted"));
- stat_noise_sent
+ stat_noise_sent
= stats->create(gettext_noop("# bytes noise sent"));
- stat_total_allowed_sent
+ stat_total_allowed_sent
= stats->create(gettext_noop("# total advertised bytes per second
received limit"));
stat_total_allowed_recv
= stats->create(gettext_noop("# total allowed bytes per second
transmission limit"));
@@ -3286,7 +3286,7 @@
MUTEX_LOCK(lock);
pos = scl_nextHead;
while(pos != NULL) {
- if ( (pos->callback == callback) &&
+ if ( (pos->callback == callback) &&
(pos->minimumPadding == minimumPadding) ) {
if(prev == NULL)
scl_nextHead = pos->next;
@@ -3412,7 +3412,7 @@
*/
void unicast(const PeerIdentity * receiver,
const MESSAGE_HEADER * msg,
- unsigned int importance,
+ unsigned int importance,
unsigned int maxdelay) {
char *closure;
unsigned short len;
@@ -3435,9 +3435,9 @@
closure = MALLOC(len);
memcpy(closure, msg, len);
unicastCallback(receiver,
- ©Callback,
- closure,
- len,
+ ©Callback,
+ closure,
+ len,
importance,
maxdelay);
}
@@ -3454,9 +3454,9 @@
MUTEX_LOCK(lock);
be = lookForHost(hi);
MUTEX_UNLOCK(lock);
- if (be == NULL)
+ if (be == NULL)
return NO;
- return (be->status == STAT_UP);
+ return (be->status == STAT_UP);
}
/**
@@ -3468,7 +3468,7 @@
unsigned int computeIndex(const PeerIdentity * hostId) {
unsigned int res = (((unsigned int) hostId->hashPubKey.bits[0]) &
((unsigned int) (CONNECTION_MAX_HOSTS_ - 1)));
- GE_ASSERT(ectx,
+ GE_ASSERT(ectx,
res < CONNECTION_MAX_HOSTS_);
return res;
}
Modified: GNUnet/src/server/gnunet-update.c
===================================================================
--- GNUnet/src/server/gnunet-update.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/server/gnunet-update.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -265,10 +265,10 @@
"GET",
"",
&get);
- if (strlen(get) > 0)
+ if (strlen(get) > 0)
doGet(get);
- else
- work();
+ else
+ work();
FREE(get);
GNUNET_fini(ectx, cfg);
return 0;
Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/server/tcpserver.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -522,7 +522,7 @@
if (msgLen > 60000)
msgLen = 60000;
rv = MALLOC(sizeof(RETURN_ERROR_MESSAGE) + msgLen);
- memset(rv,
+ memset(rv,
0,
sizeof(RETURN_ERROR_MESSAGE) + msgLen);
rv->header.size
@@ -572,7 +572,7 @@
msg);
}
-struct GE_Context *
+struct GE_Context *
createClientLogContext(GE_KIND mask,
struct ClientHandle * handle) {
return GE_create_context_callback(mask,
Modified: GNUnet/src/server/tcpserver.h
===================================================================
--- GNUnet/src/server/tcpserver.h 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/server/tcpserver.h 2006-12-18 01:57:17 UTC (rev 3970)
@@ -124,7 +124,7 @@
*/
unsigned int isCSHandlerRegistered(unsigned short type);
-struct GE_Context *
+struct GE_Context *
createClientLogContext(GE_KIND mask,
struct ClientHandle * handle);
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -120,14 +120,14 @@
#else
nic = entry;
#endif
- GC_set_configuration_value_string(editCfg,
- err_ctx,
+ GC_set_configuration_value_string(editCfg,
+ err_ctx,
"NETWORK",
"INTERFACE",
nic);
GC_set_configuration_value_string(editCfg,
- err_ctx,
- "LOAD",
+ err_ctx,
+ "LOAD",
"INTERFACES",
nic);
}
@@ -177,8 +177,8 @@
if (cls.nic_item_count != 0) {
GC_get_configuration_value_string(editCfg,
- "NETWORK",
- "INTERFACE",
+ "NETWORK",
+ "INTERFACE",
"eth0",
&val);
gtk_combo_box_append_text(GTK_COMBO_BOX(cls.cmbNIC), val);
@@ -192,9 +192,9 @@
gtk_widget_set_usize(cls.cmbNIC, 10, -1);
entIP = lookup_widget("entIP");
- GC_get_configuration_value_string(editCfg,
- "NETWORK",
- "IP",
+ GC_get_configuration_value_string(editCfg,
+ "NETWORK",
+ "IP",
"",
&val);
gtk_entry_set_text(GTK_ENTRY(entIP), val);
@@ -202,9 +202,9 @@
chkFW = lookup_widget("chkFW");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkFW),
- GC_get_configuration_value_yesno(editCfg,
- "NAT",
- "LIMITED",
+ GC_get_configuration_value_yesno(editCfg,
+ "NAT",
+ "LIMITED",
NO) == YES);
gtk_widget_show(curwnd);
@@ -227,31 +227,31 @@
radShare = lookup_widget("radShare");
entCPU = lookup_widget("entCPU");
GC_get_configuration_value_string(editCfg,
- "LOAD",
- "MAXNETUPBPSTOTAL",
+ "LOAD",
+ "MAXNETUPBPSTOTAL",
"50000",
&val);
gtk_entry_set_text(GTK_ENTRY(entUp), val);
FREE(val);
GC_get_configuration_value_string(editCfg,
- "LOAD",
- "MAXNETDOWNBPSTOTAL",
+ "LOAD",
+ "MAXNETDOWNBPSTOTAL",
"50000",
&val);
gtk_entry_set_text(GTK_ENTRY(entDown), val);
FREE(val);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON
- ((GC_get_configuration_value_yesno(editCfg,
- "LOAD",
- "BASICLIMITING",
+ ((GC_get_configuration_value_yesno(editCfg,
+ "LOAD",
+ "BASICLIMITING",
NO) == YES)
? radGNUnet
: radShare ),
TRUE);
- GC_get_configuration_value_string(editCfg,
+ GC_get_configuration_value_string(editCfg,
"LOAD",
- "MAXCPULOAD",
+ "MAXCPULOAD",
"50",
&val);
gtk_entry_set_text(GTK_ENTRY(entCPU), val);
@@ -274,18 +274,18 @@
entGroup = lookup_widget("entGroup");
if (NULL != user_name) {
- GC_get_configuration_value_string(editCfg,
- "GNUNETD",
+ GC_get_configuration_value_string(editCfg,
+ "GNUNETD",
"USER",
- "gnunet",
+ "gnunet",
&uname);
}
if (NULL != group_name) {
- GC_get_configuration_value_string(editCfg,
- "GNUNETD",
+ GC_get_configuration_value_string(editCfg,
+ "GNUNETD",
"GROUP",
- "gnunet",
+ "gnunet",
&gname);
}
@@ -335,11 +335,11 @@
gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
if (group_name != NULL)
gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
- cap = os_modify_autostart(err_ctx,
- 1,
+ cap = os_modify_autostart(err_ctx,
1,
+ 1,
NULL,
- NULL,
+ NULL,
NULL);
gtk_widget_set_sensitive(entUser, cap);
#ifdef WINDOWS
@@ -375,7 +375,7 @@
FREE(val);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkMigr),
- GC_get_configuration_value_yesno(editCfg,
+ GC_get_configuration_value_yesno(editCfg,
"FS",
"ACTIVEMIGRATION",
YES) == YES);
@@ -474,10 +474,10 @@
char * gup;
char * bin;
if (doAutoStart && (user_name != NULL))
- if (!wiz_createGroupUser(group_name,
+ if (!wiz_createGroupUser(group_name,
user_name)) {
#ifndef MINGW
- showErr(_("Unable to create user account:"),
+ showErr(_("Unable to create user account:"),
STRERROR(errno));
#endif
return;
@@ -487,13 +487,13 @@
user_name,
group_name) != OK) {
#ifndef MINGW
- showErr(_("Unable to change startup process:"),
+ showErr(_("Unable to change startup process:"),
STRERROR(errno));
#endif
}
if (OK != save_conf())
- return;
+ return;
if (doUpdate) {
bin = os_get_installation_path(IPK_BINDIR);
gup = MALLOC(strlen(bin) + 30 + strlen(cfg_fn));
@@ -541,7 +541,7 @@
gchar * ret;
ret = gtk_editable_get_chars(editable, 0, -1);
- GC_set_configuration_value_string(editCfg,
+ GC_set_configuration_value_string(editCfg,
err_ctx,
"LOAD",
"MAXNETUPBPSTOTAL",
@@ -556,8 +556,8 @@
ret = gtk_editable_get_chars(editable, 0, -1);
GC_set_configuration_value_string(editCfg,
- err_ctx,
- "LOAD",
+ err_ctx,
+ "LOAD",
"MAXNETDOWNBPSTOTAL",
ret);
g_free(ret);
@@ -566,12 +566,12 @@
void on_radGNUnet_toggledsetup_gtk(GtkToggleButton * togglebutton,
gpointer user_data) {
- GC_set_configuration_value_choice(editCfg,
- err_ctx,
- "LOAD",
+ GC_set_configuration_value_choice(editCfg,
+ err_ctx,
+ "LOAD",
"BASICLIMITING",
- gtk_toggle_button_get_active(togglebutton)
- ? "YES"
+ gtk_toggle_button_get_active(togglebutton)
+ ? "YES"
: "NO");
}
@@ -580,10 +580,10 @@
gpointer user_data) {
GC_set_configuration_value_choice(editCfg,
err_ctx,
- "LOAD",
+ "LOAD",
"BASICLIMITING",
- gtk_toggle_button_get_active(togglebutton)
- ? "NO"
+ gtk_toggle_button_get_active(togglebutton)
+ ? "NO"
: "YES");
}
@@ -601,12 +601,12 @@
void on_chkMigr_toggledsetup_gtk (GtkToggleButton * togglebutton,
gpointer user_data) {
- GC_set_configuration_value_choice(editCfg,
+ GC_set_configuration_value_choice(editCfg,
err_ctx,
- "FS",
+ "FS",
"ACTIVEMIGRATION",
- gtk_toggle_button_get_active(togglebutton)
- ? "YES"
+ gtk_toggle_button_get_active(togglebutton)
+ ? "YES"
: "NO");
}
@@ -623,9 +623,9 @@
void on_chkStart_toggledsetup_gtk (GtkToggleButton * togglebutton,
gpointer user_data) {
doAutoStart = gtk_toggle_button_get_active(togglebutton);
- GC_set_configuration_value_choice(editCfg,
+ GC_set_configuration_value_choice(editCfg,
err_ctx,
- "AUTOSTART",
+ "AUTOSTART",
"GNUNETD",
doAutoStart ? "YES" : "NO");
}
@@ -666,8 +666,8 @@
GE_ASSERT(err_ctx, ret != NULL);
GC_set_configuration_value_string(editCfg,
err_ctx,
- "GNUNETD",
- "GROUP",
+ "GNUNETD",
+ "GROUP",
ret);
if (strlen(ret) != 0)
group_name = STRDUP(ret);
Modified: GNUnet/src/setup/ncurses/wizard_curs.c
===================================================================
--- GNUnet/src/setup/ncurses/wizard_curs.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/setup/ncurses/wizard_curs.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -116,7 +116,7 @@
section,
option,
ret == DLG_EXIT_OK
- ? "YES"
+ ? "YES"
: "NO")) {
show_error(_("Internal error! (Choice invalid?)"));
break;
@@ -175,7 +175,7 @@
while (ret == 2) {
ret = dlg_form(title,
"",
- 20,
+ 20,
70,
15,
1,
@@ -195,7 +195,7 @@
}
break;
case DLG_EXIT_CANCEL:
- case DLG_EXIT_ESC:
+ case DLG_EXIT_ESC:
ret = 0; /* abort */
break;
case DLG_EXIT_HELP:
@@ -290,10 +290,10 @@
ret = dlg_menu(_("GNUnet configuration"),
_("Choose the network interface that connects your
computer to "
"the internet from the list below."),
- 20,
- 70,
+ 20,
+ 70,
10,
- total,
+ total,
nic_items,
&msel,
NULL);
@@ -338,7 +338,7 @@
"doing SNAT, a router or a \"hardware firewall\" and
other computers "
"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\")."),
+ "DNAT (also known as \"port forwarding\")."),
NULL,
"NAT",
"LIMITED");
@@ -364,7 +364,7 @@
static int network_load_up() {
return query_string(_("Bandwidth configuration: upload"),
- _("How much upstream bandwidth (in bytes/s) may be
used?"),
+ _("How much upstream bandwidth (in bytes/s) may be
used?"),
_("You can limit GNUnet's resource usage "
"here.\n\nThe \"upstream\" is the data channel through
which data "
"is *sent* to the internet. The limit is the maximum
amount"
@@ -378,7 +378,7 @@
static int network_load_down() {
return query_string(_("Bandwidth configuration: download"),
- _("How much downstream bandwidth (in bytes/s) may be
used?"),
+ _("How much downstream bandwidth (in bytes/s) may be
used?"),
_("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 the
maximum amount"
@@ -405,7 +405,7 @@
YES,
"gnunet",
"gnunet"))
- return last; /* ignore option */
+ return last; /* ignore option */
return query_string(_("Daemon configuration: user account"),
_("As which user should gnunetd be run?"),
_("For security reasons, it is a good idea to let this
setup create "
@@ -460,7 +460,7 @@
char * group_name;
ret = OK;
-
+
if ( (0 != GC_test_dirty(cfg)) &&
(0 != GC_write_configuration(cfg, cfg_fn)) ) {
prefix = _("Unable to save configuration file `%s':");
@@ -479,7 +479,7 @@
"GNUNETD",
"GROUP",
"",
- &group_name);
+ &group_name);
if ( ( (strlen(user_name) > 0) ||
(strlen(group_name) > 0) ) &&
(OK == os_modify_user(YES,
@@ -493,7 +493,7 @@
showCursErr(_("Unable to create user account for daemon."),
"");
ret = SYSERR;
- }
+ }
if ( (YES == GC_get_configuration_value_yesno(cfg,
"GNUNETD",
"AUTOSTART",
@@ -502,7 +502,7 @@
NO,
YES,
"gnunetd", /* specify full path? */
- user_name,
+ user_name,
group_name)) ) {
showCursErr(_("Unable to setup autostart for daemon."),
"");
@@ -603,7 +603,7 @@
case 10:
dir = save_config();
break;
- case 11:
+ case 11:
ret = OK;
break;
}
@@ -611,7 +611,7 @@
last = dir;
if (dir == 0)
ret = SYSERR;
- }
+ }
end_dialog();
#ifndef MINGW
tcsetattr(1, TCSAFLUSH, &ios_org);
Modified: GNUnet/src/setup/text/conf.c
===================================================================
--- GNUnet/src/setup/text/conf.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/setup/text/conf.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -230,7 +230,7 @@
if (buf[i] != '\n') {
if (i < 1023) {
printf("%c", buf[i]);
- fflush(stdout);
+ fflush(stdout);
i++;
}
continue;
@@ -309,7 +309,7 @@
if (buf[i] != '\n') {
if (i < 1023) {
printf("%c", buf[i]);
- fflush(stdout);
+ fflush(stdout);
i++;
}
continue;
@@ -328,7 +328,7 @@
}
i = 0;
printf(_("\nInvalid entry, try again (use '?' for help): "));
- fflush(stdout);
+ fflush(stdout);
}
break;
case GNS_UInt64:
@@ -361,7 +361,7 @@
if (buf[i] != '\n') {
if (i < 1023) {
printf("%c", buf[i]);
- fflush(stdout);
+ fflush(stdout);
i++;
}
continue;
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/transports/tcp.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -134,7 +134,7 @@
unsigned int addr_len) {
if ((YES == isBlacklisted(addr,
addr_len)) ||
- (YES != isWhitelisted(addr,
+ (YES != isWhitelisted(addr,
addr_len)))
return YES;
return NO;
Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/transports/tcp6.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -136,7 +136,7 @@
unsigned int addr_len) {
if ((YES == isBlacklisted(addr,
addr_len)) ||
- (YES != isWhitelisted(addr,
+ (YES != isWhitelisted(addr,
addr_len)))
return YES;
return NO;
@@ -435,7 +435,7 @@
else
allowedNetworks_ = NULL;
FREE(ch);
-
+
MUTEX_UNLOCK(tcpblacklistlock);
return 0;
}
Modified: GNUnet/src/transports/tcp_old.c
===================================================================
--- GNUnet/src/transports/tcp_old.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/transports/tcp_old.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -582,7 +582,7 @@
#elif OSX
{
int __tmp = 1;
- if (setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE,
+ if (setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE,
(void *)&__tmp, sizeof(__tmp)) < 0)
GE_LOG_STRERROR(ectx,
GE_WARNING | GE_ADMIN | GE_BULK,
@@ -606,11 +606,11 @@
} while ( (*sent == -1) &&
(errno == EINTR) );
-
+
setBlocking(s, YES);
- if ( (*sent == SYSERR) &&
- ( (errno == EWOULDBLOCK)
+ if ( (*sent == SYSERR) &&
+ ( (errno == EWOULDBLOCK)
|| (errno == EAGAIN) ) )
return NO;
else if ( (*sent < 0) || (*sent > max) )
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/transports/udp.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -201,7 +201,7 @@
unsigned int addr_len) {
if ((YES == isBlacklisted(addr,
addr_len)) ||
- (YES != isWhitelisted(addr,
+ (YES != isWhitelisted(addr,
addr_len)))
return YES;
return NO;
@@ -440,7 +440,7 @@
"WHITELIST",
"",
&ch);
- if (strlen(ch) > 0)
+ if (strlen(ch) > 0)
allowedNetworks_ = parse_ipv4_network_specification(ectx,
ch);
else
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/transports/udp6.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -194,7 +194,7 @@
unsigned int addr_len) {
if ((YES == isBlacklisted(addr,
addr_len)) ||
- (YES != isWhitelisted(addr,
+ (YES != isWhitelisted(addr,
addr_len)))
return YES;
return NO;
@@ -478,7 +478,7 @@
ectx = core->ectx;
cfg = core->cfg;
configLock = MUTEX_CREATE(NO);
-
+
reloadConfiguration();
if (-1 == GC_get_configuration_value_number(cfg,
"UDP6",
Modified: GNUnet/src/util/crypto/kblockkey.c
===================================================================
--- GNUnet/src/util/crypto/kblockkey.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/crypto/kblockkey.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -181,13 +181,6 @@
&tmp[i+1]);
}
*rnd = tmp[cnt-1];
- /*
- printf("RND: ");
- for (i=0;i<cnt * sizeof(HashCode512);i++)
- printf("%02x", ((unsigned char*) tmp)[i]);
- printf("\n");
- */
-
mpz_import(n, cnt * sizeof(HashCode512) / sizeof(unsigned int),
1, sizeof(unsigned int), 1, 0, tmp);
FREE(tmp);
Modified: GNUnet/src/util/crypto/symciphertest.c
===================================================================
--- GNUnet/src/util/crypto/symciphertest.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/util/crypto/symciphertest.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -92,7 +92,7 @@
goto error;
}
- if (SESSIONKEY_LEN !=
+ if (SESSIONKEY_LEN !=
encryptBlock(plain,
SESSIONKEY_LEN,
&key,
@@ -103,7 +103,7 @@
goto error;
}
- if (memcmp(encrresult,
+ if (memcmp(encrresult,
result,
SESSIONKEY_LEN) != 0) {
printf("Encrypted result wrong.\n");
@@ -123,7 +123,7 @@
ret = 1;
goto error;
}
-
+
if (memcmp(res, plain, SESSIONKEY_LEN) != 0) {
printf("Decrypted result does not match input.\n");
Modified: GNUnet/src/util/disk/storage.c
===================================================================
--- GNUnet/src/util/disk/storage.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/disk/storage.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -404,7 +404,7 @@
int size;
GE_ASSERT(ectx, fileName != NULL);
- GE_ASSERT(ectx, len > 0);
+ GE_ASSERT(ectx, len > 0);
if (len == 0)
return 0;
GE_ASSERT(ectx, result != NULL);
Modified: GNUnet/src/util/loggers/memory.c
===================================================================
--- GNUnet/src/util/loggers/memory.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/loggers/memory.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -119,7 +119,7 @@
/**
* Get a particular log message from the store.
*/
-const char *
+const char *
GE_memory_get(struct GE_Memory * memory,
unsigned int index) {
if (index > memory->pos)
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/network/io.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -145,7 +145,7 @@
static int socket_set_nosigpipe(struct SocketHandle * s,
int dontSigPipe) {
return setsockopt(s->handle, SOL_SOCKET, SO_NOSIGPIPE,
- (void *)&dontSigPipe,
+ (void *)&dontSigPipe,
sizeof(dontSigPipe));
}
#endif
Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c 2006-12-18 01:56:58 UTC (rev
3969)
+++ GNUnet/src/util/network_client/tcpio.c 2006-12-18 01:57:17 UTC (rev
3970)
@@ -361,7 +361,7 @@
connection_close_temporarily(sock);
return SYSERR; /* invalid header */
}
-
+
buf = MALLOC(size);
if ( (OK != socket_recv(sock->sock,
NC_Complete,
@@ -383,8 +383,8 @@
MUTEX_UNLOCK(sock->readlock);
*buffer = (MESSAGE_HEADER*) buf;
(*buffer)->size = htons(size);
-
- if (ntohs((*buffer)->type) != CS_PROTO_RETURN_ERROR)
+
+ if (ntohs((*buffer)->type) != CS_PROTO_RETURN_ERROR)
break; /* got actual message! */
rem = (RETURN_ERROR_MESSAGE*) *buffer;
if (ntohs(rem->header.size) < sizeof(RETURN_ERROR_MESSAGE)) {
Modified: GNUnet/src/util/os/cpustatus.c
===================================================================
--- GNUnet/src/util/os/cpustatus.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/os/cpustatus.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -75,10 +75,10 @@
processor_cpu_load_info_t cpu_load;
mach_msg_type_number_t cpu_msg_count;
kern_return_t kret;
- int i,j;
+ int i,j;
mhost = mach_host_self();
- kret = host_processor_info(mhost, PROCESSOR_CPU_LOAD_INFO,
+ kret = host_processor_info(mhost, PROCESSOR_CPU_LOAD_INFO,
&cpu_count,
(processor_info_array_t *)&cpu_load,
&cpu_msg_count);
@@ -95,7 +95,7 @@
prev_cpu_load[i].cpu_ticks[j] = cpu_load[i].cpu_ticks[j];
}
}
- vm_deallocate(mach_task_self(),
+ vm_deallocate(mach_task_self(),
(vm_address_t)cpu_load,
(vm_size_t)(cpu_msg_count * sizeof(*cpu_load)));
return OK;
@@ -182,50 +182,50 @@
unsigned long long t_sys, t_user, t_nice, t_idle, t_total;
unsigned long long t_idle_all, t_total_all;
kern_return_t kret;
- int i, j;
+ int i, j;
t_idle_all = t_total_all = 0;
- kret = host_processor_info(mhost, PROCESSOR_CPU_LOAD_INFO,
+ kret = host_processor_info(mhost, PROCESSOR_CPU_LOAD_INFO,
&cpu_count,
(processor_info_array_t *)&cpu_load,
&cpu_msg_count);
if (kret == KERN_SUCCESS) {
for (i = 0; i < cpu_count; i++) {
- if (cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM] >=
+ if (cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM] >=
prev_cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM]) {
t_sys = cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM] -
prev_cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM];
- }
+ }
else {
t_sys = cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM] +
(ULONG_MAX - prev_cpu_load[i].cpu_ticks[CPU_STATE_SYSTEM]+1);
}
- if (cpu_load[i].cpu_ticks[CPU_STATE_USER] >=
+ if (cpu_load[i].cpu_ticks[CPU_STATE_USER] >=
prev_cpu_load[i].cpu_ticks[CPU_STATE_USER]) {
t_user = cpu_load[i].cpu_ticks[CPU_STATE_USER] -
prev_cpu_load[i].cpu_ticks[CPU_STATE_USER];
- }
+ }
else {
t_user = cpu_load[i].cpu_ticks[CPU_STATE_USER] +
(ULONG_MAX - prev_cpu_load[i].cpu_ticks[CPU_STATE_USER] +
1);
}
- if (cpu_load[i].cpu_ticks[CPU_STATE_NICE] >=
+ if (cpu_load[i].cpu_ticks[CPU_STATE_NICE] >=
prev_cpu_load[i].cpu_ticks[CPU_STATE_NICE]) {
t_nice = cpu_load[i].cpu_ticks[CPU_STATE_NICE] -
prev_cpu_load[i].cpu_ticks[CPU_STATE_NICE];
- }
+ }
else {
t_nice = cpu_load[i].cpu_ticks[CPU_STATE_NICE] +
(ULONG_MAX - prev_cpu_load[i].cpu_ticks[CPU_STATE_NICE] +
1);
}
- if (cpu_load[i].cpu_ticks[CPU_STATE_IDLE] >=
+ if (cpu_load[i].cpu_ticks[CPU_STATE_IDLE] >=
prev_cpu_load[i].cpu_ticks[CPU_STATE_IDLE]) {
t_idle = cpu_load[i].cpu_ticks[CPU_STATE_IDLE] -
prev_cpu_load[i].cpu_ticks[CPU_STATE_IDLE];
- }
+ }
else {
t_idle = cpu_load[i].cpu_ticks[CPU_STATE_IDLE] +
(ULONG_MAX - prev_cpu_load[i].cpu_ticks[CPU_STATE_IDLE] +
1);
@@ -319,7 +319,7 @@
currentLoad = 100; /* odd */
if (currentLoad < 0)
currentLoad = 0; /* odd */
- currentLoad = 100 - currentLoad; /* computed idle-load before! */
+ currentLoad = 100 - currentLoad; /* computed idle-load before! */
} else
currentLoad = -1;
last_idlecount = idlecount;
@@ -515,7 +515,7 @@
than 500ms; this makes the smoothing (mostly) independent from
the frequency at which getCPULoad is called (and we don't spend
more time measuring CPU than actually computing something). */
- currentLoad = updateCpuUsage();
+ currentLoad = updateCpuUsage();
lastCall = now;
if (currentLoad == -1) {
agedLoad = -1;
@@ -525,10 +525,10 @@
} else {
/* for CPU, we don't do the 'fast increase' since CPU is much
more jitterish to begin with */
- agedLoad = (agedLoad * 31 + currentLoad) / 32;
+ agedLoad = (agedLoad * 31 + currentLoad) / 32;
}
}
- }
+ }
if (agedLoad == -1)
ret = -1;
else
Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/os/osconfig.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -261,11 +261,11 @@
int ret;
/* Unix */
- if ((ACCESS("/usr/sbin/update-rc.d",
+ if ((ACCESS("/usr/sbin/update-rc.d",
X_OK) != 0)) {
GE_LOG_STRERROR_FILE(ectx,
GE_ERROR | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "access",
+ "access",
"/usr/sbin/update-rc.d");
return SYSERR;
}
@@ -276,7 +276,7 @@
if (ACCESS(application, X_OK) != 0) {
GE_LOG_STRERROR_FILE(ectx,
GE_ERROR | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "access",
+ "access",
application);
}
if (STAT("/etc/init.d/gnunetd", &buf) == -1) {
@@ -285,7 +285,7 @@
if (f == NULL) {
GE_LOG_STRERROR_FILE(ectx,
GE_ERROR | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "fopen",
+ "fopen",
"/etc/init.d/gnunetd");
return 2;
}
@@ -321,15 +321,15 @@
" echo \"Usage: /etc/init.d/gnunetd
{start|stop|reload|restart|force-reload}\" >&2\n"
" exit 1\n"
" ;;\n"
- "\n" "esac\n" "exit 0\n",
- "gnunet-setup",
+ "\n" "esac\n" "exit 0\n",
+ "gnunet-setup",
application);
fclose(f);
if (0 != CHMOD("/etc/init.d/gnunetd",
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)) {
GE_LOG_STRERROR_FILE(ectx,
GE_WARNING | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "chmod",
+ "chmod",
"/etc/init.d/gnunetd");
return SYSERR;
}
@@ -341,7 +341,7 @@
if (errno != 0) {
GE_LOG_STRERROR_FILE(ectx,
GE_WARNING | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "system",
+ "system",
"/usr/sbin/update-rc.d");
} else {
GE_LOG(ectx,
@@ -359,7 +359,7 @@
(errno != ENOENT)) {
GE_LOG_STRERROR_FILE(ectx,
GE_WARNING | GE_USER | GE_ADMIN | GE_IMMEDIATE,
- "unlink",
+ "unlink",
"/etc/init.d/gnunetd");
return SYSERR;
}
Modified: GNUnet/src/util/os/statuscalls.c
===================================================================
--- GNUnet/src/util/os/statuscalls.c 2006-12-18 01:56:58 UTC (rev 3969)
+++ GNUnet/src/util/os/statuscalls.c 2006-12-18 01:57:17 UTC (rev 3970)
@@ -132,7 +132,7 @@
void os_network_monitor_notify_transmission(struct LoadMonitor * monitor,
NetworkDirection dir,
- unsigned long long delta) {
+ unsigned long long delta) {
MUTEX_LOCK(monitor->statusMutex);
if (dir == Download)
monitor->globalTrafficBetweenProc.last_in += delta;
@@ -446,7 +446,7 @@
MUTEX_UNLOCK(monitor->statusMutex);
return ret;
}
-
+
currentLoadSum = currentTotal - di->lastSum + di->overload;
di->lastSum = currentTotal;
di->lastCall = now;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3970 - in GNUnet: contrib src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/dstore src/applications/fs src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/lib src/applications/fs/module src/applications/fs/tools src/applications/fs/uritrack src/applications/gap src/applications/session src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/transport src/include src/server src/setup/gtk src/setup/ncurses src/setup/text src/transports src/util/crypto src/util/disk src/util/loggers src/util/network src/util/network_client src/util/os,
grothoff <=