From 332123f2b6892c09635ba00de8bf20901e224dea Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Wed, 26 Oct 2016 20:44:15 +0200 Subject: misc: fix some compiler warnings libsmartcols/samples/fromfile.c:59:2: warning: passing argument 3 of 'string_to_bitmask' from incompatible pointer type text-utils/pg.c:79:0: warning: "TABSIZE" redefined libblkid/src/read.c:455:13: warning: 'debug_dump_dev' defined but not used [-Wunused-function] libblkid/src/probe.c:769:13: warning: unused function 'cdrom_size_correction' [-Wunused-function] /usr/include/sys/termios.h:3:2: warning: "this file includes which is deprecated, use instead" [-W#warnings] Signed-off-by: Ruediger Meier --- text-utils/pg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'text-utils/pg.c') diff --git a/text-utils/pg.c b/text-utils/pg.c index 142e3f1e9..ed62adcfd 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -46,7 +46,7 @@ #ifndef TIOCGWINSZ # include #endif -#include +#include #include #include #include @@ -76,7 +76,7 @@ #define READBUF LINE_MAX /* size of input buffer */ #define CMDBUF 255 /* size of command buffer */ -#define TABSIZE 8 /* spaces consumed by tab character */ +#define PG_TABSIZE 8 /* spaces consumed by tab character */ #define cuc(c) ((c) & 0377) @@ -417,7 +417,7 @@ static char *endline_for_mb(unsigned col, char *s) goto ended; /* Cursor right. */ case L'\t': - pos += TABSIZE - (pos % TABSIZE); + pos += PG_TABSIZE - (pos % PG_TABSIZE); break; default: if (iswprint(*p)) @@ -481,7 +481,7 @@ static char *endline(unsigned col, char *s) goto cend; /* Cursor right. */ case '\t': - pos += TABSIZE - (pos % TABSIZE); + pos += PG_TABSIZE - (pos % PG_TABSIZE); break; default: pos++; -- cgit v1.2.3-55-g7522