diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2021-09-27 11:02:56 +0200 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2021-09-27 11:02:56 +0200 |
commit | 7ecc3a03a0670a1620c603502c9958b95e6dc1d0 (patch) | |
tree | 69d76fd05cbf0facae18b99b526c16426bf9b1c6 /src/messenger/gnunet-service-messenger_member.c | |
parent | 1fef34e55a00816bdb237e87ff14d54e6575f763 (diff) | |
download | gnunet-7ecc3a03a0670a1620c603502c9958b95e6dc1d0.tar.gz gnunet-7ecc3a03a0670a1620c603502c9958b95e6dc1d0.zip |
-indentation of parameters
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'src/messenger/gnunet-service-messenger_member.c')
-rw-r--r-- | src/messenger/gnunet-service-messenger_member.c | 61 |
1 files changed, 43 insertions, 18 deletions
diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/messenger/gnunet-service-messenger_member.c index b0a735dbe..def57aef9 100644 --- a/src/messenger/gnunet-service-messenger_member.c +++ b/src/messenger/gnunet-service-messenger_member.c | |||
@@ -28,7 +28,8 @@ | |||
28 | #include "gnunet-service-messenger_member_session.h" | 28 | #include "gnunet-service-messenger_member_session.h" |
29 | 29 | ||
30 | struct GNUNET_MESSENGER_Member* | 30 | struct GNUNET_MESSENGER_Member* |
31 | create_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id) | 31 | create_member (struct GNUNET_MESSENGER_MemberStore *store, |
32 | const struct GNUNET_ShortHashCode *id) | ||
32 | { | 33 | { |
33 | GNUNET_assert (store); | 34 | GNUNET_assert (store); |
34 | 35 | ||
@@ -50,7 +51,9 @@ create_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_S | |||
50 | } | 51 | } |
51 | 52 | ||
52 | static int | 53 | static int |
53 | iterate_destroy_session (void *cls, const struct GNUNET_HashCode *key, void *value) | 54 | iterate_destroy_session (void *cls, |
55 | const struct GNUNET_HashCode *key, | ||
56 | void *value) | ||
54 | { | 57 | { |
55 | struct GNUNET_MESSENGER_MemberSession *session = value; | 58 | struct GNUNET_MESSENGER_MemberSession *session = value; |
56 | destroy_member_session(session); | 59 | destroy_member_session(session); |
@@ -77,7 +80,8 @@ get_member_id (const struct GNUNET_MESSENGER_Member *member) | |||
77 | } | 80 | } |
78 | 81 | ||
79 | static int | 82 | static int |
80 | callback_scan_for_sessions (void *cls, const char *filename) | 83 | callback_scan_for_sessions (void *cls, |
84 | const char *filename) | ||
81 | { | 85 | { |
82 | struct GNUNET_MESSENGER_Member *member = cls; | 86 | struct GNUNET_MESSENGER_Member *member = cls; |
83 | 87 | ||
@@ -95,7 +99,8 @@ callback_scan_for_sessions (void *cls, const char *filename) | |||
95 | } | 99 | } |
96 | 100 | ||
97 | void | 101 | void |
98 | load_member (struct GNUNET_MESSENGER_MemberStore *store, const char *directory) | 102 | load_member (struct GNUNET_MESSENGER_MemberStore *store, |
103 | const char *directory) | ||
99 | { | 104 | { |
100 | GNUNET_assert ((store) && (directory)); | 105 | GNUNET_assert ((store) && (directory)); |
101 | 106 | ||
@@ -139,7 +144,9 @@ free_config: | |||
139 | } | 144 | } |
140 | 145 | ||
141 | static int | 146 | static int |
142 | iterate_load_next_session (void *cls, const struct GNUNET_HashCode *key, void *value) | 147 | iterate_load_next_session (void *cls, |
148 | const struct GNUNET_HashCode *key, | ||
149 | void *value) | ||
143 | { | 150 | { |
144 | const char* sessions_directory = cls; | 151 | const char* sessions_directory = cls; |
145 | 152 | ||
@@ -156,7 +163,8 @@ iterate_load_next_session (void *cls, const struct GNUNET_HashCode *key, void *v | |||
156 | } | 163 | } |
157 | 164 | ||
158 | void | 165 | void |
159 | load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member, const char *directory) | 166 | load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member, |
167 | const char *directory) | ||
160 | { | 168 | { |
161 | GNUNET_assert ((member) && (directory)); | 169 | GNUNET_assert ((member) && (directory)); |
162 | 170 | ||
@@ -169,7 +177,9 @@ load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member, const c | |||
169 | } | 177 | } |
170 | 178 | ||
171 | static int | 179 | static int |
172 | iterate_save_session (void *cls, const struct GNUNET_HashCode *key, void *value) | 180 | iterate_save_session (void *cls, |
181 | const struct GNUNET_HashCode *key, | ||
182 | void *value) | ||
173 | { | 183 | { |
174 | const char* sessions_directory = cls; | 184 | const char* sessions_directory = cls; |
175 | 185 | ||
@@ -187,7 +197,8 @@ iterate_save_session (void *cls, const struct GNUNET_HashCode *key, void *value) | |||
187 | } | 197 | } |
188 | 198 | ||
189 | void | 199 | void |
190 | save_member (struct GNUNET_MESSENGER_Member *member, const char *directory) | 200 | save_member (struct GNUNET_MESSENGER_Member *member, |
201 | const char *directory) | ||
191 | { | 202 | { |
192 | GNUNET_assert ((member) && (directory)); | 203 | GNUNET_assert ((member) && (directory)); |
193 | 204 | ||
@@ -221,7 +232,8 @@ save_member (struct GNUNET_MESSENGER_Member *member, const char *directory) | |||
221 | } | 232 | } |
222 | 233 | ||
223 | static void | 234 | static void |
224 | sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session, struct GNUNET_MESSENGER_MemberSession *next) | 235 | sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session, |
236 | struct GNUNET_MESSENGER_MemberSession *next) | ||
225 | { | 237 | { |
226 | GNUNET_assert((session) && (next)); | 238 | GNUNET_assert((session) && (next)); |
227 | 239 | ||
@@ -235,7 +247,9 @@ sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session, | |||
235 | } | 247 | } |
236 | 248 | ||
237 | static int | 249 | static int |
238 | iterate_sync_session_contact (void *cls, const struct GNUNET_HashCode *key, void *value) | 250 | iterate_sync_session_contact (void *cls, |
251 | const struct GNUNET_HashCode *key, | ||
252 | void *value) | ||
239 | { | 253 | { |
240 | struct GNUNET_MESSENGER_MemberSession *session = value; | 254 | struct GNUNET_MESSENGER_MemberSession *session = value; |
241 | 255 | ||
@@ -254,7 +268,8 @@ sync_member_contacts (struct GNUNET_MESSENGER_Member *member) | |||
254 | } | 268 | } |
255 | 269 | ||
256 | struct GNUNET_MESSENGER_MemberSession* | 270 | struct GNUNET_MESSENGER_MemberSession* |
257 | get_member_session (const struct GNUNET_MESSENGER_Member *member, const struct GNUNET_IDENTITY_PublicKey *public_key) | 271 | get_member_session (const struct GNUNET_MESSENGER_Member *member, |
272 | const struct GNUNET_IDENTITY_PublicKey *public_key) | ||
258 | { | 273 | { |
259 | GNUNET_assert ((member) && (public_key)); | 274 | GNUNET_assert ((member) && (public_key)); |
260 | 275 | ||
@@ -272,7 +287,9 @@ struct GNUNET_MESSENGER_ClosureSearchSession { | |||
272 | }; | 287 | }; |
273 | 288 | ||
274 | static int | 289 | static int |
275 | iterate_search_session (void *cls, const struct GNUNET_HashCode *key, void *value) | 290 | iterate_search_session (void *cls, |
291 | const struct GNUNET_HashCode *key, | ||
292 | void *value) | ||
276 | { | 293 | { |
277 | struct GNUNET_MESSENGER_ClosureSearchSession* search = cls; | 294 | struct GNUNET_MESSENGER_ClosureSearchSession* search = cls; |
278 | struct GNUNET_MESSENGER_MemberSession *session = value; | 295 | struct GNUNET_MESSENGER_MemberSession *session = value; |
@@ -285,7 +302,8 @@ iterate_search_session (void *cls, const struct GNUNET_HashCode *key, void *valu | |||
285 | } | 302 | } |
286 | 303 | ||
287 | static struct GNUNET_MESSENGER_MemberSession* | 304 | static struct GNUNET_MESSENGER_MemberSession* |
288 | try_member_session (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_IDENTITY_PublicKey *public_key) | 305 | try_member_session (struct GNUNET_MESSENGER_Member *member, |
306 | const struct GNUNET_IDENTITY_PublicKey *public_key) | ||
289 | { | 307 | { |
290 | struct GNUNET_MESSENGER_MemberSession* session = get_member_session(member, public_key); | 308 | struct GNUNET_MESSENGER_MemberSession* session = get_member_session(member, public_key); |
291 | 309 | ||
@@ -301,7 +319,8 @@ try_member_session (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_ | |||
301 | } | 319 | } |
302 | 320 | ||
303 | struct GNUNET_MESSENGER_MemberSession* | 321 | struct GNUNET_MESSENGER_MemberSession* |
304 | get_member_session_of (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_MESSENGER_Message *message, | 322 | get_member_session_of (struct GNUNET_MESSENGER_Member *member, |
323 | const struct GNUNET_MESSENGER_Message *message, | ||
305 | const struct GNUNET_HashCode *hash) | 324 | const struct GNUNET_HashCode *hash) |
306 | { | 325 | { |
307 | GNUNET_assert ((member) && (message) && (hash) && | 326 | GNUNET_assert ((member) && (message) && (hash) && |
@@ -324,7 +343,8 @@ get_member_session_of (struct GNUNET_MESSENGER_Member *member, const struct GNUN | |||
324 | } | 343 | } |
325 | 344 | ||
326 | void | 345 | void |
327 | add_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session) | 346 | add_member_session (struct GNUNET_MESSENGER_Member *member, |
347 | struct GNUNET_MESSENGER_MemberSession *session) | ||
328 | { | 348 | { |
329 | if (!session) | 349 | if (!session) |
330 | return; | 350 | return; |
@@ -344,7 +364,8 @@ add_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSEN | |||
344 | } | 364 | } |
345 | 365 | ||
346 | void | 366 | void |
347 | remove_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session) | 367 | remove_member_session (struct GNUNET_MESSENGER_Member *member, |
368 | struct GNUNET_MESSENGER_MemberSession *session) | ||
348 | { | 369 | { |
349 | GNUNET_assert ((member) && (session) && (session->member == member)); | 370 | GNUNET_assert ((member) && (session) && (session->member == member)); |
350 | 371 | ||
@@ -364,7 +385,9 @@ struct GNUNET_MESSENGER_ClosureIterateSessions { | |||
364 | }; | 385 | }; |
365 | 386 | ||
366 | static int | 387 | static int |
367 | iterate_member_sessions_it (void *cls, const struct GNUNET_HashCode *key, void *value) | 388 | iterate_member_sessions_it (void *cls, |
389 | const struct GNUNET_HashCode *key, | ||
390 | void *value) | ||
368 | { | 391 | { |
369 | struct GNUNET_MESSENGER_ClosureIterateSessions *iterate = cls; | 392 | struct GNUNET_MESSENGER_ClosureIterateSessions *iterate = cls; |
370 | struct GNUNET_MESSENGER_MemberSession *session = value; | 393 | struct GNUNET_MESSENGER_MemberSession *session = value; |
@@ -373,7 +396,9 @@ iterate_member_sessions_it (void *cls, const struct GNUNET_HashCode *key, void * | |||
373 | } | 396 | } |
374 | 397 | ||
375 | int | 398 | int |
376 | iterate_member_sessions (struct GNUNET_MESSENGER_Member *member, GNUNET_MESSENGER_MemberIteratorCallback it, void *cls) | 399 | iterate_member_sessions (struct GNUNET_MESSENGER_Member *member, |
400 | GNUNET_MESSENGER_MemberIteratorCallback it, | ||
401 | void *cls) | ||
377 | { | 402 | { |
378 | GNUNET_assert ((member) && (member->sessions) && (it)); | 403 | GNUNET_assert ((member) && (member->sessions) && (it)); |
379 | 404 | ||