From 0954c7859939b548afab01d11b7bc6288cdbc3ea Mon Sep 17 00:00:00 2001 From: Christof Hanke Date: Wed, 9 Oct 2013 08:01:35 +0200 Subject: [PATCH] tabular_output: move public headers from tabular_output.h to afsutil_prototypes.h Like this, tabular_output.h does not have to be included in any devel-package. Change-Id: I9e3089fe4a65b2a801c45ba513a8f5dc49ce609b Reviewed-on: http://gerrit.openafs.org/10327 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/util/afsutil_prototypes.h | 16 ++++++++++++++++ src/util/tabular_output.h | 31 ++++++------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index f794197..2091164 100644 --- a/src/util/afsutil_prototypes.h +++ b/src/util/afsutil_prototypes.h @@ -142,6 +142,22 @@ extern void LogDesWarning(void); /* sys.c */ +/* tabular_output.c */ +struct util_Table; +extern struct util_Table* util_newTable(int Type, int numColumns, + char **ColumnHeaders, int *ColumnContentTypes, + int *ColumnWidths, int sortByColumn); +extern char ** util_newCellContents(struct util_Table*); +extern int util_printTableHeader(struct util_Table *Table); +extern int util_printTableBody(struct util_Table *Table); +extern int util_printTableFooter(struct util_Table *Table); +extern int util_printTable(struct util_Table *Table); +extern int util_addTableBodyRow(struct util_Table *Table, char **Contents); +extern int util_setTableBodyRow(struct util_Table *Table, int RowIndex, + char **Contents); +extern int util_setTableHeader(struct util_Table *Table, char **Contents); +extern int util_setTableFooter(struct util_Table *Table, char **Contents); +extern int util_freeTable(struct util_Table* Table); /* uuid.c */ extern afs_int32 afs_uuid_equal(afsUUID * u1, afsUUID * u2); diff --git a/src/util/tabular_output.h b/src/util/tabular_output.h index 8a2d706..3c5f540 100644 --- a/src/util/tabular_output.h +++ b/src/util/tabular_output.h @@ -3,37 +3,18 @@ #define UTIL_T_MAX_CELLS 20 #define UTIL_T_MAX_CELLCONTENT_LEN 30 +#define UTIL_T_NUMALLOC_ROW 10 + +#define UTIL_T_CONTENTTYPE_STRING 0 +#define UTIL_T_CONTENTTYPE_NUMERIC 1 + #define UTIL_T_TYPE_ASCII 0 #define UTIL_T_TYPE_CSV 1 #define UTIL_T_TYPE_HTML 2 #define UTIL_T_TYPE_MAX 2 + #define UTIL_T_CELLSEPARATOR '|' #define UTIL_T_ROWSEPARATOR '-' -#define UTIL_T_NUMALLOC_ROW 10 -#define UTIL_T_CONTENTTYPE_STRING 0 -#define UTIL_T_CONTENTTYPE_NUMERIC 1 - -/* private structures */ - -struct util_Table; - -/* public accessor functions */ - - -extern struct util_Table* util_newTable(int Type, int numColumns, - char **ColumnHeaders, int *ColumnContentTypes, - int *ColumnWidths, int sortByColumn); -extern char ** util_newCellContents(struct util_Table*); -extern int util_printTableHeader(struct util_Table *Table); -extern int util_printTableBody(struct util_Table *Table); -extern int util_printTableFooter(struct util_Table *Table); -extern int util_printTable(struct util_Table *Table); -extern int util_addTableBodyRow(struct util_Table *Table, char **Contents); -extern int util_setTableBodyRow(struct util_Table *Table, int RowIndex, - char **Contents); -extern int util_setTableHeader(struct util_Table *Table, char **Contents); -extern int util_setTableFooter(struct util_Table *Table, char **Contents); -extern int util_freeTable(struct util_Table* Table); #define UTIL_T_TYPE_HELP "output-format of table: 0: ASCII, 1: CSV, 2 : HTML" #define UTIL_T_SORT_HELP "table-column to sort" -- 1.9.4