mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added sway_asserts.

Browse source
This commit is contained in:
Scott Anderson 2017-05-10 12:53:48 +12:00
parent 464bc5ff8e
commit 4e27b1e726
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
common/list.c
View file

@ -1,4 +1,5 @@
#include "list.h" #include "list.h"
#include "log.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
@ -52,7 +53,7 @@ static bool resize(list_t *list) {
} }
void list_add(list_t *list, const void *data) { void list_add(list_t *list, const void *data) {
if (!data || !list || !resize(list)) { if (!sway_assert(list && data, "Invalid argument") || !resize(list)) {
return; return;
} }
@ -64,7 +65,9 @@ void list_add(list_t *list, const void *data) {
} }
void list_insert(list_t *list, size_t index, const void *data) { void list_insert(list_t *list, size_t index, const void *data) {
if (!data || !list || index > list->length || !resize(list)) { if (!sway_assert(list && data && index <= list->length, "Invalid argument") ||
!resize(list)) {
return; return;
} }
@ -76,7 +79,7 @@ void list_insert(list_t *list, size_t index, const void *data) {
} }
void list_delete(list_t *list, size_t index) { void list_delete(list_t *list, size_t index) {
if (!list || index >= list->length) { if (!sway_assert(list && index < list->length, "Invalid argument")) {
return; return;
} }
@ -88,7 +91,7 @@ void list_delete(list_t *list, size_t index) {
} }
void list_swap(list_t *list, size_t i1, size_t i2) { void list_swap(list_t *list, size_t i1, size_t i2) {
if (!list || i1 >= list->length || i2 >= list->length) { if (!sway_assert(list && i1 < list->length && i2 < list->length, "Invalid argument")) {
return; return;
} }
@ -102,7 +105,7 @@ void list_swap(list_t *list, size_t i1, size_t i2) {
} }
void *list_get(list_t *list, size_t index) { void *list_get(list_t *list, size_t index) {
if (!list || index >= list->length) { if (!sway_assert(list && index < list->length, "Invalid argument")) {
return NULL; return NULL;
} }
@ -113,7 +116,7 @@ void *list_get(list_t *list, size_t index) {
} }
void list_qsort(list_t *list, int compare(const void *, const void *)) { void list_qsort(list_t *list, int compare(const void *, const void *)) {
if (!list || !compare) { if (!sway_assert(list && compare, "Invalid argument")) {
return; return;
} }
@ -121,7 +124,7 @@ void list_qsort(list_t *list, int compare(const void *, const void *)) {
} }
void list_isort(list_t *list, int compare(const void *, const void *)) { void list_isort(list_t *list, int compare(const void *, const void *)) {
if (!list || !compare) { if (!sway_assert(list && compare, "Invalid argument")) {
return; return;
} }
@ -144,7 +147,8 @@ void list_isort(list_t *list, int compare(const void *, const void *)) {
ssize_t list_bsearch(const list_t *list, int compare(const void *, const void *), ssize_t list_bsearch(const list_t *list, int compare(const void *, const void *),
const void *key, void *ret) { const void *key, void *ret) {
if (!list || !compare || !key) {
if (!sway_assert(list && compare && key, "Invalid argument")) {
return -1; return -1;
} }
@ -161,7 +165,8 @@ ssize_t list_bsearch(const list_t *list, int compare(const void *, const void *)
ssize_t list_lsearch(const list_t *list, int compare(const void *, const void *), ssize_t list_lsearch(const list_t *list, int compare(const void *, const void *),
const void *key, void *ret) { const void *key, void *ret) {
if (!list || !compare || !key) {
if (!sway_assert(list && compare && key, "Invalid argument")) {
return -1; return -1;
} }
@ -181,7 +186,7 @@ ssize_t list_lsearch(const list_t *list, int compare(const void *, const void *)
} }
void list_foreach(list_t *list, void callback(void *)) { void list_foreach(list_t *list, void callback(void *)) {
if (!list || !callback) { if (!sway_assert(list && callback, "Invalid argument")) {
return; return;
} }
@ -194,7 +199,7 @@ void list_foreach(list_t *list, void callback(void *)) {
} }
void *list_end(list_t *list) { void *list_end(list_t *list) {
if (!list) { if (!sway_assert(list, "Invalid argument")) {
return NULL; return NULL;
} }

2
include/list.h
View file

@ -23,6 +23,7 @@ list_t *list_new(size_t memb_size, size_t capacity);
/* /*
* Frees a list. * Frees a list.
* If list is null, no action is taken.
*/ */
void list_free(list_t *list); void list_free(list_t *list);
@ -101,7 +102,6 @@ void list_foreach(list_t *list, void callback(void *));
* printf("%s\n", *ptr); * printf("%s\n", *ptr);
* } * }
*/ */
// Consider making this inline or __attribute__((pure))__
void *list_end(list_t *list); void *list_end(list_t *list);
#endif #endif