Introduce and use OBJ macro.

1 files changed, 2 insertions, 41 deletions

diff --git a/src/obj/point.c b/src/obj/point.c
index 9c9b37d..2b709dd 100644
--- a/src/obj/point.c
+++ b/src/obj/point.c
@@ -1,9 +1,8 @@
 
 #include "point.h"
-#include "misc/types.h"
-#include "util/memory.h"
 
-point_t *point_new(void) { return try_calloc(sizeof(point_t)); }
+OBJ(point, point_t, point_copy, point_clone)
+OBJS(point, point_t, point_copy, point_clone)
 
 point_t *point_copy(const point_t *src, point_t *dest) {
 	if (src->point) dest->point = gcopy(src->point);
@@ -12,11 +11,6 @@ point_t *point_copy(const point_t *src, point_t *dest) {
 	return dest;
 }
 
-point_t *point_new_copy(const point_t *src) {
-	point_t *result = point_new();
-	return point_copy(src, result);
-}
-
 point_t *point_clone(const point_t *src, point_t *dest) {
 	if (src->point) dest->point = gclone(src->point);
 	if (src->order) dest->order = gclone(src->order);
@@ -24,11 +18,6 @@ point_t *point_clone(const point_t *src, point_t *dest) {
 	return dest;
 }
 
-point_t *point_new_clone(const point_t *src) {
-	point_t *result = point_new();
-	return point_clone(src, result);
-}
-
 void point_free(point_t **point) {
 	if (*point) {
 		if ((*point)->point && isclone((*point)->point)) {
@@ -45,34 +34,6 @@ void point_free(point_t **point) {
 	}
 }
 
-point_t **points_new(unsigned long num) {
-	return try_calloc(num * sizeof(point_t *));
-}
-
-point_t **points_copy(point_t **const src, point_t **dest, unsigned long num) {
-	for (unsigned long i = 0; i < num; ++i) {
-		dest[i] = point_new_copy(src[i]);
-	}
-	return dest;
-}
-
-point_t **points_new_copy(point_t **const src, unsigned long num) {
-	point_t **result = points_new(num);
-	return points_copy(src, result, num);
-}
-
-point_t **points_clone(point_t **const src, point_t **dest, unsigned long num) {
-	for (unsigned long i = 0; i < num; ++i) {
-		dest[i] = point_new_clone(src[i]);
-	}
-	return dest;
-}
-
-point_t **points_new_clone(point_t **const src, unsigned long num) {
-	point_t **result = points_new(num);
-	return points_clone(src, result, num);
-}
-
 void points_free(point_t ***points) {
 	if (*points) {
 		try_free(*points);