[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37710 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37710 - gnunet/src/testbed |
Date: |
Sat, 13 Aug 2016 21:49:15 +0200 |
Author: grothoff
Date: 2016-08-13 21:49:15 +0200 (Sat, 13 Aug 2016)
New Revision: 37710
Modified:
gnunet/src/testbed/testbed_api_topology.c
Log:
-use new_array where appropriate, fix indentation
Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c 2016-08-13 19:42:00 UTC (rev
37709)
+++ gnunet/src/testbed/testbed_api_topology.c 2016-08-13 19:49:15 UTC (rev
37710)
@@ -346,7 +346,8 @@
* operation has executed successfully.
*/
static void
-overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op,
+overlay_link_completed (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
struct OverlayLink *link = cls;
@@ -366,10 +367,13 @@
if (0 != overlay->retry_cnt)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Error while establishing a link: %s -- Retrying\n", emsg);
+ "Error while establishing a link: %s -- Retrying\n",
+ emsg);
retry_entry = GNUNET_new (struct RetryListEntry);
retry_entry->link = link;
- GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head, overlay->rl_tail,
retry_entry);
+ GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head,
+ overlay->rl_tail,
+ retry_entry);
}
}
else
@@ -386,11 +390,15 @@
{
link = retry_entry->link;
link->op =
- GNUNET_TESTBED_overlay_connect (overlay->op_cls,
&overlay_link_completed,
- link, overlay->peers[link->A],
+ GNUNET_TESTBED_overlay_connect (overlay->op_cls,
+ &overlay_link_completed,
+ link,
+ overlay->peers[link->A],
overlay->peers[link->B]);
overlay->nlinks++;
- GNUNET_CONTAINER_DLL_remove (overlay->rl_head, overlay->rl_tail,
retry_entry);
+ GNUNET_CONTAINER_DLL_remove (overlay->rl_head,
+ overlay->rl_tail,
+ retry_entry);
GNUNET_free (retry_entry);
}
return;
@@ -397,7 +405,9 @@
}
if (NULL != overlay->comp_cb)
{
- overlay->comp_cb (overlay->comp_cb_cls, overlay->nsuccess,
overlay->nfailures);
+ overlay->comp_cb (overlay->comp_cb_cls,
+ overlay->nsuccess,
+ overlay->nfailures);
}
}
@@ -421,7 +431,8 @@
for (p = 0; p < tc->link_array_size; p++)
{
overlay->link_array[p].op =
- GNUNET_TESTBED_overlay_connect (overlay->op_cls,
&overlay_link_completed,
+ GNUNET_TESTBED_overlay_connect (overlay->op_cls,
+ &overlay_link_completed,
&overlay->link_array[p],
overlay->peers[overlay->link_array[p].A],
overlay->peers[overlay->link_array[p].B]);
@@ -470,7 +481,9 @@
* @return
*/
static void
-make_link (unsigned int offset, uint32_t A, uint32_t B,
+make_link (unsigned int offset,
+ uint32_t A,
+ uint32_t B,
struct TopologyContext *tc)
{
GNUNET_assert (A != B);
@@ -526,7 +539,8 @@
overlay = &tc->u.overlay;
overlay->link_array =
- GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct OverlayLink);
}
break;
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
@@ -535,7 +549,8 @@
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct UnderlayLink);
}
break;
}
@@ -563,7 +578,8 @@
overlay = &tc->u.overlay;
overlay->link_array =
- GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct OverlayLink);
}
break;
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
@@ -572,12 +588,16 @@
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct UnderlayLink);
}
break;
}
for (cnt = tc->link_array_size; cnt; cnt--)
- make_link (0, 0, cnt, tc);
+ make_link (0,
+ 0,
+ cnt,
+ tc);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37710 - gnunet/src/testbed,
gnunet <=