Merge branch 'ldadd-cflags-warnings' of https://github.com/rudimeier/util-linux

* 'ldadd-cflags-warnings' of https://github.com/rudimeier/util-linux:
  build-sys: disable unused parameter warnings for some test progs
  misc: fix compiler warnungs (unsigned/signed)
  misc: fix warnings "unused parameter" [-Wunused-parameter]
  libfdisk: fix warnings, "redundant redeclaration" [-Wredundant-decls]
  tests: fix compiler warnings [-Wmissing-prototypes]
  libfdisk: fix compiler warnings [-Wmissing-prototypes]
  libfdisk: fix missing symbol
  libblkid: fix compiler warnings [-Wmissing-prototypes]
  libmount: add mnt_fs_set_priority()
  build-sys: always add AM_CFLAGS
  build-sys: always use global LDADD

2 files changed, 13 insertions, 9 deletions

diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am
index 9c8869208..be74fc393 100644
--- a/libsmartcols/samples/Makemodule.am
+++ b/libsmartcols/samples/Makemodule.am
@@ -5,19 +5,23 @@ check_PROGRAMS += \
 	sample-scols-wrap \
 	sample-scols-continuous
 
+sample_scols_cflags = $(AM_CFLAGS) $(NO_UNUSED_WARN_CFLAGS) \
+                      -I$(ul_libsmartcols_incdir)
+sample_scols_ldadd = $(LDADD) libsmartcols.la
+
 sample_scols_tree_SOURCES = libsmartcols/samples/tree.c
-sample_scols_tree_LDADD = libsmartcols.la libcommon.la
-sample_scols_tree_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_tree_LDADD = $(sample_scols_ldadd) libcommon.la
+sample_scols_tree_CFLAGS = $(sample_scols_cflags)
 
 sample_scols_title_SOURCES = libsmartcols/samples/title.c
-sample_scols_title_LDADD = libsmartcols.la
-sample_scols_title_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_title_LDADD = $(sample_scols_ldadd)
+sample_scols_title_CFLAGS = $(sample_scols_cflags)
 
 sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c
-sample_scols_wrap_LDADD = libsmartcols.la
-sample_scols_wrap_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_wrap_LDADD = $(sample_scols_ldadd)
+sample_scols_wrap_CFLAGS = $(sample_scols_cflags)
 
 sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c
-sample_scols_continuous_LDADD = libsmartcols.la libcommon.la
-sample_scols_continuous_CFLAGS = -I$(ul_libsmartcols_incdir)
+sample_scols_continuous_LDADD = $(sample_scols_ldadd) libcommon.la
+sample_scols_continuous_CFLAGS = $(sample_scols_cflags)
 
diff --git a/libsmartcols/samples/wrap.c b/libsmartcols/samples/wrap.c
index 2a476fbe9..96cdff31c 100644
--- a/libsmartcols/samples/wrap.c
+++ b/libsmartcols/samples/wrap.c
@@ -46,7 +46,7 @@ static char *gen_text(const char *prefix, const char *sub_prefix, char *buf, siz
 {
 	int x = snprintf(buf, sz,  "%s-%s-", prefix, sub_prefix);
 
-	for ( ; x < sz - 1; x++)
+	for ( ; (size_t)x < sz - 1; x++)
 		buf[x] = *prefix;
 
 	buf[x++] = 'x';