From 332123f2b6892c09635ba00de8bf20901e224dea Mon Sep 17 00:00:00 2001
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Wed, 26 Oct 2016 20:44:15 +0200
Subject: [PATCH] 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 <sys/termios.h> which is deprecated, use <termios.h> instead" [-W#warnings]

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/probe.c            |  4 ++++
 libblkid/src/read.c             | 32 --------------------------------
 libsmartcols/samples/fromfile.c |  2 +-
 text-utils/pg.c                 |  8 ++++----
 4 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index f2b3f9348..da6720dae 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -740,6 +740,8 @@ int blkid_probe_is_cdrom(blkid_probe pr)
 	return (pr->flags & BLKID_FL_CDROM_DEV);
 }
 
+#ifdef CDROM_GET_CAPABILITY
+
 static int is_sector_readable(int fd, uint64_t sector)
 {
 	char buf[512];
@@ -785,6 +787,8 @@ failed:
 	pr->size = n << 9;
 }
 
+#endif
+
 /**
  * blkid_probe_set_device:
  * @pr: probe
diff --git a/libblkid/src/read.c b/libblkid/src/read.c
index c081baff5..42867735f 100644
--- a/libblkid/src/read.c
+++ b/libblkid/src/read.c
@@ -32,11 +32,6 @@
 # include <stdlib.h>
 #endif
 
-#ifdef TEST_PROGRAM
-#define blkid_debug_dump_dev(dev)	(debug_dump_dev(dev))
-static void debug_dump_dev(blkid_dev dev);
-#endif
-
 /*
  * File format:
  *
@@ -377,8 +372,6 @@ static int blkid_parse_line(blkid_cache cache, blkid_dev *dev_p, char *cp)
 		goto done;
 	}
 
-	/*DBG(READ, blkid_debug_dump_dev(dev));*/
-
 done:
 	return ret;
 }
@@ -452,31 +445,6 @@ errout:
 }
 
 #ifdef TEST_PROGRAM
-static void debug_dump_dev(blkid_dev dev)
-{
-	struct list_head *p;
-
-	if (!dev) {
-		printf("  dev: NULL\n");
-		return;
-	}
-
-	printf("  dev: name = %s\n", dev->bid_name);
-	printf("  dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno);
-	printf("  dev: TIME=\"%ld.%ld\"\n", (long)dev->bid_time, (long)dev->bid_utime);
-	printf("  dev: PRI=\"%d\"\n", dev->bid_pri);
-	printf("  dev: flags = 0x%08X\n", dev->bid_flags);
-
-	list_for_each(p, &dev->bid_tags) {
-		blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
-		if (tag)
-			printf("    tag: %s=\"%s\"\n", tag->bit_name,
-			       tag->bit_val);
-		else
-			printf("    tag: NULL\n");
-	}
-	printf("\n");
-}
 
 int main(int argc, char**argv)
 {
diff --git a/libsmartcols/samples/fromfile.c b/libsmartcols/samples/fromfile.c
index fcf01c749..a2a22a4cd 100644
--- a/libsmartcols/samples/fromfile.c
+++ b/libsmartcols/samples/fromfile.c
@@ -38,7 +38,7 @@ static const struct column_flag flags[] = {
 	{ "none",	0 }
 };
 
-static long name_to_flag(const char *name, long unsigned int namesz)
+static long name_to_flag(const char *name, size_t namesz)
 {
 	size_t i;
 
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 <sys/ioctl.h>
 #endif
-#include <sys/termios.h>
+#include <termios.h>
 #include <fcntl.h>
 #include <regex.h>
 #include <stdio.h>
@@ -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++;