[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7194 - in GNUnet: libltdl src/applications/datastore src/a
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7194 - in GNUnet: libltdl src/applications/datastore src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/tools src/applications/sqstore_mysql src/applications/testing src/include src/server src/setup/gtk src/setup/lib src/setup/ncurses src/transports src/util/error src/util/network src/util/os |
|
Date: |
Sat, 14 Jun 2008 00:35:39 -0600 (MDT) |
Author: grothoff
Date: 2008-06-14 00:35:39 -0600 (Sat, 14 Jun 2008)
New Revision: 7194
Modified:
GNUnet/libltdl/ltdl.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/gap/plan.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/testing/remote.c
GNUnet/src/applications/testing/remotetopologies.c
GNUnet/src/applications/testing/testing.c
GNUnet/src/include/gnunet_fs_lib.h
GNUnet/src/server/connection.c
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/gns.c
GNUnet/src/setup/ncurses/mconf.c
GNUnet/src/transports/http.c
GNUnet/src/util/error/error.c
GNUnet/src/util/network/select.c
GNUnet/src/util/os/daemontest.c
Log:
indent
Modified: GNUnet/libltdl/ltdl.c
===================================================================
--- GNUnet/libltdl/ltdl.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/libltdl/ltdl.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -1770,9 +1770,9 @@
*) (((struct
dylib_command
*)
- lc)->dylib.
- name.offset
- +
+ lc)->
+ dylib.name.
+ offset +
(unsigned
long)
lc));
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2008-06-14 06:35:01 UTC
(rev 7193)
+++ GNUnet/src/applications/datastore/datastore.c 2008-06-14 06:35:39 UTC
(rev 7194)
@@ -389,9 +389,9 @@
stat_filter_failed =
stats->create (gettext_noop ("# bloom filter false positives"));
- stats->
- set (stats->create (gettext_noop ("# bytes allowed in datastore")),
- quota);
+ stats->set (stats->
+ create (gettext_noop ("# bytes allowed in datastore")),
+ quota);
}
state = capi->service_request ("state");
if (state != NULL)
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2008-06-14 06:35:01 UTC
(rev 7193)
+++ GNUnet/src/applications/fs/collection/collection.c 2008-06-14 06:35:39 UTC
(rev 7194)
@@ -511,9 +511,12 @@
GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
&dirData,
&dirLen,
-
collectionData->file_count,
-
collectionData->files,
-
collectionData->meta));
+ collectionData->
+ file_count,
+ collectionData->
+ files,
+ collectionData->
+ meta));
if (-1 == WRITE (fd, dirData, dirLen))
{
GNUNET_GE_LOG_STRERROR (ectx,
@@ -527,10 +530,10 @@
GNUNET_free (dirData);
CLOSE (fd);
if (GNUNET_OK != GNUNET_ECRS_file_upload (ectx, cfg, tmpName, GNUNET_NO,
/* indexing */
- ntohl (collectionData->
- data.anonymityLevel),
- ntohl (collectionData->
- data.priority),
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME, NULL,
NULL, NULL, NULL, &directoryURI))
@@ -555,10 +558,10 @@
uri = GNUNET_ECRS_namespace_add_content (ectx,
cfg,
&collectionData->data.pid,
- ntohl (collectionData->
- data.anonymityLevel),
- ntohl (collectionData->
- data.priority),
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME,
this_revision_string,
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/ecrs/download.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -898,7 +898,7 @@
no_temporaries,
dpcb, dpcbClosure);
if (rm == NULL)
- return GNUNET_SYSERR;
+ return GNUNET_SYSERR;
while ((GNUNET_OK == tt (ttClosure)) &&
(GNUNET_YES != GNUNET_shutdown_test ()) &&
(rm->abortFlag == GNUNET_NO) && (rm->head != NULL))
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -309,8 +309,8 @@
sizeof (unsigned
int),
&ksb->sblock,
- &ksb->
- kblock.signature));
+ &ksb->kblock.
+ signature));
/* extra check: verify sig */
GNUNET_RSA_free_key (pk);
if (GNUNET_OK != GNUNET_FS_insert (sock, knvalue))
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -177,8 +177,7 @@
srl->test_download
= GNUNET_ECRS_file_download_partial_start (ctx->ectx,
ctx->cfg,
- sl->
- probe_context,
+
sl->probe_context,
srl->fi.uri,
NULL, off, len,
1, GNUNET_YES,
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/fsui/search.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -206,7 +206,8 @@
}
static int
-count_mandatory_keywords (const char *keyword, int is_mandatory, void *closure)
+count_mandatory_keywords (const char *keyword, int is_mandatory,
+ void *closure)
{
struct GNUNET_FSUI_SearchList *pos = closure;
@@ -296,7 +297,8 @@
if (GNUNET_ECRS_uri_test_ksk (uri))
{
/* (possibly boolean) keyword search */
- GNUNET_ECRS_uri_get_keywords_from_ksk (uri, &count_mandatory_keywords,
pos);
+ GNUNET_ECRS_uri_get_keywords_from_ksk (uri, &count_mandatory_keywords,
+ pos);
GNUNET_ECRS_uri_get_keywords_from_ksk (uri, &create_ecrs_search, pos);
if (pos->start_time == 0)
{
Modified: GNUnet/src/applications/fs/gap/plan.c
===================================================================
--- GNUnet/src/applications/fs/gap/plan.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/gap/plan.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -567,7 +567,7 @@
rank = rank->next;
}
if (total_score == 0)
- return GNUNET_NO; /* no peers available */
+ return GNUNET_NO; /* no peers available */
entropy = 0;
rank = rpc.rankings;
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/fs/lib/fslib.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -206,12 +206,12 @@
memcpy (&value[1], &rep[1], size);
matched = 0;
GNUNET_mutex_lock (ctx->lock);
- while (ctx->block_results > 0)
- {
- GNUNET_mutex_unlock (ctx->lock);
- GNUNET_thread_sleep(100 * GNUNET_CRON_MILLISECONDS);
- GNUNET_mutex_lock (ctx->lock);
- }
+ while (ctx->block_results > 0)
+ {
+ GNUNET_mutex_unlock (ctx->lock);
+ GNUNET_thread_sleep (100 * GNUNET_CRON_MILLISECONDS);
+ GNUNET_mutex_lock (ctx->lock);
+ }
prev = NULL;
pos = ctx->handles;
while (pos != NULL)
@@ -316,17 +316,19 @@
/**
* Resume the search context (start sending results again).
*/
-void GNUNET_FS_resume_search_context (struct GNUNET_FS_SearchContext *ctx)
+void
+GNUNET_FS_resume_search_context (struct GNUNET_FS_SearchContext *ctx)
{
ctx->block_results--;
- GNUNET_thread_stop_sleep(ctx->thread);
+ GNUNET_thread_stop_sleep (ctx->thread);
}
-void GNUNET_FS_suspend_search_context (struct GNUNET_FS_SearchContext *ctx)
+void
+GNUNET_FS_suspend_search_context (struct GNUNET_FS_SearchContext *ctx)
{
- GNUNET_mutex_lock(ctx->lock);
+ GNUNET_mutex_lock (ctx->lock);
ctx->block_results++;
- GNUNET_mutex_unlock(ctx->lock);
+ GNUNET_mutex_unlock (ctx->lock);
}
@@ -444,7 +446,7 @@
ctx->handles = pos->next;
else
prev->next = pos->next;
- /* TODO: consider sending "stop" message
+ /* TODO: consider sending "stop" message
to gnunetd? */
req = (CS_fs_request_search_MESSAGE *) & pos[1];
req->header.type = htons (GNUNET_CS_PROTO_GAP_QUERY_STOP);
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-14 06:35:01 UTC
(rev 7193)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-14 06:35:39 UTC
(rev 7194)
@@ -75,9 +75,9 @@
event->data.UnindexCompleted.total,
delta / GNUNET_CRON_SECONDS,
(delta ==
- 0) ? (double) (-1.0) : (double) (event->
- data.UnindexCompleted.
- total / 1024.0 *
+ 0) ? (double) (-1.0) : (double) (event->data.
+ UnindexCompleted.total /
+ 1024.0 *
GNUNET_CRON_SECONDS /
delta));
}
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-14 06:35:01 UTC
(rev 7193)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-14 06:35:39 UTC
(rev 7194)
@@ -1273,8 +1273,8 @@
if (type != 0)
stmt =
(vhash !=
- NULL) ? dbh->
- count_entry_by_hash_vhash_and_type : dbh->count_entry_by_hash_and_type;
+ NULL) ? dbh->count_entry_by_hash_vhash_and_type : dbh->
+ count_entry_by_hash_and_type;
else
stmt =
(vhash !=
@@ -1416,8 +1416,8 @@
else
stmt =
(vhash !=
- NULL) ? dbh->
- select_entry_by_hash_and_vhash : dbh->select_entry_by_hash;
+ NULL) ? dbh->select_entry_by_hash_and_vhash : dbh->
+ select_entry_by_hash;
if (count == 0)
limit_off = off;
else
Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/testing/remote.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -421,7 +421,8 @@
GNUNET_REMOTE_start_daemon (remote_gnunetd_path, "/tmp/",
temp, remote_config_path,
curr_host, ssh_username,
-
temp_pos->remote_friend_file_path);
+ temp_pos->
+ remote_friend_file_path);
GNUNET_GC_get_configuration_value_number (basecfg,
"NETWORK",
Modified: GNUnet/src/applications/testing/remotetopologies.c
===================================================================
--- GNUnet/src/applications/testing/remotetopologies.c 2008-06-14 06:35:01 UTC
(rev 7193)
+++ GNUnet/src/applications/testing/remotetopologies.c 2008-06-14 06:35:39 UTC
(rev 7194)
@@ -370,13 +370,15 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-
&h2->senderIdentity))
+ &h2->
+
senderIdentity))
{
ret = GNUNET_OK;
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-
&h1->senderIdentity))
+ &h1->
+
senderIdentity))
{
ret = GNUNET_OK;
break;
Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c 2008-06-14 06:35:01 UTC (rev
7193)
+++ GNUnet/src/applications/testing/testing.c 2008-06-14 06:35:39 UTC (rev
7194)
@@ -277,7 +277,8 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
-
&h2->senderIdentity))
+ &h2->
+
senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
@@ -285,7 +286,8 @@
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
-
&h1->senderIdentity))
+ &h1->
+
senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
Modified: GNUnet/src/include/gnunet_fs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fs_lib.h 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/include/gnunet_fs_lib.h 2008-06-14 06:35:39 UTC (rev 7194)
@@ -55,7 +55,7 @@
/**
* Pause the search context briefly (stop sending
- * results). This will NOT cause gnunetd to pause
+ * results). This will NOT cause gnunetd to pause
* searching for data.
*/
void GNUNET_FS_suspend_search_context (struct GNUNET_FS_SearchContext *ctx);
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/server/connection.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -721,8 +721,8 @@
if (root->session.tsession != NULL)
GNUNET_GE_ASSERT (NULL,
GNUNET_OK ==
- transport->assert_associated (root->
- session.tsession,
+ transport->assert_associated (root->session.
+ tsession,
__FILE__));
root = root->overflowChain;
}
@@ -1903,8 +1903,8 @@
stats->change (stat_transmitted, p);
be->available_send_window -= p;
be->lastSequenceNumberSend++;
- GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->
- session.sender, 0);
+ GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->session.
+ sender, 0);
if (be->idealized_limit > be->max_transmitted_limit)
be->max_transmitted_limit = be->idealized_limit;
else /* age */
@@ -2484,8 +2484,8 @@
{
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- GNUNET_hash_to_enc (&entries[u]->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
"peer `%s' transmitted above limit: %llu bpm > %u
bpm\n",
@@ -2508,8 +2508,8 @@
#if DEBUG_CONNECTION
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&entries[u]->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
@@ -2570,8 +2570,8 @@
for (u = 0; u < activePeerCount; u++)
{
GNUNET_CORE_connection_reserve_downstream_bandwidth (&entries
- [u]->session.
- sender, 0);
+ [u]->
+ session.sender, 0);
entries[u]->idealized_limit = 0;
}
while ((schedulableBandwidth > activePeerCount * 100) &&
@@ -2905,8 +2905,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
@@ -3009,8 +3009,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.
- sender.hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.sender.
+ hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -268,22 +268,22 @@
#ifndef MINGW
if (NULL == uname || strlen (uname) == 0)
{
- struct passwd * pwd;
+ struct passwd *pwd;
- if ( (geteuid() == 0) && (NULL != getpwnam ("gnunet")))
- user_name = GNUNET_strdup ("gnunet");
+ if ((geteuid () == 0) && (NULL != getpwnam ("gnunet")))
+ user_name = GNUNET_strdup ("gnunet");
else
- {
- pwd = getpwuid(geteuid());
- if (pwd != NULL)
- user_name = GNUNET_strdup (pwd->pw_name);
- else
- {
- if (NULL != getenv ("USER"))
- user_name = GNUNET_strdup (getenv("USER"));
- else
- user_name = NULL;
- }
+ {
+ pwd = getpwuid (geteuid ());
+ if (pwd != NULL)
+ user_name = GNUNET_strdup (pwd->pw_name);
+ else
+ {
+ if (NULL != getenv ("USER"))
+ user_name = GNUNET_strdup (getenv ("USER"));
+ else
+ user_name = NULL;
+ }
}
}
else
Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/setup/lib/gns.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -122,8 +122,8 @@
val = GNUNET_GC_get_configuration_value_yesno (cfg,
section,
option,
- pos->value.
- Boolean.def);
+ pos->value.Boolean.
+ def);
if (val == GNUNET_SYSERR)
{
return GNUNET_SYSERR;
@@ -138,9 +138,18 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_number (cfg,
section,
option,
-
pos->value.UInt64.min,
-
pos->value.UInt64.max,
-
pos->value.UInt64.def,
+ pos->
+ value.
+ UInt64.
+ min,
+ pos->
+ value.
+ UInt64.
+ max,
+ pos->
+ value.
+ UInt64.
+ def,
&val))
{
return GNUNET_SYSERR;
@@ -185,7 +194,10 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_string (cfg,
section,
option,
-
pos->value.String.def,
+ pos->
+ value.
+ String.
+ def,
&val))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
@@ -202,8 +214,14 @@
(const
char
**)
-
pos->value.String.legalRange,
-
pos->value.String.def,
+ pos->
+ value.
+ String.
+
legalRange,
+ pos->
+ value.
+ String.
+ def,
&ival))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/setup/ncurses/mconf.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -179,8 +179,10 @@
case DLG_EXIT_CANCEL:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+ section,
+ pos->
+ option,
st ==
DLG_EXIT_OK
? "YES" :
@@ -215,9 +217,12 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
-
fitem.text))
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -279,9 +284,13 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
-
pos->section,
-
pos->option,
-
val->String.legalRange
+ pos->
+ section,
+ pos->
+ option,
+ val->
+ String.
+ legalRange
[msel]))
{
show_help (pos->option,
@@ -360,8 +369,10 @@
tmp[strlen (tmp) - 1] = '\0';
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+ section,
+ pos->
+ option,
tmp))
{
GNUNET_free (tmp);
@@ -405,9 +416,12 @@
}
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
-
pos->section,
-
pos->option,
-
fitem.text))
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -456,8 +470,10 @@
}
if (0 != GNUNET_GC_set_configuration_value_number (cfg,
ectx,
-
pos->section,
-
pos->option,
+ pos->
+
section,
+ pos->
+
option,
lval))
{
show_help (pos->option,
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/transports/http.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -1006,9 +1006,8 @@
cpy = sizeof (GNUNET_MessageHeader) - httpSession->cs.client.rpos1;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.
- client.rbuff1[httpSession->cs.client.rpos1], &inbuf[poff],
- cpy);
+ memcpy (&httpSession->cs.client.
+ rbuff1[httpSession->cs.client.rpos1], &inbuf[poff], cpy);
httpSession->cs.client.rpos1 += cpy;
have -= cpy;
poff += cpy;
@@ -1028,9 +1027,8 @@
httpSession->cs.client.rpos2;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.
- client.rbuff2[httpSession->cs.client.rpos2], &inbuf[poff],
- cpy);
+ memcpy (&httpSession->cs.client.
+ rbuff2[httpSession->cs.client.rpos2], &inbuf[poff], cpy);
have -= cpy;
poff += cpy;
httpSession->cs.client.rpos2 += cpy;
Modified: GNUnet/src/util/error/error.c
===================================================================
--- GNUnet/src/util/error/error.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/util/error/error.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -75,8 +75,7 @@
return;
if ((ctx == NULL) &&
(((kind & (GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK)) == 0) ||
- ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR)) ==
- 0)))
+ ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR)) == 0)))
return;
va_start (va, message);
Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/util/network/select.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -383,15 +383,14 @@
#endif
if (ret == GNUNET_SYSERR)
{
- if ( (errno == EPIPE) ||
- (errno == ECONNRESET) )
- GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER |
- GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
- else
- GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
- GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
+ if ((errno == EPIPE) || (errno == ECONNRESET))
+ GNUNET_GE_LOG_STRERROR (sh->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
+ else
+ GNUNET_GE_LOG_STRERROR (sh->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
destroySession (sh, session);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/util/os/daemontest.c
===================================================================
--- GNUnet/src/util/os/daemontest.c 2008-06-14 06:35:01 UTC (rev 7193)
+++ GNUnet/src/util/os/daemontest.c 2008-06-14 06:35:39 UTC (rev 7194)
@@ -34,8 +34,8 @@
struct GNUNET_GC_Configuration *cfg;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_ERROR | GNUNET_GE_FATAL |
GNUNET_GE_USER |
- GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_FATAL |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE |
GNUNET_GE_BULK);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7194 - in GNUnet: libltdl src/applications/datastore src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/tools src/applications/sqstore_mysql src/applications/testing src/include src/server src/setup/gtk src/setup/lib src/setup/ncurses src/transports src/util/error src/util/network src/util/os,
gnunet <=