RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-25 23:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: string-table: cleanup and enhance formatting capabilities

Browse Source 
Cleanups are for integer types, prototypes and comments.

New functionality: spacing can be set after table allocation as
->spacing, now able to print 1 or 2 spaces between columns.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-11-28 19:50:57 +01:00
parent 99979a53bb
commit 9cae43183e
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/string-table.c
View File

@ -21,12 +21,12 @@
#include "common/string-table.h"
/*
* This function create an array of char * which will represent a table
* Create an array of char* which will point to table cell strings
*/
struct string_table *table_create(int columns, int rows)
struct string_table *table_create(unsigned int columns, unsigned int rows)
{
struct string_table *tab;
int size;
size_t size;
size = sizeof(struct string_table) + rows * columns * sizeof(char*);
tab = calloc(1, size);
@ -36,22 +36,19 @@ struct string_table *table_create(int columns, int rows)
tab->ncols = columns;
tab->nrows = rows;
tab->spacing = STRING_TABLE_SPACING_1;
return tab;
}
/*
* This function is like a vprintf, but store the results in a cell of
* the table.
* If fmt starts with '<', the text is left aligned; if fmt starts with
* '>' the text is right aligned. If fmt is equal to '=' the text will
* be replaced by a '=====' dimensioned on the basis of the column width
* This is like a vprintf, but stores the results in a cell of the table.
*/
__attribute__ ((format (printf, 4, 0)))
char *table_vprintf(struct string_table *tab, int column, int row,
char *table_vprintf(struct string_table *tab, unsigned int column, unsigned int row,
const char *fmt, va_list ap)
{
int idx = tab->ncols * row + column;
unsigned int idx = tab->ncols * row + column;
char *msg = calloc(100, 1);
if (!msg)
@ -66,12 +63,11 @@ char *table_vprintf(struct string_table *tab, int column, int row,
}
/*
* This function is like a printf, but store the results in a cell of
* the table.
* This is like a printf, but stores the results in a cell of the table.
*/
__attribute__ ((format (printf, 4, 5)))
char *table_printf(struct string_table *tab, int column, int row,
const char *fmt, ...)
char *table_printf(struct string_table *tab, unsigned int column, unsigned int row,
const char *fmt, ...)
{
va_list ap;
char *ret;
@ -84,8 +80,13 @@ char *table_printf(struct string_table *tab, int column, int row,
}
/*
* This function dumps the table. Every "=" string will be replaced by
* a "=======" length as the column
* Print the table to stdout, interpret the alignment and expand specifiers.
*
* Formatting:
* <TEXT - the TEXT is left aligned
* >TEXT - the TEXT is right aligned
* = - the cell text will be filled by ===== (column width)
* *C - the cell text will be filled by character C (column width)
*/
void table_dump(struct string_table *tab)
{
@ -127,8 +128,11 @@ void table_dump(struct string_table *tab)
cell[0] == '<' ? -sizes[i] : sizes[i],
cell + 1);
}
if (i != (tab->ncols - 1))
if (i != (tab->ncols - 1)) {
putchar(' ');
if (tab->spacing == STRING_TABLE_SPACING_2)
putchar(' ');
}
}
putchar('\n');
}
@ -139,7 +143,7 @@ void table_dump(struct string_table *tab)
*/
void table_free(struct string_table *tab)
{
int i, count;
unsigned int i, count;
count = tab->ncols * tab->nrows;

19
common/string-table.h
View File

@ -19,18 +19,25 @@
#include <stdarg.h>
enum string_table_spacing {
STRING_TABLE_SPACING_1,
STRING_TABLE_SPACING_2,
};
struct string_table {
int ncols;
int nrows;
unsigned int ncols;
unsigned int nrows;
enum string_table_spacing spacing;
char *cells[];
};
struct string_table *table_create(int columns, int rows);
char *table_printf(struct string_table *tab, int column, int row,
struct string_table *table_create(unsigned int columns, unsigned int rows);
__attribute__ ((format (printf, 4, 0)))
char *table_printf(struct string_table *tab, unsigned int column, unsigned int row,
const char *fmt, ...);
char *table_vprintf(struct string_table *tab, int column, int row,
char *table_vprintf(struct string_table *tab, unsigned int column, unsigned int row,
const char *fmt, va_list ap);
void table_dump(struct string_table *tab);
void table_free(struct string_table *);
void table_free(struct string_table *tab);
#endif