rngrd

commit 9571d6073437d0ea1504e8c5c8ac45acea7ecb5c
parent 3eda5d37cb018607bbf5a9a5ef4041e0453653f5
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 21 Sep 2022 17:45:22 +0200

Rewrite a comment and a log message

Diffstat:
M
src/rngrd.c
 | 
3
++-
M
src/rngrd_properties.c
 | 
8
++++----

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/rngrd.c b/src/rngrd.c
@@ -178,7 +178,8 @@ res_T
 rngrd_validate(const struct rngrd* ground)
 {
   res_T res = RES_OK;
-  if(!ground) return RES_BAD_ARG;
+
+  if(!ground) { res = RES_BAD_ARG; goto error; }
 
   res = check_properties(ground);
   if(res != RES_OK) goto error;
diff --git a/src/rngrd_properties.c b/src/rngrd_properties.c
@@ -173,7 +173,7 @@ check_properties(const struct rngrd* ground)
   res_T res = RES_OK;
   ASSERT(ground);
 
-  /* The descriptor layout was already check during rngrd creation */
+  /* The layout of sbuf_desc has already been checked when creating rngrd */
   res = sbuf_get_desc(ground->props, &sbuf_desc);
   if(res != RES_OK) goto error;
 
@@ -186,9 +186,9 @@ check_properties(const struct rngrd* ground)
 
     if(item->mtl_id >= darray_mtl_size_get(&ground->mtls)) {
       log_err(ground,
-        "%s: triangle %lu: invalid material id `%u'. It must be in [0, %lu]\n",
-        str_cget(&ground->name), i, item->mtl_id,
-        darray_mtl_size_get(&ground->mtls));
+        "%s: triangle %lu: invalid material id `%u'. It must be in [0, %lu[\n",
+        str_cget(&ground->name), (unsigned long)i, (unsigned long)item->mtl_id,
+        (unsigned long)darray_mtl_size_get(&ground->mtls));
       res = RES_BAD_ARG;
       goto error;
     }