tableprinter: code cleanup

diff --git a/ucw/table.c b/ucw/table.c
index 16ae418d2ecdbe8b77b1915f71414a96aa607d9c..2174fbe4831fdc35dece9a08678c21d193e40b7b 100644 (file)
--- a/ucw/table.c
+++ b/ucw/table.c
@@ -422,7 +422,7 @@ const char *table_set_option_value(struct table *tbl, const char *key, const cha
     } else if(strcmp(key, "cell-fmt") == 0) {
       u32 fmt = 0;
       const char *err = xtype_parse_fmt(NULL, value, &fmt, tbl->pool);
     } else if(strcmp(key, "cell-fmt") == 0) {
       u32 fmt = 0;
       const char *err = xtype_parse_fmt(NULL, value, &fmt, tbl->pool);

-      if(err) return mp_printf(tbl->pool, "??? Invalid cell format: '%s'.", err);
+      if(err) return mp_printf(tbl->pool, "Invalid cell format: '%s'.", err);

       for(uint i = 0; i < tbl->cols_to_output; i++) {
         tbl->column_order[i].output_type = fmt;
       }
       for(uint i = 0; i < tbl->cols_to_output; i++) {
         tbl->column_order[i].output_type = fmt;
       }


@@ -578,18 +578,18 @@ struct table_formatter table_fmt_blockline = {
 #include <stdio.h>
 
 enum test_table_cols {
 #include <stdio.h>
 
 enum test_table_cols {

-  test_col0_str, test_col1_int, test_col2_uint, test_col3_bool, test_col4_double
+  TEST_COL0_STR, TEST_COL1_INT, TEST_COL2_UINT, TEST_COL3_BOOL, TEST_COL4_DOUBLE

 };
 
 };
 

-static struct table_col_instance test_column_order[] = { TBL_COL(test_col3_bool), TBL_COL(test_col4_double), TBL_COL(test_col2_uint), TBL_COL(test_col1_int), TBL_COL(test_col0_str) };
+static struct table_col_instance test_column_order[] = { TBL_COL(TEST_COL3_BOOL), TBL_COL(TEST_COL4_DOUBLE), TBL_COL(TEST_COL2_UINT), TBL_COL(TEST_COL1_INT), TBL_COL(TEST_COL0_STR) };

 
 static struct table_template test_tbl = {
   TBL_COLUMNS {
 
 static struct table_template test_tbl = {
   TBL_COLUMNS {

-    [test_col0_str] = TBL_COL_STR("col0_str", 20),
-    [test_col1_int] = TBL_COL_INT("col1_int", 8),
-    [test_col2_uint] = TBL_COL_UINT("col2_uint", 9),
-    [test_col3_bool] = TBL_COL_BOOL("col3_bool", 9),
-    [test_col4_double] = TBL_COL_DOUBLE("col4_double", 11),
+    [TEST_COL0_STR] = TBL_COL_STR("col0_str", 20),
+    [TEST_COL1_INT] = TBL_COL_INT("col1_int", 8),
+    [TEST_COL2_UINT] = TBL_COL_UINT("col2_uint", 9),
+    [TEST_COL3_BOOL] = TBL_COL_BOOL("col3_bool", 9),
+    [TEST_COL4_DOUBLE] = TBL_COL_DOUBLE("col4_double", 11),

     TBL_COL_END
   },
   TBL_COL_ORDER(test_column_order),
     TBL_COL_END
   },
   TBL_COL_ORDER(test_column_order),


@@ -602,21 +602,21 @@ static struct table_template test_tbl = {
  **/
 static void do_print1(struct table *test_tbl)
 {
  **/
 static void do_print1(struct table *test_tbl)
 {

-  table_col_str(test_tbl, test_col0_str, "sdsdf");
-  table_col_int(test_tbl, test_col1_int, -10);
-  table_col_int(test_tbl, test_col1_int, 10000);
-  table_col_uint(test_tbl, test_col2_uint, 10);
-  table_col_printf(test_tbl, test_col2_uint, "XXX-%u", 22222);
-  table_col_bool(test_tbl, test_col3_bool, true);
-  table_col_double(test_tbl, test_col4_double, 1.5);
-  table_col_printf(test_tbl, test_col4_double, "AAA");
+  table_col_str(test_tbl, TEST_COL0_STR, "sdsdf");
+  table_col_int(test_tbl, TEST_COL1_INT, -10);
+  table_col_int(test_tbl, TEST_COL1_INT, 10000);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 10);
+  table_col_printf(test_tbl, TEST_COL2_UINT, "XXX-%u", 22222);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, true);
+  table_col_double(test_tbl, TEST_COL4_DOUBLE, 1.5);
+  table_col_printf(test_tbl, TEST_COL4_DOUBLE, "AAA");

   table_end_row(test_tbl);
 
   table_end_row(test_tbl);
 

-  table_col_str(test_tbl, test_col0_str, "test");
-  table_col_int(test_tbl, test_col1_int, -100);
-  table_col_uint(test_tbl, test_col2_uint, 100);
-  table_col_bool(test_tbl, test_col3_bool, false);
-  table_col_printf(test_tbl, test_col4_double, "%.2lf", 1.5);
+  table_col_str(test_tbl, TEST_COL0_STR, "test");
+  table_col_int(test_tbl, TEST_COL1_INT, -100);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 100);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, false);
+  table_col_printf(test_tbl, TEST_COL4_DOUBLE, "%.2lf", 1.5);

   table_end_row(test_tbl);
 }
 
   table_end_row(test_tbl);
 }
 

diff --git a/ucw/table.h b/ucw/table.h
index 2b93bdb2e428475f8b464cb90a61a4371656149f..40c9a1f1580683c6909f07c603843fb903d217cf 100644 (file)
--- a/ucw/table.h
+++ b/ucw/table.h
@@ -118,11 +118,11 @@ struct table_column {
 // FIXME: is it correct to have idx and col_def? idx is sufficient and in fact a duplicity of idx
 // idx is used only for initialization and col_def is used in other cases
 struct table_col_instance {
 // FIXME: is it correct to have idx and col_def? idx is sufficient and in fact a duplicity of idx
 // idx is used only for initialization and col_def is used in other cases
 struct table_col_instance {

-  uint idx;                      // idx is a index into struct table::columns
+  uint idx;                            // idx is a index into struct table::columns

   const struct table_column *col_def;  // this is pointer to the column definition, located in the array struct table::columns
   const char *cell_content;            // content of the cell of the current row
   const struct table_column *col_def;  // this is pointer to the column definition, located in the array struct table::columns
   const char *cell_content;            // content of the cell of the current row

-  int next_column;               // index of next column in linked list of columns of the same type
-  enum xtype_fmt output_type;               // format of this column
+  int next_column;                     // index of next column in linked list of columns of the same type
+  enum xtype_fmt output_type;          // format of this column

 };
 
 /**
 };
 
 /**


@@ -130,10 +130,10 @@ struct table_col_instance {
  * Please use only fields marked with `[*]`.
  **/
 struct table_template {
  * Please use only fields marked with `[*]`.
  **/
 struct table_template {

-  const struct table_column *columns;          // [*] Definition of columns
+  const struct table_column *columns;       // [*] Definition of columns

   struct table_col_instance *column_order;  // [*] Order of the columns in the print-out of the table
   struct table_col_instance *column_order;  // [*] Order of the columns in the print-out of the table

-  uint cols_to_output;                 // [*] Number of columns that are printed
-  const char *col_delimiter;           // [*] Delimiter that is placed between columns
+  uint cols_to_output;                      // [*] Number of columns that are printed
+  const char *col_delimiter;                // [*] Delimiter that is placed between columns

   // Back-end used for table formatting and its private data
   struct table_formatter *formatter;
 };
   // Back-end used for table formatting and its private data
   struct table_formatter *formatter;
 };


@@ -185,7 +185,6 @@ struct table {
  *
  ***/
 
  *
  ***/
 

-//#define TBL_COL_LIST_INIT     .first_column = -1

 #define TBL_COL_STR(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_STR }
 #define TBL_COL_INT(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_INT }
 #define TBL_COL_S64(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_S64 }
 #define TBL_COL_STR(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_STR }
 #define TBL_COL_INT(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_INT }
 #define TBL_COL_S64(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_S64 }