From: Robert Kessl Date: Wed, 2 Jul 2014 11:52:22 +0000 (+0200) Subject: tableprinter: code cleanup X-Git-Tag: v6.1~3^2~127 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=4b547b09c43663dcd2af52dff6196141b61fc410;p=libucw.git tableprinter: code cleanup --- diff --git a/ucw/table-types.h b/ucw/table-types.h index 7b8dec5a..dfdaa2b0 100644 --- a/ucw/table-types.h +++ b/ucw/table-types.h @@ -17,7 +17,6 @@ enum timestamp_format { TIMESTAMP_DATETIME }; - #define COL_TYPE_SIZE COL_TYPE_CUSTOM #define COL_TYPE_TIMESTAMP (COL_TYPE_CUSTOM+1) @@ -30,38 +29,10 @@ extern struct table_user_type table_type_size; #define TBL_COL_SIZE_FMT(_name, _width, _units) { .name = _name, .width = _width, .fmt = "%llu", .type = COL_TYPE_SIZE } #define TBL_COL_TIMESTAMP_FMT(_name, _width, _fmt) { .name = _name, .width = _width, .fmt = "%lld", .type = COL_TYPE_TIMESTAMP } -/* - union { - enum size_units units; - enum timestamp_format ts_fmt; - }; -*/ -/* -#define TBL_COL_SIZE(_name, _width) { .name = _name, .width = _width, .fmt = "%llu", .type = COL_TYPE_SIZE } -#define TBL_COL_TIMESTAMP(_name, _width) { .name = _name, .width = _width, .fmt = "%lld", .type = COL_TYPE_TIMESTAMP } - -#define TBL_COL_SIZE_FMT(_name, _width, _units) { .name = _name, .width = _width, .fmt = "%llu", .type = COL_TYPE_SIZE } -#define TBL_COL_TIMESTAMP_FMT(_name, _width, _fmt) { .name = _name, .width = _width, .fmt = "%lld", .type = COL_TYPE_TIMESTAMP } - -#define TABLE_COL_PROTO(_name_, _type_) void table_col_##_name_(struct table *tbl, int col, _type_ val);\ - void table_col_##_name_##_name(struct table *tbl, const char *col_name, _type_ val);\ - void table_col_##_name_##_fmt(struct table *tbl, int col, _type_ val) FORMAT_CHECK(printf, 3, 0); -//TABLE_COL_PROTO(size, u64); -//TABLE_COL_PROTO(timestamp, u64); -#undef TABLE_COL_PROTO -*/ - void table_col_size_name(struct table *tbl, const char *col_name, u64 val); void table_col_timestamp_name(struct table *tbl, const char * col_name, u64 val); void table_col_size(struct table *tbl, int col, u64 val); void table_col_timestamp(struct table *tbl, int col, u64 val); -//TABLE_COL(size, u64, COL_TYPE_SIZE) -//TABLE_COL_STR(size, u64, COL_TYPE_SIZE) - -//TABLE_COL(timestamp, u64, COL_TYPE_TIMESTAMP) -//TABLE_COL_STR(timestamp, u64, COL_TYPE_TIMESTAMP) - - #endif