mrumtl

commit 1c6db961c413f0d6131c4db41c1d2343ae3febd9
parent d00d1088f08f0473f404fc1750e82743a9acd7bd
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Sat,  7 Mar 2020 13:37:49 +0100

Fix the parsing of lines that finishes by blanks

Diffstat:
M
src/mrumtl.c
 | 
8
++++----
M
src/test_mrumtl_band.c
 | 
12
++++++------
M
src/test_mrumtl_wlen.c
 | 
6
+++---

3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/mrumtl.c b/src/mrumtl.c
@@ -351,7 +351,7 @@ parse_wlen_brdf
   res = parse_brdf(mrumtl, txtrdr, &tk_ctx, &brdf->brdf);
   if(res != RES_OK) goto error;
 
-  tk = strtok_r(NULL, "", &tk_ctx);
+  tk = strtok_r(NULL, " \t", &tk_ctx);
   if(tk) {
     log_err(mrumtl, "%s:%lu: unexpected directive `%s'.\n",
       txtrdr_get_name(txtrdr), (unsigned long)txtrdr_get_line_num(txtrdr), tk);
@@ -434,7 +434,7 @@ parse_band_brdf
   res = parse_brdf(mrumtl, txtrdr, &tk_ctx, &brdf->brdf);
   if(res != RES_OK) goto error;
 
-  tk = strtok_r(NULL, "", &tk_ctx);
+  tk = strtok_r(NULL, " \t", &tk_ctx);
   if(tk) {
     log_err(mrumtl, "%s:%lu: unexpected directive `%s'.\n",
       txtrdr_get_name(txtrdr), (unsigned long)txtrdr_get_line_num(txtrdr), tk);
@@ -475,7 +475,7 @@ parse_wlens_list(struct mrumtl* mrumtl, struct txtrdr* txtrdr, char** tk_ctx)
     goto error;
   }
 
-  tk = strtok_r(NULL, "", tk_ctx);
+  tk = strtok_r(NULL, " \t", tk_ctx);
   if(tk) {
     log_err(mrumtl, "%s:%lu: unexpected text `%s'.\n",
       txtrdr_get_name(txtrdr), (unsigned long)txtrdr_get_line_num(txtrdr), tk);
@@ -544,7 +544,7 @@ parse_bands_list(struct mrumtl* mrumtl, struct txtrdr* txtrdr, char** tk_ctx)
     goto error;
   }
 
-  tk = strtok_r(NULL, "", tk_ctx);
+  tk = strtok_r(NULL, " \t", tk_ctx);
   if(tk) {
     log_err(mrumtl, "%s:%lu: unexpected text `%s'.\n",
       txtrdr_get_name(txtrdr), (unsigned long)txtrdr_get_line_num(txtrdr), tk);
diff --git a/src/test_mrumtl_band.c b/src/test_mrumtl_band.c
@@ -109,7 +109,7 @@ check_load(struct mrumtl* mrumtl)
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_BAD_ARG);
 
   CHK(fp = freopen(filename, "w+", fp));
-  fprintf(fp, "bands 2\n");
+  fprintf(fp, "bands 2  \n");
   fprintf(fp, "200 200 lambertian 1\n");
   fprintf(fp, "200.1 200.2 specular 0");
   rewind(fp);
@@ -126,7 +126,7 @@ check_load(struct mrumtl* mrumtl)
   CHK(fp = freopen(filename, "w+", fp));
   fprintf(fp, "bands 3\n");
   fprintf(fp, "200 200 lambertian 1\n");
-  fprintf(fp, "200.1 200.2 specular 0\n");
+  fprintf(fp, "200.1 200.2 specular 0      \n");
   fprintf(fp, "200.2 200.2 lambertian 0\n");
   rewind(fp);
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_OK);
@@ -148,11 +148,11 @@ check_load(struct mrumtl* mrumtl)
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_BAD_ARG);
 
   CHK(fp = freopen(filename, "w+", fp));
-  fprintf(fp, "bands 4\n");
-  fprintf(fp, "200 200 lambertian 1\n");
+  fprintf(fp, "bands 4 \t  \t   \n");
+  fprintf(fp, "200 200 lambertian 1    \n");
   fprintf(fp, "200.1 200.2 specular 0.01\n");
-  fprintf(fp, "200.2 200.2 lambertian 0\n");
-  fprintf(fp, "250.3 2300 lambertian 0\n");
+  fprintf(fp, "200.2 200.2 lambertian 0\t \n");
+  fprintf(fp, "250.3 2300 lambertian 0  \n");
   rewind(fp);
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_OK);
 
diff --git a/src/test_mrumtl_wlen.c b/src/test_mrumtl_wlen.c
@@ -117,9 +117,9 @@ check_load(struct mrumtl* mrumtl)
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_OK);
 
   CHK(fp = freopen(filename, "w+", fp));
-  fprintf(fp, "wavelengths 2\n");
-  fprintf(fp, "290 lambertian 1\n");
-  fprintf(fp, "290.1 specular 0.5\n");
+  fprintf(fp, "wavelengths 2   \t\t\n");
+  fprintf(fp, "290 lambertian 1 \t  \n");
+  fprintf(fp, "290.1 specular 0.5 \n");
   fprintf(fp, "dummy line that is not parsed.\n");
   rewind(fp);
   CHK(mrumtl_load_stream(mrumtl, fp, filename) == RES_OK);