]> Kevux Git Server - fll/commitdiff
Bugfix: firewall and fake were not updated to utilize f_fss_comments_t.
authorKevin Day <thekevinday@gmail.com>
Wed, 28 Oct 2020 03:56:10 +0000 (22:56 -0500)
committerKevin Day <thekevinday@gmail.com>
Wed, 28 Oct 2020 03:56:10 +0000 (22:56 -0500)
Being out of date with the latest API changes prevents them from compiling.

level_3/fake/c/private-make.c
level_3/firewall/c/private-firewall.c

index b70314d8163dbdc6558597858945144f9f3cbe5c..ab46c21d2ca85f09f37298206a8ac31c19ff5d83 100644 (file)
@@ -204,24 +204,24 @@ extern "C" {
     {
       f_string_range_t range = f_macro_string_range_t_initialize(data_make->buffer.used);
       f_fss_delimits_t delimits = f_fss_delimits_t_initialize;
+      f_fss_comments_t comments = f_fss_comments_t_initialize;
 
-      *status = fll_fss_basic_list_read(&data_make->buffer, &range, &list_objects, &list_contents, &delimits, 0);
+      *status = fll_fss_basic_list_read(&data_make->buffer, &range, &list_objects, &list_contents, &delimits, 0, &comments);
 
       if (F_status_is_error(*status)) {
         fake_print_error_fss(data, *status, "fll_fss_basic_list_read", data.file_data_build_fakefile.string, range, F_true);
-
-        f_macro_fss_delimits_t_delete_simple(delimits);
-        f_macro_fss_objects_t_delete_simple(list_objects);
-        f_macro_fss_contents_t_delete_simple(list_contents);
-        return;
       }
+      else {
+        *status = fl_fss_apply_delimit(delimits, &data_make->buffer);
 
-      *status = fl_fss_apply_delimit(delimits, &data_make->buffer);
+        if (F_status_is_error(*status)) {
+          fll_error_print(data.error, F_status_set_fine(*status), "fl_fss_apply_delimit", F_true);
+        }
+      }
 
       if (F_status_is_error(*status)) {
-        fll_error_print(data.error, F_status_set_fine(*status), "fl_fss_apply_delimit", F_true);
-
         f_macro_fss_delimits_t_delete_simple(delimits);
+        f_macro_fss_comments_t_delete_simple(comments);
         f_macro_fss_objects_t_delete_simple(list_objects);
         f_macro_fss_contents_t_delete_simple(list_contents);
         return;
index 60d246883a9a118890361f5cc188f6944008d712..9e1b3fc9239b33042234efa42e8b32964054b0a3 100644 (file)
@@ -1394,11 +1394,12 @@ f_return_status firewall_buffer_rules(const f_string_t filename, const bool opti
   }
 
   f_fss_delimits_t delimits = f_fss_delimits_t_initialize;
+  f_fss_comments_t comments = f_fss_comments_t_initialize;
 
   {
     f_string_range_t input = f_macro_string_range_t_initialize(local->buffer.used);
 
-    status = fll_fss_basic_list_read(&local->buffer, &input, &local->chain_objects, &local->chain_contents, &delimits, 0);
+    status = fll_fss_basic_list_read(&local->buffer, &input, &local->chain_objects, &local->chain_contents, &delimits, 0, &comments);
   }
 
   if (F_status_is_error(status)) {
@@ -1426,6 +1427,7 @@ f_return_status firewall_buffer_rules(const f_string_t filename, const bool opti
   }
 
   f_macro_fss_delimits_t_delete_simple(delimits);
+  f_macro_fss_comments_t_delete_simple(comments);
 
   return status;
 }