summaryrefslogtreecommitdiffstats
path: root/libdimension
diff options
context:
space:
mode:
Diffstat (limited to 'libdimension')
-rw-r--r--libdimension/canvas.c2
-rw-r--r--libdimension/dimension/list.h6
-rw-r--r--libdimension/list.c2
-rw-r--r--libdimension/prtree.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/libdimension/canvas.c b/libdimension/canvas.c
index 2c60c60..39a5937 100644
--- a/libdimension/canvas.c
+++ b/libdimension/canvas.c
@@ -48,7 +48,7 @@ dmnsn_delete_canvas(dmnsn_canvas *canvas)
{
if (canvas) {
/* Free the optimizers */
- DMNSN_ARRAY_FOREACH(dmnsn_canvas_optimizer *, i, canvas->optimizers) {
+ DMNSN_ARRAY_FOREACH (dmnsn_canvas_optimizer *, i, canvas->optimizers) {
if (i->free_fn) {
(*i->free_fn)(i->ptr);
}
diff --git a/libdimension/dimension/list.h b/libdimension/dimension/list.h
index ae2aab5..19ce3c8 100644
--- a/libdimension/dimension/list.h
+++ b/libdimension/dimension/list.h
@@ -216,8 +216,8 @@ dmnsn_list_pop(dmnsn_list *list, void *obj)
/* Splits a list in half, and returns the second half */
dmnsn_list *dmnsn_list_split(dmnsn_list *list);
/* Sort a list */
-typedef bool dmnsn_comparator_fn(dmnsn_list_iterator *l,
- dmnsn_list_iterator *r);
-void dmnsn_list_sort(dmnsn_list *list, dmnsn_comparator_fn *comparator);
+typedef bool dmnsn_list_comparator_fn(dmnsn_list_iterator *l,
+ dmnsn_list_iterator *r);
+void dmnsn_list_sort(dmnsn_list *list, dmnsn_list_comparator_fn *comparator);
#endif /* DIMENSION_LIST_H */
diff --git a/libdimension/list.c b/libdimension/list.c
index 0c01e68..fc2fc37 100644
--- a/libdimension/list.c
+++ b/libdimension/list.c
@@ -84,7 +84,7 @@ dmnsn_list_split(dmnsn_list *list)
}
void
-dmnsn_list_sort(dmnsn_list *list, dmnsn_comparator_fn *comparator)
+dmnsn_list_sort(dmnsn_list *list, dmnsn_list_comparator_fn *comparator)
{
/* Recursive merge sort */
if (dmnsn_list_size(list) < 2) {
diff --git a/libdimension/prtree.c b/libdimension/prtree.c
index dc3ed38..53e6bdb 100644
--- a/libdimension/prtree.c
+++ b/libdimension/prtree.c
@@ -194,7 +194,7 @@ dmnsn_zmax_prnode_comp(dmnsn_list_iterator *l, dmnsn_list_iterator *r)
return lval < rval;
}
-static dmnsn_comparator_fn *dmnsn_object_comparators[6] = {
+static dmnsn_list_comparator_fn *dmnsn_object_comparators[6] = {
[DMNSN_XMIN] = &dmnsn_xmin_object_comp,
[DMNSN_YMIN] = &dmnsn_ymin_object_comp,
[DMNSN_ZMIN] = &dmnsn_zmin_object_comp,
@@ -203,7 +203,7 @@ static dmnsn_comparator_fn *dmnsn_object_comparators[6] = {
[DMNSN_ZMAX] = &dmnsn_zmax_object_comp
};
-static dmnsn_comparator_fn *dmnsn_prnode_comparators[6] = {
+static dmnsn_list_comparator_fn *dmnsn_prnode_comparators[6] = {
[DMNSN_XMIN] = &dmnsn_xmin_prnode_comp,
[DMNSN_YMIN] = &dmnsn_ymin_prnode_comp,
[DMNSN_ZMIN] = &dmnsn_zmin_prnode_comp,