stardis

commit 6757775ea4e427faf6d3ff003f6ae086ba0876bb
parent 42f0dc82937299c866d335b937e3c0128a2cf5dc
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri,  6 May 2022 16:15:59 +0200

Dump programmed descriptions' arguments in verbose mode

Diffstat:
M
src/stardis-fbound-prog.c
 | 
14
++++++++++----
M
src/stardis-fluid-prog.c
 | 
12
+++++++++---
M
src/stardis-hbound-prog.c
 | 
11
+++++++++--
M
src/stardis-program.c
 | 
13
+++++++++----
M
src/stardis-sfconnect-prog.c
 | 
16
+++++++++++-----
M
src/stardis-solid-prog.c
 | 
12
+++++++++---
M
src/stardis-ssconnect-prog.c
 | 
16
+++++++++++-----
M
src/stardis-tbound-prog.c
 | 
12
+++++++++---

8 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/src/stardis-fbound-prog.c b/src/stardis-fbound-prog.c
@@ -83,10 +83,16 @@ str_print_f_boundary_prog
   res_T res = RES_OK;
   ASSERT(str && b);
   ERR(str_append_printf(str,
-    "programmed F boundary for SOLID '%s': lib='%s', args=[%s]"
-    " (using medium %u as external medium)",
-    str_cget(&b->name), str_cget(&b->prog_name),
-    "TODO", b->mat_id));
+    "programmed F boundary for SOLID '%s': lib='%s', "
+    "(using medium %u as external medium)",
+    str_cget(&b->name), str_cget(&b->prog_name), b->mat_id));
+  if(b->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < b->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == b->argc ? "\t%s" : "\t%s\n"), b->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-fluid-prog.c b/src/stardis-fluid-prog.c
@@ -187,9 +187,15 @@ str_print_fluid_prog(struct str* str, const struct fluid_prog* f)
   res_T res = RES_OK;
   ASSERT(str && f);
   ERR(str_append_printf(str,
-     "programmed fluid '%s': lib='%s', args=[%s] (it is medium %u)",
-    str_cget(&f->name), str_cget(&f->prog_name), "TODO",
-    f->fluid_id));
+     "programmed fluid '%s': lib='%s', it is medium %u)",
+    str_cget(&f->name), str_cget(&f->prog_name), f->fluid_id));
+  if(f->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < f->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == f->argc ? "\t%s" : "\t%s\n"), f->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-hbound-prog.c b/src/stardis-hbound-prog.c
@@ -87,11 +87,18 @@ str_print_h_boundary_prog
   ASSERT(str && desc && DESC_IS_H(desc));
   b = desc->d.h_boundary_prog;
   ERR(str_append_printf(str,
-    "programmed H boundary for %s '%s': lib='%s', args=[%s] "
+    "programmed H boundary for %s '%s': lib='%s', "
     "(using medium %u as external medium)",
     (desc->type == DESC_BOUND_H_FOR_SOLID_PROG ? "solid" : "fluid"),
-    str_cget(&b->name), str_cget(&b->prog_name), "TODO",
+    str_cget(&b->name), str_cget(&b->prog_name),
     b->mat_id));
+  if(b->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < b->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == b->argc ? "\t%s" : "\t%s\n"), b->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-program.c b/src/stardis-program.c
@@ -69,12 +69,17 @@ release_program
 res_T
 str_print_program
   (struct str* str,
-   const struct program* program)
+   const struct program* p)
 {
   res_T res = RES_OK;
-  ERR(str_append_printf(str, "Library %s, args=[%s]",
-       str_cget(&program->name), "TODO"));
- 
+  ERR(str_append_printf(str, "Library %s", str_cget(&p->name)));
+  if(p->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < p->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == p->argc ? "\t%s" : "\t%s\n"), p->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-sfconnect-prog.c b/src/stardis-sfconnect-prog.c
@@ -77,14 +77,20 @@ release_sf_connect_prog
 res_T
 str_print_sf_connect_prog
   (struct str* str,
-   const struct solid_fluid_connect_prog* connect)
+   const struct solid_fluid_connect_prog* c)
 {
   res_T res = RES_OK;
-  ASSERT(str && connect);
+  ASSERT(str && c);
   ERR(str_append_printf(str,
-    "programmed Solid-Fluid connection '%s': lib='%s', args=[%s]",
-    str_cget(&connect->name), str_cget(&connect->prog_name),
-    "TODO"));
+    "programmed Solid-Fluid connection '%s': lib='%s'",
+    str_cget(&c->name), str_cget(&c->prog_name)));
+  if(c->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < c->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == c->argc ? "\t%s" : "\t%s\n"), c->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-solid-prog.c b/src/stardis-solid-prog.c
@@ -189,9 +189,15 @@ str_print_solid_prog(struct str* str, const struct solid_prog* f)
   res_T res = RES_OK;
   ASSERT(str && f);
   ERR(str_append_printf(str,
-    "programmed solid '%s': lib='%s', args=[%s] (it is medium %u)",
-    str_cget(&f->name), str_cget(&f->prog_name), "TODO",
-    f->solid_id));
+    "programmed solid '%s': lib='%s', it is medium %u)",
+    str_cget(&f->name), str_cget(&f->prog_name), f->solid_id));
+  if(f->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < f->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == f->argc ? "\t%s" : "\t%s\n"), f->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-ssconnect-prog.c b/src/stardis-ssconnect-prog.c
@@ -78,14 +78,20 @@ release_ss_connect_prog
 res_T
 str_print_ss_connect_prog
   (struct str* str,
-   const struct solid_solid_connect_prog* connect)
+   const struct solid_solid_connect_prog* c)
 {
   res_T res = RES_OK;
-  ASSERT(str && connect);
+  ASSERT(str && c);
   ERR(str_append_printf(str,
-    "programmed Solid-Solid connection '%s': lib='%s', args=[%s]",
-    str_cget(&connect->name), str_cget(&connect->prog_name),
-    "TODO"));
+    "programmed Solid-Solid connection '%s': lib='%s'",
+    str_cget(&c->name), str_cget(&c->prog_name)));
+  if(c->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < c->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == c->argc ? "\t%s" : "\t%s\n"), c->argv[i]));
+    }
+  }
 end:
   return res;
 error:
diff --git a/src/stardis-tbound-prog.c b/src/stardis-tbound-prog.c
@@ -82,10 +82,16 @@ str_print_t_boundary_prog
   res_T res = RES_OK;
   ASSERT(str && b);
   ERR(str_append_printf(str,
-    "programmed T boundary for solid '%s': lib='%s', args=[%s] "
+    "programmed T boundary for solid '%s': lib='%s', "
     "(using medium %u as external medium)",
-    str_cget(&b->name), str_cget(&b->prog_name), "TODO",
-    b->mat_id));
+    str_cget(&b->name), str_cget(&b->prog_name), b->mat_id));
+  if(b->argc > 0) {
+    size_t i;
+    ERR(str_append_printf(str, ", provided arguments:\n"));
+    for(i = 0; i < b->argc; i++) {
+      ERR(str_append_printf(str, (i+1 == b->argc ? "\t%s" : "\t%s\n"), b->argv[i]));
+    }
+  }
 end:
   return res;
 error: