diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-04-22 08:35:07 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-04-22 08:45:00 +0200 |
commit | 2e3d6ed40e874b68889d0a10286833c06f6983ed (patch) | |
tree | dc1c61da6d05358748602e0d4b6983f01ac7f1e9 /src/libmdsserver | |
parent | add marshaling for linked-list (diff) | |
download | mds-2e3d6ed40e874b68889d0a10286833c06f6983ed.tar.gz mds-2e3d6ed40e874b68889d0a10286833c06f6983ed.tar.bz2 mds-2e3d6ed40e874b68889d0a10286833c06f6983ed.tar.xz |
m
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/libmdsserver')
-rw-r--r-- | src/libmdsserver/linked-list.c | 20 | ||||
-rw-r--r-- | src/libmdsserver/linked-list.h | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/libmdsserver/linked-list.c b/src/libmdsserver/linked-list.c index a6c44cd..4cc70b6 100644 --- a/src/libmdsserver/linked-list.c +++ b/src/libmdsserver/linked-list.c @@ -58,7 +58,7 @@ static size_t to_power_of_two(size_t value) * @param capacity The minimum initial capacity of the linked list, 0 for default * @return Non-zero on error, `errno` will have been set accordingly */ -int linked_list_create(linked_list_t* this, size_t capacity) +int linked_list_create(linked_list_t* restrict this, size_t capacity) { /* Use default capacity of zero is specified. */ if (capacity == 0) @@ -96,7 +96,7 @@ int linked_list_create(linked_list_t* this, size_t capacity) * * @param this The linked list */ -void linked_list_destroy(linked_list_t* this) +void linked_list_destroy(linked_list_t* restrict this) { if (this->reusable != NULL) free(this->reusable); if (this->values != NULL) free(this->values); @@ -184,7 +184,7 @@ int linked_list_clone(const linked_list_t* restrict this, linked_list_t* restric * @param this The list * @return Non-zero on error, `errno` will have been set accordingly */ -int linked_list_pack(linked_list_t* this) +int linked_list_pack(linked_list_t* restrict this) { size_t size = this->end - this->reuse_head; size_t cap = to_power_of_two(size); @@ -267,7 +267,7 @@ int linked_list_pack(linked_list_t* this) * @return The next free position, * `LINKED_LIST_UNUSED` on error, `errno` will be set accordingly */ -static ssize_t linked_list_get_next(linked_list_t* this) +static ssize_t linked_list_get_next(linked_list_t* restrict this) { if (this->reuse_head > 0) return this->reusable[--(this->reuse_head)]; @@ -304,7 +304,7 @@ static ssize_t linked_list_get_next(linked_list_t* this) * @param node The position * @return The position */ -static ssize_t linked_list_unuse(linked_list_t* this, ssize_t node) +static ssize_t linked_list_unuse(linked_list_t* restrict this, ssize_t node) { if (node < 0) return node; @@ -345,7 +345,7 @@ ssize_t linked_list_insert_after(linked_list_t* this, size_t value, ssize_t pred * @param predecessor The reference node * @return The node that has been removed */ -ssize_t linked_list_remove_after(linked_list_t* this, ssize_t predecessor) +ssize_t linked_list_remove_after(linked_list_t* restrict this, ssize_t predecessor) { ssize_t node = this->next[predecessor]; this->next[predecessor] = this->next[node]; @@ -363,7 +363,7 @@ ssize_t linked_list_remove_after(linked_list_t* this, ssize_t predecessor) * @return The node that has been created and inserted, * `LINKED_LIST_UNUSED` on error, `errno` will be set accordingly */ -ssize_t linked_list_insert_before(linked_list_t* this, size_t value, ssize_t successor) +ssize_t linked_list_insert_before(linked_list_t* restrict this, size_t value, ssize_t successor) { ssize_t node = linked_list_get_next(this); if (node == LINKED_LIST_UNUSED) @@ -384,7 +384,7 @@ ssize_t linked_list_insert_before(linked_list_t* this, size_t value, ssize_t suc * @param successor The reference node * @return The node that has been removed */ -ssize_t linked_list_remove_before(linked_list_t* this, ssize_t successor) +ssize_t linked_list_remove_before(linked_list_t* restrict this, ssize_t successor) { ssize_t node = this->previous[successor]; this->previous[successor] = this->previous[node]; @@ -399,7 +399,7 @@ ssize_t linked_list_remove_before(linked_list_t* this, ssize_t successor) * @param this The list * @param node The node to remove */ -void linked_list_remove(linked_list_t* this, ssize_t node) +void linked_list_remove(linked_list_t* restrict this, ssize_t node) { this->next[this->previous[node]] = this->next[node]; this->previous[this->next[node]] = this->previous[node]; @@ -413,7 +413,7 @@ void linked_list_remove(linked_list_t* this, ssize_t node) * @param this The list * @return The number of bytes to allocate to the output buffer */ -size_t linked_list_marshal_size(const linked_list_t* this) +size_t linked_list_marshal_size(const linked_list_t* restrict this) { return sizeof(size_t) * (4 + this->reuse_head + 3 * this->end); } diff --git a/src/libmdsserver/linked-list.h b/src/libmdsserver/linked-list.h index aac6799..3427fa6 100644 --- a/src/libmdsserver/linked-list.h +++ b/src/libmdsserver/linked-list.h @@ -115,7 +115,7 @@ typedef struct linked_list * @param capacity The minimum initial capacity of the linked list, 0 for default * @return Non-zero on error, `errno` will have been set accordingly */ -int linked_list_create(linked_list_t* this, size_t capacity); +int linked_list_create(linked_list_t* restrict this, size_t capacity); /** * Release all resources in a linked list, should @@ -123,7 +123,7 @@ int linked_list_create(linked_list_t* this, size_t capacity); * * @param this The linked list */ -void linked_list_destroy(linked_list_t* this); +void linked_list_destroy(linked_list_t* restrict this); /** * Clone a linked list @@ -148,7 +148,7 @@ int linked_list_clone(const linked_list_t* restrict this, linked_list_t* restric * @param this The list * @return Non-zero on error, `errno` will have been set accordingly */ -int linked_list_pack(linked_list_t* this); +int linked_list_pack(linked_list_t* restrict this); /** * Insert a value in the beginning of the list @@ -179,7 +179,7 @@ int linked_list_pack(linked_list_t* this); * @return The node that has been created and inserted, * `LINKED_LIST_UNUSED` on error, `errno` will be set accordingly */ -ssize_t linked_list_insert_after(linked_list_t* this, size_t value, ssize_t predecessor); +ssize_t linked_list_insert_after(linked_list_t* restrict this, size_t value, ssize_t predecessor); /** * Remove the node after a specified, reference, node @@ -188,7 +188,7 @@ ssize_t linked_list_insert_after(linked_list_t* this, size_t value, ssize_t pred * @param predecessor The reference node * @return The node that has been removed */ -ssize_t linked_list_remove_after(linked_list_t* this, ssize_t predecessor); +ssize_t linked_list_remove_after(linked_list_t* restrict this, ssize_t predecessor); /** * Insert a value before a specified, reference, node @@ -199,7 +199,7 @@ ssize_t linked_list_remove_after(linked_list_t* this, ssize_t predecessor); * @return The node that has been created and inserted, * `LINKED_LIST_UNUSED` on error, `errno` will be set accordingly */ -ssize_t linked_list_insert_before(linked_list_t* this, size_t value, ssize_t successor); +ssize_t linked_list_insert_before(linked_list_t* restrict this, size_t value, ssize_t successor); /** * Remove the node before a specified, reference, node @@ -208,7 +208,7 @@ ssize_t linked_list_insert_before(linked_list_t* this, size_t value, ssize_t suc * @param successor The reference node * @return The node that has been removed */ -ssize_t linked_list_remove_before(linked_list_t* this, ssize_t successor); +ssize_t linked_list_remove_before(linked_list_t* restrict this, ssize_t successor); /** * Remove the node from the list @@ -216,7 +216,7 @@ ssize_t linked_list_remove_before(linked_list_t* this, ssize_t successor); * @param this The list * @param node The node to remove */ -void linked_list_remove(linked_list_t* this, ssize_t node); +void linked_list_remove(linked_list_t* restrict this, ssize_t node); /** * Insert a value in the end of the list @@ -244,7 +244,7 @@ void linked_list_remove(linked_list_t* this, ssize_t node); * @param this The list * @return The number of bytes to allocate to the output buffer */ -size_t linked_list_marshal_size(const linked_list_t* this) __attribute__((pure)); +size_t linked_list_marshal_size(const linked_list_t* restrict this) __attribute__((pure)); /** * Marshals a linked list |