Xtype docs: Fixed a typo

[libucw.git] / ucw / table.c

diff --git a/ucw/table.c b/ucw/table.c
index e2c5cafc54259087755beb2d7256936157a24c4b..1324839a7c371fd59e1097e09e7724faae437b1e 100644 (file)
--- a/ucw/table.c
+++ b/ucw/table.c
@@ -51,7 +51,7 @@ struct table *table_init(const struct table_template *tbl_template)
   if(tbl_template->column_order) {
     int cols_to_output = 0;
     for(; ; cols_to_output++) {
-      if(tbl_template->column_order[cols_to_output].idx == (uint) ~0) break;
+      if(tbl_template->column_order[cols_to_output].idx == ~0U) break;
     }
 
     new_inst->column_order = mp_alloc_zero(new_inst->pool, sizeof(struct table_col_instance) * cols_to_output);
@@ -180,20 +180,20 @@ void table_set_col_order(struct table *tbl, const struct table_col_instance *col
 {
   uint cols_to_output = 0;
   for(; ; cols_to_output++) {
-    if(col_order[cols_to_output].idx == (uint) ~0) break;
+    if(col_order[cols_to_output].idx == ~0U) break;
     ASSERT_MSG(col_order[cols_to_output].idx < (uint) tbl->column_count,
                "Column %d does not exist; column number should be between 0 and %d(including).", col_order[cols_to_output].idx, tbl->column_count - 1);
   }
 
   tbl->cols_to_output = cols_to_output;
-  tbl->column_order = mp_alloc_zero(tbl->pool, sizeof(struct table_col_instance) * cols_to_output);
+  tbl->column_order = mp_alloc(tbl->pool, sizeof(struct table_col_instance) * cols_to_output);
   memcpy(tbl->column_order, col_order, sizeof(struct table_col_instance) * cols_to_output);
   for(uint i = 0; i < cols_to_output; i++) {
-    int col_def_idx = tbl->column_order[i].idx; // this is given in col_order
+    int col_def_idx = tbl->column_order[i].idx; // this is given in arg @col_order
     tbl->column_order[i].col_def = tbl->columns + col_def_idx;
-    tbl->column_order[i].cell_content = NULL; // cell_content is copied from @col_order, so make sure that it is NULL
+    tbl->column_order[i].cell_content = NULL; // cell_content is copied from arg @col_order, so make sure that it is NULL
     tbl->column_order[i].next_column = -1;
-    // tbl->column_order[i].fmt should be untouched (copied from col_order)
+    // tbl->column_order[i].fmt should be untouched (copied from arg @col_order)
   }
 }
 
@@ -215,10 +215,10 @@ const char *table_set_col_opt(struct table *tbl, uint col_inst_idx, const char *
     return col_def->set_col_opt(tbl, col_inst_idx, col_opt);
   }
 
-  if(col_def && col_def->type_def && col_def->type_def->parse_fmt) {
-    uint fmt = 0;
-    const char *tmp_err = col_def->type_def->parse_fmt(col_opt, &fmt, tbl->pool);
-    if(tmp_err) return tmp_err;
+  if(col_def && col_def->type_def) {
+    u32 fmt = 0;
+    const char *tmp_err = xtype_parse_fmt(col_def->type_def, col_opt, &fmt, tbl->pool);
+    if(tmp_err) return mp_printf(tbl->pool, "Invalid column format; xtypes error: '%s'.", tmp_err);
     tbl->column_order[col_inst_idx].fmt = fmt;
     return NULL;
   }
@@ -226,6 +226,11 @@ const char *table_set_col_opt(struct table *tbl, uint col_inst_idx, const char *
   return mp_printf(tbl->pool, "Invalid column format option: '%s' for column %d.", col_opt, col_inst_idx);
 }
 
+/**
+ * the input is a null-terminated string that contains: "<col-name>'['<param1>','<param2>\0
+ * i.e., the ']' is missing and is replaced by \0.
+ * the function replace the '[' by \0 and then parses the rest of the string.
+ **/
 static char **table_parse_col_arg2(char *col_def)
 {
   char * left_br = strchr(col_def, '[');
@@ -245,11 +250,13 @@ static char **table_parse_col_arg2(char *col_def)
     if(*next == 0) break;
     *next = 0;
     next++;
-    *GARY_PUSH(result) = col_opt;
+    if(*col_opt)
+      *GARY_PUSH(result) = col_opt;
 
     col_opt = next;
   }
-  *GARY_PUSH(result) = col_opt;
+  if(*col_opt)
+    *GARY_PUSH(result) = col_opt;
 
   return result;
 }
@@ -292,8 +299,9 @@ const char * table_set_col_order_by_name(struct table *tbl, const char *col_orde
     char *next = strpbrk(name_start, "[,");
     if(next && *next == '[') {
       next = strchr(next, ']');
+      if(!next) return mp_printf(tbl->pool, "Invalid column definition, missing ']'.");
       *next++ = 0;
-      next = *next == 0 ? NULL : next + 1;
+      next = *next == 0 ? NULL : next + 1; // if next points to the last \0 => end the computation
     } else if(next) {
       *next++ = 0;
     }