From 850ad2ce35b27476dc80afdf92ac63ad7f1f3571 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 3 Nov 2015 00:51:29 +0100 Subject: [PATCH] btrfs-progs: string table: cleanup, rename single letter variables Exception for indexing variables. Signed-off-by: David Sterba --- string-table.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/string-table.c b/string-table.c index d20e6a8..2d05e4d 100644 --- a/string-table.c +++ b/string-table.c @@ -26,19 +26,19 @@ */ struct string_table *table_create(int columns, int rows) { - struct string_table *p; + struct string_table *tab; int size; size = sizeof(struct string_table) + rows * columns * sizeof(char*); - p = calloc(1, size); + tab = calloc(1, size); - if (!p) + if (!tab) return NULL; - p->ncols = columns; - p->nrows = rows; + tab->ncols = columns; + tab->nrows = rows; - return p; + return tab; } /* @@ -95,36 +95,36 @@ void table_dump(struct string_table *tab) sizes[i] = 0; for (j = 0; j < tab->nrows; j++) { int idx = i + j * tab->ncols; - int s; + int len; if (!tab->cells[idx]) continue; - s = strlen(tab->cells[idx]) - 1; - if (s < 1 || tab->cells[idx][0] == '=') + len = strlen(tab->cells[idx]) - 1; + if (len < 1 || tab->cells[idx][0] == '=') continue; - if (s > sizes[i]) - sizes[i] = s; + if (len > sizes[i]) + sizes[i] = len; } } for (j = 0; j < tab->nrows; j++) { for (i = 0; i < tab->ncols; i++) { int idx = i + j * tab->ncols; - char *s = tab->cells[idx]; + char *cell = tab->cells[idx]; - if (!s || !strlen(s)) { + if (!cell || !strlen(cell)) { printf("%*s", sizes[i], ""); - } else if (s && s[0] == '=') { + } else if (cell && cell[0] == '=') { int k = sizes[i]; while (k--) putchar('='); } else { printf("%*s", - s[0] == '<' ? -sizes[i] : sizes[i], - s + 1); + cell[0] == '<' ? -sizes[i] : sizes[i], + cell + 1); } if (i != (tab->ncols - 1)) putchar(' '); -- 2.7.4