[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -rename private structs; fix pointer
From: |
gnunet |
Subject: |
[gnunet] branch master updated: -rename private structs; fix pointer |
Date: |
Tue, 13 Dec 2022 14:06:04 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 0c9b0159c -rename private structs; fix pointer
0c9b0159c is described below
commit 0c9b0159cc1c9aa3464fc41581e4bb53ecc7d1db
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Dec 13 22:05:57 2022 +0900
-rename private structs; fix pointer
---
src/testing/gnunet-cmds-helper.c | 2 +-
src/testing/testing.h | 4 +-
src/testing/testing_api_cmd_barrier.c | 47 ++++++++++++----------
.../testing_api_cmd_netjail_start_testsystem.c | 4 +-
4 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
index 22cf5a428..458830cb9 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -416,7 +416,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader
*message)
message->type))
{
const char *barrier_name;
- struct GNUNET_TESTING_CommandBarrierAdvanced *adm = (struct
GNUNET_TESTING_CommandBarrierAdvanced *) message;
+ struct CommandBarrierAdvanced *adm = (struct CommandBarrierAdvanced *)
message;
barrier_name = (const char *) &adm[1];
GNUNET_TESTING_finish_attached_cmds (is, barrier_name);
diff --git a/src/testing/testing.h b/src/testing/testing.h
index 382879706..7372b143e 100644
--- a/src/testing/testing.h
+++ b/src/testing/testing.h
@@ -32,7 +32,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
* Message send to a child loop to inform the child loop about a barrier being
advanced.
* FIXME: This is not packed and contains a char*... no payload documentation.
*/
-struct GNUNET_TESTING_CommandBarrierAdvanced
+struct CommandBarrierAdvanced
{
/**
* Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ADVANCED
@@ -47,7 +47,7 @@ struct GNUNET_TESTING_CommandBarrierAdvanced
* GNUNET_CMDS_BARRIER_REACHED messages the child will send.
* FIXME: Not packed and contains char*; int in NBO? bitlength undefined.
*/
-struct GNUNET_TESTING_CommandBarrierAttached
+struct CommandBarrierAttached
{
/**
* Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED
diff --git a/src/testing/testing_api_cmd_barrier.c
b/src/testing/testing_api_cmd_barrier.c
index d27ce9d94..7e4e67dea 100644
--- a/src/testing/testing_api_cmd_barrier.c
+++ b/src/testing/testing_api_cmd_barrier.c
@@ -37,9 +37,9 @@ struct BarrierState
*/
struct GNUNET_TESTING_Barrier *barrier;
- /*
- * Our label.
- */
+ /*
+ * Our label.
+ */
const char *label;
};
@@ -55,13 +55,15 @@ struct BarrierState
*/
void
GNUNET_TESTING_send_barrier_attach (struct GNUNET_TESTING_Interpreter *is,
- char *barrier_name,
+ char *barrier_name,
unsigned int global_node_number,
unsigned int expected_reaches,
- GNUNET_TESTING_cmd_helper_write_cb
write_message)
+ GNUNET_TESTING_cmd_helper_write_cb
+ write_message)
{
- struct GNUNET_TESTING_CommandBarrierAttached *atm = GNUNET_new (struct
GNUNET_TESTING_CommandBarrierAttached);
- size_t msg_length = sizeof(struct GNUNET_TESTING_CommandBarrierAttached);
+ struct CommandBarrierAttached *atm = GNUNET_new (struct
+ CommandBarrierAttached);
+ size_t msg_length = sizeof(struct CommandBarrierAttached);
size_t name_len;
name_len = strlen (barrier_name) + 1;
@@ -88,8 +90,9 @@ GNUNET_TESTING_send_barrier_advance (struct
GNUNET_TESTING_Interpreter *is,
const char *barrier_name,
unsigned int global_node_number)
{
- struct GNUNET_TESTING_CommandBarrierAdvanced *adm = GNUNET_new (struct
GNUNET_TESTING_CommandBarrierAdvanced);
- size_t msg_length = sizeof(struct GNUNET_TESTING_CommandBarrierAdvanced);
+ struct CommandBarrierAdvanced *adm = GNUNET_new (struct
+ CommandBarrierAdvanced);
+ size_t msg_length = sizeof(struct CommandBarrierAdvanced);
size_t name_len;
name_len = strlen (barrier_name) + 1;
@@ -97,8 +100,8 @@ GNUNET_TESTING_send_barrier_advance (struct
GNUNET_TESTING_Interpreter *is,
adm->header.size = htons ((uint16_t) msg_length);
memcpy (&adm[1], barrier_name, name_len);
GNUNET_TESTING_send_message_to_netjail (is,
- global_node_number,
- &adm->header);
+ global_node_number,
+ &adm->header);
GNUNET_free (adm);
}
@@ -116,7 +119,7 @@ GNUNET_TESTING_can_barrier_advance (struct
GNUNET_TESTING_Barrier *barrier)
unsigned int reached = barrier->reached;
double percentage_to_be_reached = barrier->percentage_to_be_reached;
unsigned int number_to_be_reached = barrier->number_to_be_reached;
- double percentage_reached = (double)expected_reaches/reached*100;
+ double percentage_reached = (double) expected_reaches / reached * 100;
if (((0 < percentage_to_be_reached) &&
(percentage_reached >= percentage_to_be_reached)) ||
((0 < number_to_be_reached) && (reached >= number_to_be_reached)))
@@ -141,9 +144,9 @@ GNUNET_TESTING_can_barrier_advance (struct
GNUNET_TESTING_Barrier *barrier)
*/
static enum GNUNET_GenericReturnValue
barrier_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
+ const void **ret,
+ const char *trait,
+ unsigned int index)
{
struct GNUNET_TESTING_Trait traits[] = {
GNUNET_TESTING_trait_end ()
@@ -179,7 +182,7 @@ barrier_cleanup (void *cls)
*/
static void
barrier_run (void *cls,
- struct GNUNET_TESTING_Interpreter *is)
+ struct GNUNET_TESTING_Interpreter *is)
{
struct BarrierState *brs = cls;
@@ -198,20 +201,20 @@ GNUNET_TESTING_barrier_get_node (struct
GNUNET_CONTAINER_MultiShortmap *nodes,
unsigned int node_number)
{
struct GNUNET_HashCode hc;
- struct GNUNET_ShortHashCode *key;
+ struct GNUNET_ShortHashCode key;
GNUNET_CRYPTO_hash (&(node_number), sizeof(node_number), &hc);
memcpy (&key,
- &hc,
- sizeof (key));
- return GNUNET_CONTAINER_multishortmap_get (nodes, key);
+ &hc,
+ sizeof (key));
+ return GNUNET_CONTAINER_multishortmap_get (nodes, &key);
}
struct GNUNET_TESTING_Command
GNUNET_TESTING_cmd_barrier_create (const char *label,
- double percentage_to_be_reached,
- unsigned int number_to_be_reached)
+ double percentage_to_be_reached,
+ unsigned int number_to_be_reached)
{
struct GNUNET_TESTING_Barrier *barrier;
struct BarrierState *bs;
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem.c
b/src/testing/testing_api_cmd_netjail_start_testsystem.c
index 09f767b7a..62b628928 100644
--- a/src/testing/testing_api_cmd_netjail_start_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -345,14 +345,14 @@ void
barrier_attached (struct NetJailState *ns, const struct
GNUNET_MessageHeader *message)
{
- struct GNUNET_TESTING_CommandBarrierAttached *am;
+ struct CommandBarrierAttached *am;
struct GNUNET_TESTING_NetjailNode *node;
struct GNUNET_TESTING_Barrier *barrier;
struct GNUNET_ShortHashCode key;
struct GNUNET_HashCode hc;
const char *barrier_name;
- am = (struct GNUNET_TESTING_CommandBarrierAttached *) message;
+ am = (struct CommandBarrierAttached *) message;
barrier_name = (const char *) &am[1];
barrier = GNUNET_TESTING_get_barrier (ns->is, barrier_name);
GNUNET_assert (NULL != barrier && GNUNET_NO == barrier->shadow);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -rename private structs; fix pointer,
gnunet <=