diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-05-12 08:04:28 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-05-12 08:04:28 +0000 |
commit | f39f235ce3102fc959162e5d6a58ef3f03ed4101 (patch) | |
tree | 97669168e23943f60700f6232bc139d6daa96daf /src/lockmanager | |
parent | d1d7127ac7e78328dd108514652f6f2fd179c8fa (diff) | |
download | gnunet-f39f235ce3102fc959162e5d6a58ef3f03ed4101.tar.gz gnunet-f39f235ce3102fc959162e5d6a58ef3f03ed4101.zip |
-reverted to 21440
Diffstat (limited to 'src/lockmanager')
-rw-r--r-- | src/lockmanager/gnunet-service-lockmanager.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lockmanager/gnunet-service-lockmanager.c b/src/lockmanager/gnunet-service-lockmanager.c index b4abf6b88..3642ca030 100644 --- a/src/lockmanager/gnunet-service-lockmanager.c +++ b/src/lockmanager/gnunet-service-lockmanager.c | |||
@@ -181,7 +181,7 @@ static struct ClientList *cl_tail; | |||
181 | * @param lock_number | 181 | * @param lock_number |
182 | * @param key set to the key | 182 | * @param key set to the key |
183 | */ | 183 | */ |
184 | static inline void | 184 | static void |
185 | get_key (const char *domain_name, | 185 | get_key (const char *domain_name, |
186 | uint32_t lock_number, | 186 | uint32_t lock_number, |
187 | struct GNUNET_HashCode *key) | 187 | struct GNUNET_HashCode *key) |
@@ -203,7 +203,7 @@ get_key (const char *domain_name, | |||
203 | * @param lock_num the number of the lock | 203 | * @param lock_num the number of the lock |
204 | * @return the lock if found; NULL if not | 204 | * @return the lock if found; NULL if not |
205 | */ | 205 | */ |
206 | static inline struct Lock * | 206 | static struct Lock * |
207 | find_lock (const char *domain_name, | 207 | find_lock (const char *domain_name, |
208 | const uint32_t lock_num) | 208 | const uint32_t lock_num) |
209 | 209 | ||
@@ -240,7 +240,7 @@ find_lock (const char *domain_name, | |||
240 | * @param lock_num the lock number | 240 | * @param lock_num the lock number |
241 | * @return pointer to the lock structure which is added to lock map | 241 | * @return pointer to the lock structure which is added to lock map |
242 | */ | 242 | */ |
243 | static inline struct Lock * | 243 | static struct Lock * |
244 | add_lock (const char *domain_name, | 244 | add_lock (const char *domain_name, |
245 | uint32_t lock_num) | 245 | uint32_t lock_num) |
246 | { | 246 | { |
@@ -270,7 +270,7 @@ add_lock (const char *domain_name, | |||
270 | * | 270 | * |
271 | * @param lock the lock to remove | 271 | * @param lock the lock to remove |
272 | */ | 272 | */ |
273 | static inline void | 273 | static void |
274 | remove_lock (struct Lock *lock) | 274 | remove_lock (struct Lock *lock) |
275 | { | 275 | { |
276 | struct GNUNET_HashCode key; | 276 | struct GNUNET_HashCode key; |
@@ -296,7 +296,7 @@ remove_lock (struct Lock *lock) | |||
296 | * @param lock the lock which has to be matched | 296 | * @param lock the lock which has to be matched |
297 | * @return the matching LockList entry; NULL if no match is found | 297 | * @return the matching LockList entry; NULL if no match is found |
298 | */ | 298 | */ |
299 | static inline struct LockList * | 299 | static struct LockList * |
300 | cl_ll_find_lock (struct ClientList *cl_entry, | 300 | cl_ll_find_lock (struct ClientList *cl_entry, |
301 | const struct Lock *lock) | 301 | const struct Lock *lock) |
302 | { | 302 | { |
@@ -318,7 +318,7 @@ cl_ll_find_lock (struct ClientList *cl_entry, | |||
318 | * @param cl_entry the client which currently owns this lock | 318 | * @param cl_entry the client which currently owns this lock |
319 | * @param lock the lock to be added to the cl_entry's lock list | 319 | * @param lock the lock to be added to the cl_entry's lock list |
320 | */ | 320 | */ |
321 | static inline void | 321 | static void |
322 | cl_ll_add_lock (struct ClientList *cl_entry, | 322 | cl_ll_add_lock (struct ClientList *cl_entry, |
323 | struct Lock *lock) | 323 | struct Lock *lock) |
324 | { | 324 | { |
@@ -341,7 +341,7 @@ cl_ll_add_lock (struct ClientList *cl_entry, | |||
341 | * @param cl_entry the ClientList entry | 341 | * @param cl_entry the ClientList entry |
342 | * @param ll_entry the LockList entry to be deleted | 342 | * @param ll_entry the LockList entry to be deleted |
343 | */ | 343 | */ |
344 | static inline void | 344 | static void |
345 | cl_ll_remove_lock (struct ClientList *cl_entry, | 345 | cl_ll_remove_lock (struct ClientList *cl_entry, |
346 | struct LockList *ll_entry) | 346 | struct LockList *ll_entry) |
347 | { | 347 | { |
@@ -365,7 +365,7 @@ cl_ll_remove_lock (struct ClientList *cl_entry, | |||
365 | * @return the WaitList entry matching the given cl_entry; NULL if not match | 365 | * @return the WaitList entry matching the given cl_entry; NULL if not match |
366 | * was found | 366 | * was found |
367 | */ | 367 | */ |
368 | static inline struct WaitList * | 368 | static struct WaitList * |
369 | lock_wl_find (const struct Lock *lock, | 369 | lock_wl_find (const struct Lock *lock, |
370 | const struct ClientList *cl_entry) | 370 | const struct ClientList *cl_entry) |
371 | { | 371 | { |
@@ -388,7 +388,7 @@ lock_wl_find (const struct Lock *lock, | |||
388 | * @param lock the lock list entry of a lock | 388 | * @param lock the lock list entry of a lock |
389 | * @param cl_entry the client to queue for the lock's wait list | 389 | * @param cl_entry the client to queue for the lock's wait list |
390 | */ | 390 | */ |
391 | static inline void | 391 | static void |
392 | lock_wl_add_client (struct Lock *lock, | 392 | lock_wl_add_client (struct Lock *lock, |
393 | struct ClientList *cl_entry) | 393 | struct ClientList *cl_entry) |
394 | { | 394 | { |
@@ -412,7 +412,7 @@ lock_wl_add_client (struct Lock *lock, | |||
412 | * @param lock the lock | 412 | * @param lock the lock |
413 | * @param wl_entry the wait list entry to be removed | 413 | * @param wl_entry the wait list entry to be removed |
414 | */ | 414 | */ |
415 | static inline void | 415 | static void |
416 | lock_wl_remove (struct Lock *lock, | 416 | lock_wl_remove (struct Lock *lock, |
417 | struct WaitList *wl_entry) | 417 | struct WaitList *wl_entry) |
418 | { | 418 | { |
@@ -432,7 +432,7 @@ lock_wl_remove (struct Lock *lock, | |||
432 | * @param client the client to be searched for | 432 | * @param client the client to be searched for |
433 | * @return the ClientList entry; NULL if the client is not found | 433 | * @return the ClientList entry; NULL if the client is not found |
434 | */ | 434 | */ |
435 | static inline struct ClientList * | 435 | static struct ClientList * |
436 | cl_find_client (const struct GNUNET_SERVER_Client *client) | 436 | cl_find_client (const struct GNUNET_SERVER_Client *client) |
437 | { | 437 | { |
438 | struct ClientList *current; | 438 | struct ClientList *current; |
@@ -450,7 +450,7 @@ cl_find_client (const struct GNUNET_SERVER_Client *client) | |||
450 | * @param client the client to be appended to the list | 450 | * @param client the client to be appended to the list |
451 | * @return the client list entry which is added to the client list | 451 | * @return the client list entry which is added to the client list |
452 | */ | 452 | */ |
453 | static inline struct ClientList * | 453 | static struct ClientList * |
454 | cl_add_client (struct GNUNET_SERVER_Client *client) | 454 | cl_add_client (struct GNUNET_SERVER_Client *client) |
455 | { | 455 | { |
456 | struct ClientList *new_client; | 456 | struct ClientList *new_client; |
@@ -472,7 +472,7 @@ cl_add_client (struct GNUNET_SERVER_Client *client) | |||
472 | * | 472 | * |
473 | * @param cl_entry the client list entry to delete | 473 | * @param cl_entry the client list entry to delete |
474 | */ | 474 | */ |
475 | static inline void | 475 | static void |
476 | cl_remove_client (struct ClientList *cl_entry) | 476 | cl_remove_client (struct ClientList *cl_entry) |
477 | { | 477 | { |
478 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 478 | LOG (GNUNET_ERROR_TYPE_DEBUG, |