[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1545 - GNUnet/src/applications/advertising GNUnet/src/appl
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1545 - GNUnet/src/applications/advertising GNUnet/src/applications/bootstrap_http GNUnet/src/applications/fragmentation GNUnet/src/applications/fs/module GNUnet/src/applications/pingpong GNUnet/src/applications/session GNUnet/src/applications/stats GNUnet/src/applications/tbench GNUnet/src/applications/testbed GNUnet/src/applications/tracekit GNUnet/src/applications/traffic GNUnet/src/server GNUnet/src/transports gnunet-gtk gnunet-gtk/src/common gnunet-gtk/src/core gnunet-gtk/src/plugins/daemon gnunet-gtk/src/plugins/stats |
|
Date: |
Fri, 15 Jul 2005 03:52:08 -0700 (PDT) |
Author: grothoff
Date: 2005-07-15 03:51:45 -0700 (Fri, 15 Jul 2005)
New Revision: 1545
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/pingpong/pingpong.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/stats/gnunet-stats.c
GNUnet/src/applications/stats/statistics.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/server/connection.c
GNUnet/src/transports/http.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/udp.c
gnunet-gtk/TODO
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/core/main.c
gnunet-gtk/src/plugins/daemon/daemon.c
gnunet-gtk/src/plugins/stats/functions.c
Log:
gtk fixes
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2005-07-15 09:01:39 UTC
(rev 1544)
+++ GNUnet/src/applications/advertising/advertising.c 2005-07-15 10:51:45 UTC
(rev 1545)
@@ -717,9 +717,9 @@
}
stats = capi->requestService("stats");
if (stats != NULL) {
- stat_HELO_in = stats->create(_("# Peer advertisements received"));
- stat_HELO_out = stats->create(_("# Self advertisments transmitted"));
- stat_HELO_fwd = stats->create(_("# Foreign advertisements forwarded"));
+ stat_HELO_in = stats->create(gettext_noop("# Peer advertisements
received"));
+ stat_HELO_out = stats->create(gettext_noop("# Self advertisments
transmitted"));
+ stat_HELO_fwd = stats->create(gettext_noop("# Foreign advertisements
forwarded"));
}
LOG(LOG_DEBUG,
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2005-07-15 09:01:39 UTC
(rev 1544)
+++ GNUnet/src/applications/bootstrap_http/http.c 2005-07-15 10:51:45 UTC
(rev 1545)
@@ -347,7 +347,7 @@
stats = coreAPI->requestService("stats");
if (stats != NULL) {
stat_HELOdownloaded
- = stats->create(_("# HELOs downloaded via http"));
+ = stats->create(gettext_noop("# HELOs downloaded via http"));
}
api.bootstrap = &downloadHostlist;
return &api;
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2005-07-15
09:01:39 UTC (rev 1544)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2005-07-15
10:51:45 UTC (rev 1545)
@@ -553,9 +553,9 @@
coreAPI = capi;
stats = coreAPI->requestService("stats");
if (stats != NULL) {
- stat_defragmented = stats->create(_("# messages defragmented"));
- stat_fragmented = stats->create(_("# messages fragmented"));
- stat_discarded = stats->create(_("# fragments discarded"));
+ stat_defragmented = stats->create(gettext_noop("# messages defragmented"));
+ stat_fragmented = stats->create(gettext_noop("# messages fragmented"));
+ stat_discarded = stats->create(gettext_noop("# fragments discarded"));
}
for (i=0;i<DEFRAG_BUCKET_COUNT;i++)
defragmentationCache[i] = NULL;
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/fs/module/fs.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -1025,7 +1025,7 @@
traffic);
setConfigurationString("ABOUT",
"fs",
- _("enables (anonymous) file-sharing"));
+ gettext_noop("enables (anonymous) file-sharing"));
return OK;
}
Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/pingpong/pingpong.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -463,19 +463,19 @@
stats = capi->requestService("stats");
if (stats != NULL) {
stat_encryptedPongReceived
- = stats->create(_("# encrypted PONG messages received"));
+ = stats->create(gettext_noop("# encrypted PONG messages received"));
stat_plaintextPongReceived
- = stats->create(_("# plaintext PONG messages received"));
+ = stats->create(gettext_noop("# plaintext PONG messages received"));
stat_pingReceived
- = stats->create(_("# encrypted PING messages received"));
+ = stats->create(gettext_noop("# encrypted PING messages received"));
stat_pingCreated
- = stats->create(_("# PING messages created"));
+ = stats->create(gettext_noop("# PING messages created"));
stat_pongSent
- = stats->create(_("# encrypted PONG messages sent"));
+ = stats->create(gettext_noop("# encrypted PONG messages sent"));
stat_plaintextPingSent
- = stats->create(_("# plaintext PING messages sent"));
+ = stats->create(gettext_noop("# plaintext PING messages sent"));
stat_ciphertextPingSent
- = stats->create(_("# encrypted PING messages sent"));
+ = stats->create(gettext_noop("# encrypted PING messages sent"));
}
pingPongLock = capi->getConnectionModuleLock();
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/session/connect.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -721,13 +721,13 @@
stats = capi->requestService("stats");
if (stats != NULL) {
stat_skeySent
- = stats->create(_("# session keys sent"));
+ = stats->create(gettext_noop("# session keys sent"));
stat_skeyRejected
- = stats->create(_("# session keys rejected"));
+ = stats->create(gettext_noop("# session keys rejected"));
stat_skeyAccepted
- = stats->create(_("# session keys accepted"));
+ = stats->create(gettext_noop("# session keys accepted"));
stat_sessionEstablished
- = stats->create(_("# sessions established"));
+ = stats->create(gettext_noop("# sessions established"));
}
LOG(LOG_DEBUG,
Modified: GNUnet/src/applications/stats/gnunet-stats.c
===================================================================
--- GNUnet/src/applications/stats/gnunet-stats.c 2005-07-15 09:01:39 UTC
(rev 1544)
+++ GNUnet/src/applications/stats/gnunet-stats.c 2005-07-15 10:51:45 UTC
(rev 1545)
@@ -45,7 +45,7 @@
FILE * stream) {
FPRINTF(stream,
"%-60s: %16llu\n",
- name,
+ dgettext("GNUnet", name),
value);
return OK;
}
Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/stats/statistics.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -203,15 +203,15 @@
static void initializeStats() {
stat_handle_network_load_up
- = statHandle(_("% of allowed network load (up)"));
+ = statHandle(gettext_noop("% of allowed network load (up)"));
stat_handle_network_load_down
- = statHandle(_("% of allowed network load (down)"));
+ = statHandle(gettext_noop("% of allowed network load (down)"));
stat_handle_cpu_load
- = statHandle(_("% of allowed cpu load"));
+ = statHandle(gettext_noop("% of allowed cpu load"));
stat_connected
- = statHandle(_("# of connected peers"));
+ = statHandle(gettext_noop("# of connected peers"));
stat_bytes_noise_received
- = statHandle(_("# bytes of noise received"));
+ = statHandle(gettext_noop("# bytes of noise received"));
}
static void immediateUpdates() {
@@ -369,7 +369,7 @@
&processNoise);
setConfigurationString("ABOUT",
"stats",
- _("keeps statistics about gnunetd's operation"));
+ gettext_noop("keeps statistics about gnunetd's
operation"));
return OK;
}
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/tbench/tbench.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -444,8 +444,8 @@
ok = SYSERR;
setConfigurationString("ABOUT",
"tbench",
- _("allows profiling of direct "
- "peer-to-peer connections"));
+ gettext_noop("allows profiling of direct "
+ "peer-to-peer connections"));
return ok;
}
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/testbed/testbed.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -1354,7 +1354,7 @@
httpRegister("startup");
setConfigurationString("ABOUT",
"testbed",
- _("allows construction of a P2P-testbed"
+ gettext_noop("allows construction of a P2P-testbed"
" (incomplete)"));
return OK;
}
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/tracekit/tracekit.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -34,13 +34,6 @@
static unsigned int clientCount = 0;
static ClientHandle * clients = NULL;
-#if VERBOSE_STATS
-static int stat_cs_requests;
-static int stat_cs_replies;
-static int stat_p2p_requests;
-static int stat_p2p_replies;
-#endif
-
typedef struct {
PeerIdentity initiator;
PeerIdentity replyTo;
@@ -72,9 +65,6 @@
return SYSERR;
}
reply = (TRACEKIT_p2p_REPLY*)message;
-#if VERBOSE_STATS
- statChange(stat_p2p_replies, 1);
-#endif
hash2enc(&reply->initiatorId.hashPubKey,
&initiator);
LOG(LOG_DEBUG,
@@ -119,9 +109,6 @@
memcpy(&((TRACEKIT_CS_REPLY_GENERIC*)csReply)->peerList[0],
&((TRACEKIT_p2p_REPLY_GENERIC*)reply)->peerList[0],
hostCount * sizeof(PeerIdentity));
-#if VERBOSE_STATS
- statChange(stat_cs_replies, 1);
-#endif
coreAPI->sendToClient(clients[idx],
&csReply->header);
FREE(csReply);
@@ -133,9 +120,6 @@
LOG(LOG_DEBUG,
"TRACEKIT: forwarding to next hop '%s'\n",
&hop);
-#if VERBOSE_STATS
- statChange(stat_p2p_replies, 1);
-#endif
coreAPI->unicast(&routeTable[i]->replyTo,
message,
routeTable[i]->priority,
@@ -199,9 +183,6 @@
}
LOG(LOG_DEBUG,
"TRACEKIT: received probe\n");
-#if VERBOSE_STATS
- statChange(stat_p2p_requests, 1);
-#endif
TIME(&now);
msg = (TRACEKIT_p2p_PROBE*) message;
if ((TIME_T)ntohl(msg->timestamp) > 3600 + now) {
@@ -279,10 +260,6 @@
msg->hopsToGo = htonl(hops-1);
coreAPI->forAllConnectedNodes((PerNodeCallback) & transmit,
msg);
-#if VERBOSE_STATS
- statChange(stat_p2p_requests,
- count);
-#endif
}
/* build local reply */
size = sizeof(TRACEKIT_p2p_REPLY) + count*sizeof(PeerIdentity);
@@ -326,9 +303,6 @@
&reply->header,
ntohl(msg->priority),
0);
-#if VERBOSE_STATS
- statChange(stat_p2p_replies, 1);
-#endif
}
rest = size - maxBytes;
memcpy(&((TRACEKIT_p2p_REPLY_GENERIC*)reply)->peerList[0],
@@ -349,9 +323,6 @@
TRACEKIT_CS_PROBE * csProbe;
TRACEKIT_p2p_PROBE p2pProbe;
-#if VERBOSE_STATS
- statChange(stat_cs_requests, 1);
-#endif
LOG(LOG_DEBUG,
"TRACEKIT: client sends probe request\n");
@@ -407,10 +378,6 @@
sizeof(PeerIdentity));
handlep2pProbe(coreAPI->myIdentity,
&p2pProbe.header); /* FIRST send to myself! */
-#if VERBOSE_STATS
- statChange(stat_p2p_requests,
- coreAPI->forAllConnectedNodes(NULL, NULL));
-#endif
return OK;
}
@@ -443,16 +410,6 @@
MUTEX_CREATE(&lock);
coreAPI = capi;
-#if VERBOSE_STATS
- stat_cs_requests
- = statHandle(_("# client trace requests received"));
- stat_cs_replies
- = statHandle(_("# client trace replies sent"));
- stat_p2p_requests
- = statHandle(_("# p2p trace requests received"));
- stat_p2p_replies
- = statHandle(_("# p2p trace replies sent"));
-#endif
LOG(LOG_DEBUG,
"TRACEKIT registering handlers %d %d and %d\n",
TRACEKIT_p2p_PROTO_PROBE,
@@ -474,7 +431,7 @@
ok = SYSERR;
setConfigurationString("ABOUT",
"tracekit",
- _("allows mapping of the network topology"));
+ gettext_noop("allows mapping of the network
topology"));
return ok;
}
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ GNUnet/src/applications/traffic/traffic.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -602,7 +602,7 @@
&trafficQueryHandler);
setConfigurationString("ABOUT",
"traffic",
- _("tracks bandwidth utilization by gnunetd"));
+ gettext_noop("tracks bandwidth utilization by
gnunetd"));
return OK;
}
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ GNUnet/src/server/connection.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -2527,17 +2527,17 @@
stats = requestService("stats");
if (stats != NULL) {
stat_messagesDropped
- = stats->create(_("# outgoing messages dropped"));
+ = stats->create(gettext_noop("# outgoing messages dropped"));
stat_sizeMessagesDropped
- = stats->create(_("# bytes of outgoing messages dropped"));
+ = stats->create(gettext_noop("# bytes of outgoing messages dropped"));
stat_hangupSent
- = stats->create(_("# connections closed (HANGUP sent)"));
+ = stats->create(gettext_noop("# connections closed (HANGUP sent)"));
stat_encrypted
- = stats->create(_("# bytes encrypted"));
+ = stats->create(gettext_noop("# bytes encrypted"));
stat_decrypted
- = stats->create(_("# bytes decrypted"));
+ = stats->create(gettext_noop("# bytes decrypted"));
stat_noise_sent
- = stats->create(_("# bytes noise sent"));
+ = stats->create(gettext_noop("# bytes noise sent"));
}
transport->start(&core_receive);
}
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ GNUnet/src/transports/http.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -1467,11 +1467,11 @@
stats = coreAPI->requestService("stats");
if (stats != NULL) {
stat_bytesReceived
- = stats->create(_("# bytes received via HTTP"));
+ = stats->create(gettext_noop("# bytes received via HTTP"));
stat_bytesSent
- = stats->create(_("# bytes sent via HTTP"));
+ = stats->create(gettext_noop("# bytes sent via HTTP"));
stat_bytesDropped
- = stats->create(_("# bytes dropped by HTTP (outgoing)"));
+ = stats->create(gettext_noop("# bytes dropped by HTTP (outgoing)"));
}
httpAPI.protocolNumber = HTTP_PROTOCOL_NUMBER;
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ GNUnet/src/transports/tcp.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -1418,11 +1418,11 @@
stats = coreAPI->requestService("stats");
if (stats != NULL) {
stat_bytesReceived
- = stats->create(_("# bytes received via TCP"));
+ = stats->create(gettext_noop("# bytes received via TCP"));
stat_bytesSent
- = stats->create(_("# bytes sent via TCP"));
+ = stats->create(gettext_noop("# bytes sent via TCP"));
stat_bytesDropped
- = stats->create(_("# bytes dropped by TCP (outgoing)"));
+ = stats->create(gettext_noop("# bytes dropped by TCP (outgoing)"));
}
tcpAPI.protocolNumber = TCP_PROTOCOL_NUMBER;
tcpAPI.mtu = 0;
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ GNUnet/src/transports/udp.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -638,11 +638,11 @@
stats = coreAPI->requestService("stats");
if (stats != NULL) {
stat_bytesReceived
- = stats->create(_("# bytes received via UDP"));
+ = stats->create(gettext_noop("# bytes received via UDP"));
stat_bytesSent
- = stats->create(_("# bytes sent via UDP"));
+ = stats->create(gettext_noop("# bytes sent via UDP"));
stat_bytesDropped
- = stats->create(_("# bytes dropped by UDP (outgoing)"));
+ = stats->create(gettext_noop("# bytes dropped by UDP (outgoing)"));
}
MUTEX_CREATE(&configLock);
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2005-07-15 09:01:39 UTC (rev 1544)
+++ gnunet-gtk/TODO 2005-07-15 10:51:45 UTC (rev 1545)
@@ -8,9 +8,7 @@
5) why can the "file sharing" tab not be selected first
(I can select first "General" and then "file sharing"!,
glade shows no difference between the two!!!)
-6) stats only work if LANG for gnunetd and gnunet-gtk match
-7) gtkSaveCall un-queueing sometimes fails, then
- gnunet-gtk will not shutdown (why? when?)!
+6) i18n does not work (UTF-8/pango problems)
Later (0.7.1+):
1) auto-rename downloaded files
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ gnunet-gtk/src/common/helper.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -33,6 +33,7 @@
Semaphore * sem;
void * args;
SimpleCallback func;
+ int destroyed;
} SaveCall;
typedef struct Plugin {
@@ -69,9 +70,27 @@
static gboolean saveCallWrapper(gpointer data) {
SaveCall * call = data;
+ int i;
+ /* clearly, we are no longer pending,
+ so remove from psc */
+ if (call->sem != NULL) {
+ MUTEX_LOCK(&sclock);
+ for (i=0;i<pscCount;i++) {
+ if (psc[i] == call) {
+ psc[i] = psc[pscCount-1];
+ break;
+ }
+ }
+ GNUNET_ASSERT(i != pscCount);
+ GROW(psc,
+ pscCount,
+ pscCount-1);
+ MUTEX_UNLOCK(&sclock);
+ }
+
call->func(call->args);
- if (call->sem != NULL)
+ if (call->sem != NULL)
SEMAPHORE_UP(call->sem);
return FALSE;
}
@@ -84,7 +103,6 @@
void gtkSaveCall(SimpleCallback func,
void * args) {
SaveCall call;
- int i;
MUTEX_LOCK(&sclock);
if ( (saveCallsUp == NO) ||
@@ -92,27 +110,15 @@
call.args = args;
call.func = func;
call.sem = SEMAPHORE_NEW(0);
+ call.destroyed = 0;
GROW(psc,
pscCount,
pscCount+1);
psc[pscCount-1] = &call;
+ gtk_idle_add(&saveCallWrapper,
+ &call);
MUTEX_UNLOCK(&sclock);
- gtk_idle_add(&saveCallWrapper,
- &call);
SEMAPHORE_DOWN(call.sem);
- /* remove from psc list */
- MUTEX_LOCK(&sclock);
- for (i=0;i<pscCount;i++) {
- if (psc[i] == &call) {
- psc[i] = psc[pscCount-1];
- break;
- }
- }
- GNUNET_ASSERT(i != pscCount);
- GROW(psc,
- pscCount,
- pscCount-1);
- MUTEX_UNLOCK(&sclock);
SEMAPHORE_FREE(call.sem);
} else {
MUTEX_UNLOCK(&sclock);
@@ -131,8 +137,11 @@
return NO;
}
i = randomi(pscCount);
- if (TRUE == g_idle_remove_by_data(psc[i]->args))
- psc[i]->func(psc[i]);
+ g_idle_remove_by_data(psc[i]->args);
+ /* yes, ignore return value here, GTK seems
+ to be dropping these during shutdown, and
+ we still want to run them nevertheless */
+ psc[i]->func(psc[i]);
MUTEX_UNLOCK(&sclock);
gnunet_util_sleep(50 * cronMILLIS);
/* sleep here is somewhat important, first of
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2005-07-15 09:01:39 UTC (rev 1544)
+++ gnunet-gtk/src/core/main.c 2005-07-15 10:51:45 UTC (rev 1545)
@@ -111,7 +111,7 @@
/* start the event loop */
gdk_threads_enter();
gtk_main();
- gdk_threads_leave();
+ gdk_threads_leave();
setCustomLogProc(NULL);
while (YES == gtkRunSomeSaveCalls()) ;
stopCron();
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -82,7 +82,7 @@
gtk_list_store_set(model,
&iter,
0, pos,
- 1, desc,
+ 1, dgettext("GNUnet", desc),
-1);
FREENONNULL(desc);
}
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2005-07-15 09:01:39 UTC (rev
1544)
+++ gnunet-gtk/src/plugins/stats/functions.c 2005-07-15 10:51:45 UTC (rev
1545)
@@ -113,8 +113,7 @@
if (OK != getStatValue(&val,
NULL,
NULL,
- dgettext("GNUnet",
- "# of connected peers")))
+ "# of connected peers"))
return SYSERR;
data[0][0] = 0.8 * val / connectionGoal;
return OK;
@@ -127,8 +126,7 @@
if (OK != getStatValue(&val,
NULL,
NULL,
- dgettext("GNUnet",
- "% of allowed cpu load")))
+ "% of allowed cpu load"))
return SYSERR;
data[0][0] = val / 125.0;
return OK;
@@ -151,21 +149,18 @@
if (OK != getStatValue(&total,
<otal,
&dtime,
- dgettext("GNUnet",
- "# bytes decrypted")))
+ "# bytes decrypted"))
return SYSERR;
if (OK != getStatValue(&noise,
&lnoise,
NULL,
- dgettext("GNUnet",
- "# bytes of noise received")))
+ "# bytes of noise received"))
return SYSERR;
i = 0;
buffer = MALLOC(512);
SNPRINTF(buffer,
512,
- dgettext("GNUnet",
- "# bytes received of type %d"),
+ "# bytes received of type %d",
GAP_p2p_PROTO_RESULT);
if (OK != getStatValue(&content,
&lcontent,
@@ -177,8 +172,7 @@
i = 0;
SNPRINTF(buffer,
512,
- dgettext("GNUnet",
- "# bytes received of type %d"),
+ "# bytes received of type %d",
GAP_p2p_PROTO_QUERY);
if (OK != getStatValue(&queries,
&lqueries,
@@ -231,21 +225,18 @@
if (OK != getStatValue(&total,
<otal,
&dtime,
- dgettext("GNUnet",
- "# bytes encrypted")))
+ "# bytes encrypted"))
return SYSERR;
if (OK != getStatValue(&noise,
&lnoise,
NULL,
- dgettext("GNUnet",
- "# bytes noise sent")))
+ "# bytes noise sent"))
return SYSERR;
i = 0;
buffer = MALLOC(512);
SNPRINTF(buffer,
512,
- dgettext("GNUnet",
- "# bytes transmitted of type %d"),
+ "# bytes transmitted of type %d",
GAP_p2p_PROTO_RESULT);
if (OK != getStatValue(&content,
&lcontent,
@@ -257,8 +248,7 @@
i = 0;
SNPRINTF(buffer,
512,
- dgettext("GNUnet",
- "# bytes received of type %d"),
+ "# bytes received of type %d",
GAP_p2p_PROTO_QUERY);
if (OK == getStatValue(&queries,
&lqueries,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1545 - GNUnet/src/applications/advertising GNUnet/src/applications/bootstrap_http GNUnet/src/applications/fragmentation GNUnet/src/applications/fs/module GNUnet/src/applications/pingpong GNUnet/src/applications/session GNUnet/src/applications/stats GNUnet/src/applications/tbench GNUnet/src/applications/testbed GNUnet/src/applications/tracekit GNUnet/src/applications/traffic GNUnet/src/server GNUnet/src/transports gnunet-gtk gnunet-gtk/src/common gnunet-gtk/src/core gnunet-gtk/src/plugins/daemon gnunet-gtk/src/plugins/stats,
grothoff <=