[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 04/04: MESSENGER: Uncrustify code
|
From: |
gnunet |
|
Subject: |
[gnunet] 04/04: MESSENGER: Uncrustify code |
|
Date: |
Fri, 17 Nov 2023 00:59:49 +0100 |
This is an automated email from the git hooks/post-receive script.
thejackimonster pushed a commit to branch master
in repository gnunet.
commit 2dfa93626e6ad1ff0a812372ede1c0e177650467
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Fri Nov 17 00:59:25 2023 +0100
MESSENGER: Uncrustify code
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
src/service/messenger/gnunet-service-messenger.c | 20 ++++---
.../messenger/gnunet-service-messenger_handle.c | 3 +-
.../messenger/gnunet-service-messenger_room.c | 2 +-
.../messenger/gnunet-service-messenger_service.c | 2 +-
src/service/messenger/messenger_api.c | 24 ++++----
.../messenger/messenger_api_contact_store.c | 2 +-
src/service/messenger/messenger_api_message.c | 66 +++++++++++-----------
7 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/src/service/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
index 2d10c60e2..b1521f4f8 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -140,8 +140,8 @@ handle_room_open (void *cls,
if (GNUNET_YES == open_srv_handle_room (msg_client->handle, &(msg->key)))
{
struct GNUNET_HashCode prev;
- sync_srv_handle_messages(msg_client->handle, &(msg->key), &(msg->previous),
- &prev);
+ sync_srv_handle_messages (msg_client->handle, &(msg->key),
&(msg->previous),
+ &prev);
const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id (
msg_client->handle, &(msg->key));
@@ -154,7 +154,7 @@ handle_room_open (void *cls,
env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
GNUNET_memcpy (&(response->key), &(msg->key), sizeof(response->key));
- GNUNET_memcpy(&(response->previous), &prev, sizeof(response->previous));
+ GNUNET_memcpy (&(response->previous), &prev, sizeof(response->previous));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
@@ -188,8 +188,8 @@ handle_room_entry (void *cls,
&(msg->key)))
{
struct GNUNET_HashCode prev;
- sync_srv_handle_messages(msg_client->handle, &(msg->key), &(msg->previous),
- &prev);
+ sync_srv_handle_messages (msg_client->handle, &(msg->key),
&(msg->previous),
+ &prev);
const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id (
msg_client->handle, &(msg->key));
@@ -203,7 +203,7 @@ handle_room_entry (void *cls,
env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
GNUNET_memcpy (&(response->door), &(msg->door), sizeof(response->door));
GNUNET_memcpy (&(response->key), &(msg->key), sizeof(response->key));
- GNUNET_memcpy(&(response->previous), &prev, sizeof(response->previous));
+ GNUNET_memcpy (&(response->previous), &prev, sizeof(response->previous));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
@@ -234,7 +234,8 @@ handle_room_close (void *cls,
env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
GNUNET_memcpy (&(response->key), &(msg->key), sizeof(response->key));
- GNUNET_memcpy (&(response->previous), &(msg->previous),
sizeof(response->previous));
+ GNUNET_memcpy (&(response->previous), &(msg->previous),
+ sizeof(response->previous));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
@@ -244,6 +245,7 @@ handle_room_close (void *cls,
GNUNET_SERVICE_client_continue (msg_client->client);
}
+
static void
handle_room_sync (void *cls,
const struct GNUNET_MESSENGER_RoomMessage *msg)
@@ -254,8 +256,8 @@ handle_room_sync (void *cls,
&(msg->key)));
struct GNUNET_HashCode prev;
- sync_srv_handle_messages(msg_client->handle, &(msg->key), &(msg->previous),
- &prev);
+ sync_srv_handle_messages (msg_client->handle, &(msg->key), &(msg->previous),
+ &prev);
struct GNUNET_MESSENGER_RoomMessage *response;
struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/messenger/gnunet-service-messenger_handle.c
b/src/service/messenger/gnunet-service-messenger_handle.c
index 5a50c9c22..4f15ad2f3 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -276,7 +276,8 @@ sync_srv_handle_messages (struct GNUNET_MESSENGER_SrvHandle
*handle,
{
GNUNET_assert ((handle) && (key) && (prev) && (hash));
- struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (handle->service,
key);
+ struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (handle->service,
+ key);
if ((! room) || (! get_srv_handle_member_id (handle, key)))
{
diff --git a/src/service/messenger/gnunet-service-messenger_room.c
b/src/service/messenger/gnunet-service-messenger_room.c
index 7a7c9262a..49e202a5a 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -254,7 +254,7 @@ join_room (struct GNUNET_MESSENGER_SrvRoom *room,
return GNUNET_NO;
enum GNUNET_GenericReturnValue reset;
- if ((!id) || (0 != GNUNET_memcmp(id, member_id)))
+ if ((! id) || (0 != GNUNET_memcmp (id, member_id)))
reset = GNUNET_YES;
else
reset = GNUNET_NO;
diff --git a/src/service/messenger/gnunet-service-messenger_service.c
b/src/service/messenger/gnunet-service-messenger_service.c
index 981223be5..964707112 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -263,7 +263,7 @@ find_member_session_in_room (void *cls,
"Initialitation: Matching member found (%s)!\n",
GNUNET_sh2s (id));
- change_srv_handle_member_id (init->handle, get_srv_room_key(init->room), id);
+ change_srv_handle_member_id (init->handle, get_srv_room_key (init->room),
id);
return GNUNET_NO;
}
diff --git a/src/service/messenger/messenger_api.c
b/src/service/messenger/messenger_api.c
index d7cca918a..216dc313c 100644
--- a/src/service/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
@@ -97,7 +97,7 @@ handle_room_open (void *cls,
if (! room)
return;
- GNUNET_memcpy(&(room->last_message), prev, sizeof(room->last_message));
+ GNUNET_memcpy (&(room->last_message), prev, sizeof(room->last_message));
dequeue_messages_from_room (room);
}
@@ -122,7 +122,7 @@ handle_room_entry (void *cls,
if (! room)
return;
- GNUNET_memcpy(&(room->last_message), prev, sizeof(room->last_message));
+ GNUNET_memcpy (&(room->last_message), prev, sizeof(room->last_message));
dequeue_messages_from_room (room);
}
@@ -140,7 +140,7 @@ handle_room_close (void *cls,
struct GNUNET_MESSENGER_Room *room = get_handle_room (handle, key);
if (room)
- GNUNET_memcpy(&(room->last_message), prev, sizeof(room->last_message));
+ GNUNET_memcpy (&(room->last_message), prev, sizeof(room->last_message));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Closed room: %s\n", GNUNET_h2s (key));
@@ -159,10 +159,10 @@ handle_room_sync (void *cls,
struct GNUNET_MESSENGER_Room *room = get_handle_room (handle, key);
- if (!room)
+ if (! room)
return;
- GNUNET_memcpy(&(room->last_message), prev, sizeof(room->last_message));
+ GNUNET_memcpy (&(room->last_message), prev, sizeof(room->last_message));
room->wait_for_sync = GNUNET_NO;
@@ -384,7 +384,8 @@ send_open_room (struct GNUNET_MESSENGER_Handle *handle,
env = GNUNET_MQ_msg_extra (msg, len > 0 ? len : 0,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
GNUNET_memcpy (&(msg->key), &(room->key), sizeof(msg->key));
- GNUNET_memcpy(&(msg->previous), &(room->last_message),
sizeof(msg->previous));
+ GNUNET_memcpy (&(msg->previous), &(room->last_message),
+ sizeof(msg->previous));
char *msg_buffer = ((char*) msg) + sizeof(*msg);
@@ -416,7 +417,8 @@ send_enter_room (struct GNUNET_MESSENGER_Handle *handle,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
GNUNET_memcpy (&(msg->door), door, sizeof(*door));
GNUNET_memcpy (&(msg->key), &(room->key), sizeof(msg->key));
- GNUNET_memcpy(&(msg->previous), &(room->last_message),
sizeof(msg->previous));
+ GNUNET_memcpy (&(msg->previous), &(room->last_message),
+ sizeof(msg->previous));
char *msg_buffer = ((char*) msg) + sizeof(*msg);
@@ -440,7 +442,8 @@ send_close_room (struct GNUNET_MESSENGER_Handle *handle,
env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
GNUNET_memcpy (&(msg->key), &(room->key), sizeof(msg->key));
- GNUNET_memcpy(&(msg->previous), &(room->last_message),
sizeof(msg->previous));
+ GNUNET_memcpy (&(msg->previous), &(room->last_message),
+ sizeof(msg->previous));
GNUNET_MQ_send (handle->mq, env);
}
@@ -461,7 +464,8 @@ send_sync_room (struct GNUNET_MESSENGER_Handle *handle,
env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SYNC);
GNUNET_memcpy (&(msg->key), &(room->key), sizeof(msg->key));
- GNUNET_memcpy(&(msg->previous), &(room->last_message),
sizeof(msg->previous));
+ GNUNET_memcpy (&(msg->previous), &(room->last_message),
+ sizeof(msg->previous));
GNUNET_MQ_send (handle->mq, env);
}
@@ -1034,7 +1038,7 @@ GNUNET_MESSENGER_contact_get_id (const struct
if (! contact)
return 0;
- return get_contact_id(contact);
+ return get_contact_id (contact);
}
diff --git a/src/service/messenger/messenger_api_contact_store.c
b/src/service/messenger/messenger_api_contact_store.c
index 60bd2974f..7583a8b07 100644
--- a/src/service/messenger/messenger_api_contact_store.c
+++ b/src/service/messenger/messenger_api_contact_store.c
@@ -128,7 +128,7 @@ get_store_contact (struct GNUNET_MESSENGER_ContactStore
*store,
if (0 != GNUNET_memcmp (pubkey, get_contact_key (contact)))
{
char *str = GNUNET_CRYPTO_public_key_to_string (get_contact_key (
- contact));
+ contact));
GNUNET_log (GNUNET_ERROR_TYPE_INVALID,
"Contact in store uses wrong key: %s\n", str);
GNUNET_free (str);
diff --git a/src/service/messenger/messenger_api_message.c
b/src/service/messenger/messenger_api_message.c
index f77d171f6..3ccbbd378 100644
--- a/src/service/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
@@ -390,32 +390,32 @@ calc_padded_length (uint16_t length)
#define min(x, y) (x < y? x : y)
#define encode_step_ext(dst, offset, src, size) do { \
- GNUNET_memcpy (dst + offset, src, size); \
- offset += size; \
+ GNUNET_memcpy (dst + offset, src, size); \
+ offset += size; \
} while (0)
#define encode_step(dst, offset, src) do { \
- encode_step_ext (dst, offset, src, sizeof(*src)); \
+ encode_step_ext (dst, offset, src, sizeof(*src)); \
} while (0)
#define encode_step_key(dst, offset, src, length) do { \
- ssize_t result = GNUNET_CRYPTO_write_public_key_to_buffer ( \
- src, dst + offset, length - offset \
- ); \
- if (result < 0) \
- GNUNET_break (0); \
- else \
- offset += result; \
+ ssize_t result = GNUNET_CRYPTO_write_public_key_to_buffer ( \
+ src, dst + offset, length - offset \
+ ); \
+ if (result < 0) \
+ GNUNET_break (0); \
+ else \
+ offset += result; \
} while (0)
#define encode_step_signature(dst, offset, src, length) do { \
- ssize_t result = GNUNET_CRYPTO_write_signature_to_buffer ( \
- src, dst + offset, length - offset \
- ); \
- if (result < 0) \
- GNUNET_break (0); \
- else \
- offset += result; \
+ ssize_t result = GNUNET_CRYPTO_write_signature_to_buffer ( \
+ src, dst + offset, length - offset \
+ ); \
+ if (result < 0) \
+ GNUNET_break (0); \
+ else \
+ offset += result; \
} while (0)
static void
@@ -564,30 +564,30 @@ encode_short_message (const struct
GNUNET_MESSENGER_ShortMessage *message,
#define decode_step_ext(src, offset, dst, size) do { \
- GNUNET_memcpy (dst, src + offset, size); \
- offset += size; \
+ GNUNET_memcpy (dst, src + offset, size); \
+ offset += size; \
} while (0)
#define decode_step(src, offset, dst) do { \
- decode_step_ext (src, offset, dst, sizeof(*dst)); \
+ decode_step_ext (src, offset, dst, sizeof(*dst)); \
} while (0)
#define decode_step_malloc(src, offset, dst, size, zero) do { \
- dst = GNUNET_malloc (size + zero); \
- if (zero) dst[size] = 0; \
- decode_step_ext (src, offset, dst, size); \
+ dst = GNUNET_malloc (size + zero); \
+ if (zero) dst[size] = 0; \
+ decode_step_ext (src, offset, dst, size); \
} while (0)
#define decode_step_key(src, offset, dst, length) do { \
- enum GNUNET_GenericReturnValue result; \
- size_t read; \
- result = GNUNET_CRYPTO_read_public_key_from_buffer ( \
- src + offset, length - offset, dst, &read \
- ); \
- if (GNUNET_SYSERR == result) \
- GNUNET_break (0); \
- else \
- offset += read; \
+ enum GNUNET_GenericReturnValue result; \
+ size_t read; \
+ result = GNUNET_CRYPTO_read_public_key_from_buffer ( \
+ src + offset, length - offset, dst, &read \
+ ); \
+ if (GNUNET_SYSERR == result) \
+ GNUNET_break (0); \
+ else \
+ offset += read; \
} while (0)
static uint16_t
@@ -698,7 +698,7 @@ decode_message (struct GNUNET_MESSENGER_Message *message,
{
ssize_t result = GNUNET_CRYPTO_read_signature_from_buffer (
&(message->header.signature), buffer, length - offset
- );
+ );
if (result < 0)
return GNUNET_NO;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.