Rename `struct face` to `struct point`

1 files changed, 12 insertions, 12 deletions

diff --git a/18.c b/18.c
index 05c7940..6d7ca6d 100644
--- a/18.c
+++ b/18.c
@@ -10,7 +10,7 @@
 #define arrlen(x) (sizeof(x)/sizeof((x)[0]))
 
 
-struct face {
+struct point {
 	int x;
 	int y;
 	int z;
@@ -18,7 +18,7 @@ struct face {
 
 
 int
-face_cmp(struct face const * a, struct face const * b)
+point_cmp(struct point const * a, struct point const * b)
 {
 	if (a->x != b->x)
 		return a->x - b->x;
@@ -29,9 +29,9 @@ face_cmp(struct face const * a, struct face const * b)
 
 
 int
-face_cmp_t(void const * a, void const * b)
+point_cmp_t(void const * a, void const * b)
 {
-	return face_cmp(a, b);
+	return point_cmp(a, b);
 }
 
 
@@ -41,12 +41,12 @@ face_cmp_t(void const * a, void const * b)
 // y = up-down
 // z = front-back
 //
-// For a cube, we scale it by a factor of two, and then identify each face by
-// the point at its center.
-struct face *
+// To uniquely identify the faces of a cube, we scale the cube by a factor of
+// two, and then identify each face by the point at the face's center.
+struct point *
 cube_face(int x, int y, int z, int face)
 {
-	struct face * f;
+	struct point * f;
 
 	x *= 2;
 	y *= 2;
@@ -90,7 +90,7 @@ cube_face(int x, int y, int z, int face)
 		return NULL;
 	}
 
-	if ((f = malloc(sizeof(struct face))) == NULL)
+	if ((f = malloc(sizeof(struct point))) == NULL)
 		return NULL;
 
 	f->x = x;
@@ -124,9 +124,9 @@ main()
 		z = atoi(buf + coords[3].rm_so);
 
 		for (f = 0; f < 6; ++f) {
-			struct face * face = cube_face(x, y, z, f);
+			struct point * face = cube_face(x, y, z, f);
 
-			struct face * exists = *((struct face **) tsearch(face, &faces, face_cmp_t));
+			struct point * exists = *((struct point **) tsearch(face, &faces, point_cmp_t));
 
 			if (exists == face) {
 				// Inserted new face
@@ -134,7 +134,7 @@ main()
 			}
 			else {
 				// Face already existed, so delete it
-				tdelete(face, &faces, face_cmp_t);
+				tdelete(face, &faces, point_cmp_t);
 				--nfaces;
 				free(face);
 				free(exists);