star-enclosures-2d

commit f585dfd7514f7f271b9390a7f915588ee44e09c7
parent 815fee4ac237ba4799e25bfae9700e302b1699b7
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu, 12 Apr 2018 13:59:22 +0200

Fix naming for enclosure header type

Diffstat:
M
src/senc2d.h
 | 
4
++--
M
src/senc2d_enclosure.c
 | 
2
+-
M
src/senc2d_enclosure_data.h
 | 
4
++--
M
src/test_senc2d_enclosure.c
 | 
2
+-
M
src/test_senc2d_many_enclosures.c
 | 
2
+-
M
src/test_senc2d_many_segments.c
 | 
2
+-
M
src/test_senc2d_sample_enclosure.c
 | 
2
+-
M
src/test_senc2d_utils.h
 | 
2
+-

8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/senc2d.h b/src/senc2d.h
@@ -57,7 +57,7 @@ struct senc2d_scene;
 struct senc2d_enclosure;
 
 /* Enclosure2D header type */
-struct enclosure2d_header {
+struct senc2d_enclosure_header {
   /* The ID of the enclosure; 0, 1, ... */
   unsigned enclosure_id;
   /* Number of segments; a segment can be accounted for twice, once by side */
@@ -247,7 +247,7 @@ senc2d_descriptor_ref_put
 SENC2D_API res_T
 senc2d_enclosure_get_header
   (const struct senc2d_enclosure* enclosure,
-   const struct enclosure2d_header** header);
+   const struct senc2d_enclosure_header** header);
 
 SENC2D_API res_T
 senc2d_enclosure_get_segment
diff --git a/src/senc2d_enclosure.c b/src/senc2d_enclosure.c
@@ -66,7 +66,7 @@ enclosure_create
 res_T
 senc2d_enclosure_get_header
   (const struct senc2d_enclosure* enclosure,
-   const struct enclosure2d_header** header)
+   const struct senc2d_enclosure_header** header)
 {
   if(!enclosure || !header) return RES_BAD_ARG;
   *header = &enclosure->data->header;
diff --git a/src/senc2d_enclosure_data.h b/src/senc2d_enclosure_data.h
@@ -26,7 +26,7 @@
 #include <limits.h>
 
 static void
-init_header(struct enclosure2d_header* header)
+init_header(struct senc2d_enclosure_header* header)
 {
   ASSERT(header);
   header->enclosure_id = ENCLOSURE_NULL__;
@@ -38,7 +38,7 @@ init_header(struct enclosure2d_header* header)
 }
 
 struct enclosure_data {
-  struct enclosure2d_header header;
+  struct senc2d_enclosure_header header;
   /* Same segment can appear twice if both sides */
   struct darray_segment_in sides;
   /* Index of vertices in scene's unique vertices */
diff --git a/src/test_senc2d_enclosure.c b/src/test_senc2d_enclosure.c
@@ -31,7 +31,7 @@ main(int argc, char** argv)
   struct senc2d_scene* scn = NULL;
   struct senc2d_enclosure* enclosures[2] = { NULL, NULL };
   struct senc2d_enclosure* enclosure;
-  const struct enclosure2d_header* header;
+  const struct senc2d_enclosure_header* header;
   struct s2d_device* s2d = NULL;
   struct s2d_scene* s2d_scn = NULL;
   struct s2d_shape* s2d_shp = NULL;
diff --git a/src/test_senc2d_many_enclosures.c b/src/test_senc2d_many_enclosures.c
@@ -127,7 +127,7 @@ main(int argc, char** argv)
 
   FOR_EACH(e, 0, count) {
     struct senc2d_enclosure* enclosure;
-    const struct enclosure2d_header* header;
+    const struct senc2d_enclosure_header* header;
     CHK(senc2d_descriptor_get_enclosure(desc, e, &enclosure) == RES_OK);
     CHK(senc2d_enclosure_get_header(enclosure, &header) == RES_OK);
     CHK(header->segment_count ==
diff --git a/src/test_senc2d_many_segments.c b/src/test_senc2d_many_segments.c
@@ -116,7 +116,7 @@ main(int argc, char** argv)
   CHK(count == 1 + NB_CIRC);
   FOR_EACH(i, 0, count) {
     struct senc2d_enclosure* enclosure;
-    const struct enclosure2d_header* header;
+    const struct senc2d_enclosure_header* header;
     CHK(senc2d_descriptor_get_enclosure(desc, i, &enclosure) == RES_OK);
     CHK(senc2d_enclosure_get_header(enclosure, &header) == RES_OK);
     CHK(header->segment_count ==
diff --git a/src/test_senc2d_sample_enclosure.c b/src/test_senc2d_sample_enclosure.c
@@ -31,7 +31,7 @@ main(int argc, char** argv)
   struct senc2d_device* dev = NULL;
   struct senc2d_scene* scn = NULL;
   struct senc2d_enclosure* enclosure = NULL;
-  const struct enclosure2d_header* header = NULL;
+  const struct senc2d_enclosure_header* header = NULL;
   struct s2d_device* s2d = NULL;
   struct s2d_scene* s2d_scn = NULL;
   struct s2d_scene_view* s2d_view = NULL;
diff --git a/src/test_senc2d_utils.h b/src/test_senc2d_utils.h
@@ -147,7 +147,7 @@ dump_enclosure
    const char* name)
 {
   struct senc2d_enclosure* enclosure;
-  const struct enclosure2d_header* header;
+  const struct senc2d_enclosure_header* header;
   FILE* stream;
   unsigned count, i;