]> Kevux Git Server - fll/commitdiff
Cleanup: fix help parameter spacing and add additional information.
authorKevin Day <thekevinday@gmail.com>
Fri, 9 Oct 2020 00:28:11 +0000 (19:28 -0500)
committerKevin Day <thekevinday@gmail.com>
Fri, 9 Oct 2020 00:28:11 +0000 (19:28 -0500)
The basic list standard does not support quotes.
Leave the quote parameters for consistency between the write programs, but add a note to the help explaining this.

level_3/fss_basic_list_read/c/private-fss_basic_list_read.c
level_3/fss_basic_list_write/c/fss_basic_list_write.c
level_3/fss_basic_write/c/fss_basic_write.c
level_3/fss_extended_write/c/fss_extended_write.c

index a0213535deffe755c0511abbe321931e9408bc7d..903702fba6c8b85ac3e05ba996f4d445c7956af8 100644 (file)
@@ -323,9 +323,9 @@ extern "C" {
             if (at == depths.array[0].value_at) {
               print_object(f_type_output, data->buffer, data->objects.array[i]);
 
-              if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) {
-                fss_basic_list_read_print_object_end(*data);
+              fss_basic_list_read_print_object_end(*data);
 
+              if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) {
                 if (data->contents.array[i].used) {
                   f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
                 }
@@ -347,9 +347,9 @@ extern "C" {
 
         print_object(f_type_output, data->buffer, data->objects.array[i]);
 
-        if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) {
-          fss_basic_list_read_print_object_end(*data);
+        fss_basic_list_read_print_object_end(*data);
 
+        if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) {
           if (data->contents.array[i].used) {
             f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
           }
index 4bff84ce49bd54e7202d5d7e97bf7bed4a3d9d43..07c6bc1a5d2097630407f0e208bb6c9cd7a26fa9 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
     printf("%c", f_string_eol[0]);
 
     fll_program_print_help_option(file, context, fss_basic_list_write_short_file, fss_basic_list_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, "   Specify a file to send output to.");
-    fll_program_print_help_option(file, context, fss_basic_list_write_short_content, fss_basic_list_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, " The content to output.");
+    fll_program_print_help_option(file, context, fss_basic_list_write_short_content, fss_basic_list_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, "The content to output.");
     fll_program_print_help_option(file, context, fss_basic_list_write_short_double, fss_basic_list_write_long_double, f_console_symbol_short_enable, f_console_symbol_long_enable, " Use double quotes (default).");
     fll_program_print_help_option(file, context, fss_basic_list_write_short_object, fss_basic_list_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " The object to output.");
     fll_program_print_help_option(file, context, fss_basic_list_write_short_partial, fss_basic_list_write_long_partial, f_console_symbol_short_enable, f_console_symbol_long_enable, "Do not output end of object/content character.");
@@ -53,6 +53,14 @@ extern "C" {
 
     printf("%c", f_string_eol[0]);
 
+    printf("  The FSS-0002 (Basic List) specification does not support quoted names, therefore the parameters '");
+    fl_color_print(f_type_output, context.set.notable, "%s%s", f_console_symbol_long_enable, fss_basic_list_write_long_single);
+    printf("' and '");
+    fl_color_print(f_type_output, context.set.notable, "%s%s", f_console_symbol_long_enable, fss_basic_list_write_long_double);
+    printf("' do nothing.%c", f_string_eol[0]);
+
+    printf("%c", f_string_eol[0]);
+
     return F_none;
   }
 #endif // _di_fss_basic_list_write_print_help_
index fc170ba7c72f1719286723f6465f2849d5767c04..0f71d44dbc9c7ed38d4e5ce4bdacd6f23fc0967f 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
     printf("%c", f_string_eol[0]);
 
     fll_program_print_help_option(file, context, fss_basic_write_short_file, fss_basic_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, "   Specify a file to send output to.");
-    fll_program_print_help_option(file, context, fss_basic_write_short_content, fss_basic_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, " The content to output.");
+    fll_program_print_help_option(file, context, fss_basic_write_short_content, fss_basic_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, "The content to output.");
     fll_program_print_help_option(file, context, fss_basic_write_short_double, fss_basic_write_long_double, f_console_symbol_short_enable, f_console_symbol_long_enable, " Use double quotes (default).");
     fll_program_print_help_option(file, context, fss_basic_write_short_object, fss_basic_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " The object to output.");
     fll_program_print_help_option(file, context, fss_basic_write_short_partial, fss_basic_write_long_partial, f_console_symbol_short_enable, f_console_symbol_long_enable, "Do not output end of object/content character.");
index 7c4a2e709de6b24f82f58a172afbf1b9730db650..74dc6814d39a42e57fd2fe83b8dc7a1da9f10ad4 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
     printf("%c", f_string_eol[0]);
 
     fll_program_print_help_option(file, context, fss_extended_write_short_file, fss_extended_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, "   Specify a file to send output to.");
-    fll_program_print_help_option(file, context, fss_extended_write_short_content, fss_extended_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, " The content to output.");
+    fll_program_print_help_option(file, context, fss_extended_write_short_content, fss_extended_write_long_content, f_console_symbol_short_enable, f_console_symbol_long_enable, "The content to output.");
     fll_program_print_help_option(file, context, fss_extended_write_short_double, fss_extended_write_long_double, f_console_symbol_short_enable, f_console_symbol_long_enable, " Use double quotes (default).");
     fll_program_print_help_option(file, context, fss_extended_write_short_object, fss_extended_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " The object to output.");
     fll_program_print_help_option(file, context, fss_extended_write_short_partial, fss_extended_write_long_partial, f_console_symbol_short_enable, f_console_symbol_long_enable, "Do not output end of object/content character.");