From b201f1d86c871f2cf3e9f9f96a6d72f363aa1947 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 22 Feb 2016 19:48:30 +0100 Subject: build-sys: always use global LDADD This was a major showstopper when building on a system where LTLIBINTL libs are needed (e.g. OSX). Maybe there are a few test programs which wouldn't need LDADD ... never mind. Signed-off-by: Ruediger Meier --- libsmartcols/samples/Makemodule.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libsmartcols/samples') diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am index 9c8869208..0a351e3d0 100644 --- a/libsmartcols/samples/Makemodule.am +++ b/libsmartcols/samples/Makemodule.am @@ -6,18 +6,18 @@ check_PROGRAMS += \ sample-scols-continuous sample_scols_tree_SOURCES = libsmartcols/samples/tree.c -sample_scols_tree_LDADD = libsmartcols.la libcommon.la +sample_scols_tree_LDADD = $(LDADD) libsmartcols.la libcommon.la sample_scols_tree_CFLAGS = -I$(ul_libsmartcols_incdir) sample_scols_title_SOURCES = libsmartcols/samples/title.c -sample_scols_title_LDADD = libsmartcols.la +sample_scols_title_LDADD = $(LDADD) libsmartcols.la sample_scols_title_CFLAGS = -I$(ul_libsmartcols_incdir) sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c -sample_scols_wrap_LDADD = libsmartcols.la +sample_scols_wrap_LDADD = $(LDADD) libsmartcols.la sample_scols_wrap_CFLAGS = -I$(ul_libsmartcols_incdir) sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c -sample_scols_continuous_LDADD = libsmartcols.la libcommon.la +sample_scols_continuous_LDADD = $(LDADD) libsmartcols.la libcommon.la sample_scols_continuous_CFLAGS = -I$(ul_libsmartcols_incdir) -- cgit v1.2.3-55-g7522 From b0b54cc582ffc4f4faac2d4ad5cf9028a9eea013 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 22 Feb 2016 20:20:14 +0100 Subject: build-sys: always add AM_CFLAGS We were missing our nice compliler warnings for many programs and libs. See next commits how many trivial and non-trival warnings have to be fixed. Signed-off-by: Ruediger Meier --- disk-utils/Makemodule.am | 4 ++-- lib/Makemodule.am | 28 ++++++++++++++-------------- libblkid/samples/Makemodule.am | 8 ++++---- libblkid/src/Makemodule.am | 1 + libfdisk/src/Makemodule.am | 1 + libmount/src/Makemodule.am | 1 + libsmartcols/samples/Makemodule.am | 8 ++++---- libsmartcols/src/Makemodule.am | 1 + libuuid/src/Makemodule.am | 3 ++- login-utils/Makemodule.am | 2 +- misc-utils/Makemodule.am | 3 ++- text-utils/Makemodule.am | 2 +- 12 files changed, 34 insertions(+), 28 deletions(-) (limited to 'libsmartcols/samples') diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index a2e1994c6..bbdef1d42 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -17,7 +17,7 @@ mkfs_minix_LDADD = $(LDADD) libcommon.la check_PROGRAMS += test_mkfs_minix test_mkfs_minix_SOURCES = $(mkfs_minix_SOURCES) test_mkfs_minix_LDADD = $(mkfs_minix_LDADD) -test_mkfs_minix_CFLAGS = -DTEST_SCRIPT +test_mkfs_minix_CFLAGS = $(AM_CFLAGS) -DTEST_SCRIPT endif @@ -255,7 +255,7 @@ resizepart_LDADD = $(LDADD) libcommon.la partx_SOURCES = \ disk-utils/partx.c \ disk-utils/partx.h -partx_CFLAGS = -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir) +partx_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir) partx_LDADD = $(LDADD) libblkid.la libcommon.la libsmartcols.la endif # BUILD_PARTX diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 152190b78..94e845349 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -77,51 +77,51 @@ check_PROGRAMS += \ endif test_ttyutils_SOURCES = lib/ttyutils.c -test_ttyutils_CFLAGS = -DTEST_PROGRAM +test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_ttyutils_LDADD = $(LDADD) libcommon.la test_blkdev_SOURCES = lib/blkdev.c -test_blkdev_CFLAGS = -DTEST_PROGRAM_BLKDEV +test_blkdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BLKDEV test_blkdev_LDADD = $(LDADD) libcommon.la test_ismounted_SOURCES = lib/ismounted.c -test_ismounted_CFLAGS = -DTEST_PROGRAM +test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_ismounted_LDADD = $(LDADD) libcommon.la test_mangle_SOURCES = lib/mangle.c -test_mangle_CFLAGS = -DTEST_PROGRAM +test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_at_SOURCES = lib/at.c -test_at_CFLAGS = -DTEST_PROGRAM_AT +test_at_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_AT test_strutils_SOURCES = lib/strutils.c -test_strutils_CFLAGS = -DTEST_PROGRAM +test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_colors_SOURCES = lib/colors.c lib/color-names.c -test_colors_CFLAGS = -DTEST_PROGRAM $(TINFO_CFLAGS) +test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM $(TINFO_CFLAGS) test_colors_LDADD = $(LDADD) $(TINFO_LIBS) test_randutils_SOURCES = lib/randutils.c -test_randutils_CFLAGS = -DTEST_PROGRAM +test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_procutils_SOURCES = lib/procutils.c lib/at.c -test_procutils_CFLAGS = -DTEST_PROGRAM +test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM if LINUX test_cpuset_SOURCES = lib/cpuset.c -test_cpuset_CFLAGS = -DTEST_PROGRAM +test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_sysfs_SOURCES = lib/sysfs.c -test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS +test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS test_sysfs_LDADD = $(LDADD) libcommon.la test_pager_SOURCES = lib/pager.c -test_pager_CFLAGS = -DTEST_PROGRAM +test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM endif test_fileutils_SOURCES = lib/fileutils.c -test_fileutils_CFLAGS = -DTEST_PROGRAM +test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_canonicalize_SOURCES = lib/canonicalize.c -test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE +test_canonicalize_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CANONICALIZE diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am index e92049f04..e14d13fec 100644 --- a/libblkid/samples/Makemodule.am +++ b/libblkid/samples/Makemodule.am @@ -7,16 +7,16 @@ check_PROGRAMS += \ sample_mkfs_SOURCES = libblkid/samples/mkfs.c sample_mkfs_LDADD = $(LDADD) libblkid.la -sample_mkfs_CFLAGS = -I$(ul_libblkid_incdir) +sample_mkfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_partitions_SOURCES = libblkid/samples/partitions.c sample_partitions_LDADD = $(LDADD) libblkid.la -sample_partitions_CFLAGS = -I$(ul_libblkid_incdir) +sample_partitions_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_superblocks_SOURCES = libblkid/samples/superblocks.c sample_superblocks_LDADD = $(LDADD) libblkid.la -sample_superblocks_CFLAGS = -I$(ul_libblkid_incdir) +sample_superblocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_topology_SOURCES = libblkid/samples/topology.c sample_topology_LDADD = $(LDADD) libblkid.la -sample_topology_CFLAGS = -I$(ul_libblkid_incdir) +sample_topology_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 5018de492..7d992f5c4 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -117,6 +117,7 @@ libblkid_la_DEPENDENCIES = \ libblkid/src/blkid.h.in libblkid_la_CFLAGS = \ + $(AM_CFLAGS) \ $(SOLIB_CFLAGS) \ -I$(ul_libblkid_incdir) \ -I$(top_srcdir)/libblkid/src diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am index f8a5cb19c..1f607b58d 100644 --- a/libfdisk/src/Makemodule.am +++ b/libfdisk/src/Makemodule.am @@ -35,6 +35,7 @@ nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h libfdisk_la_LIBADD = libcommon.la libuuid.la libfdisk_la_CFLAGS = \ + $(AM_CFLAGS) \ $(SOLIB_CFLAGS) \ -I$(ul_libuuid_incdir) \ -I$(ul_libfdisk_incdir) \ diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index 9ff15823a..460a1fc83 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -48,6 +48,7 @@ libmount_la_LIBADD = \ $(REALTIME_LIBS) libmount_la_CFLAGS = \ + $(AM_CFLAGS) \ $(SOLIB_CFLAGS) \ -I$(ul_libblkid_incdir) \ -I$(ul_libmount_incdir) \ diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am index 0a351e3d0..50c680c43 100644 --- a/libsmartcols/samples/Makemodule.am +++ b/libsmartcols/samples/Makemodule.am @@ -7,17 +7,17 @@ check_PROGRAMS += \ sample_scols_tree_SOURCES = libsmartcols/samples/tree.c sample_scols_tree_LDADD = $(LDADD) libsmartcols.la libcommon.la -sample_scols_tree_CFLAGS = -I$(ul_libsmartcols_incdir) +sample_scols_tree_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) sample_scols_title_SOURCES = libsmartcols/samples/title.c sample_scols_title_LDADD = $(LDADD) libsmartcols.la -sample_scols_title_CFLAGS = -I$(ul_libsmartcols_incdir) +sample_scols_title_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c sample_scols_wrap_LDADD = $(LDADD) libsmartcols.la -sample_scols_wrap_CFLAGS = -I$(ul_libsmartcols_incdir) +sample_scols_wrap_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c sample_scols_continuous_LDADD = $(LDADD) libsmartcols.la libcommon.la -sample_scols_continuous_CFLAGS = -I$(ul_libsmartcols_incdir) +sample_scols_continuous_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am index 257d46dcb..248faa9e0 100644 --- a/libsmartcols/src/Makemodule.am +++ b/libsmartcols/src/Makemodule.am @@ -25,6 +25,7 @@ nodist_libsmartcols_la_SOURCES = libsmartcols/src/smartcolsP.h libsmartcols_la_LIBADD = libcommon.la libsmartcols_la_CFLAGS = \ + $(AM_CFLAGS) \ $(SOLIB_CFLAGS) \ -I$(ul_libsmartcols_incdir) \ -I$(top_srcdir)/libsmartcols/src diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index 0efa803c0..f2f66ba5c 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -2,7 +2,7 @@ check_PROGRAMS += test_uuid_parser test_uuid_parser_SOURCES = libuuid/src/test_uuid.c test_uuid_parser_LDADD = $(LDADD) libuuid.la $(SOCKET_LIBS) -test_uuid_parser_CFLAGS = -I$(ul_libuuid_incdir) +test_uuid_parser_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) # includes uuidincdir = $(includedir)/uuid @@ -31,6 +31,7 @@ libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym libuuid_la_LIBADD = $(SOCKET_LIBS) libuuid_la_CFLAGS = \ + $(AM_CFLAGS) \ $(SOLIB_CFLAGS) \ -I$(ul_libuuid_incdir) \ -Ilibuuid/src diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 8794c262c..502ecd503 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -31,7 +31,7 @@ endif check_PROGRAMS += test_consoles test_consoles_SOURCES = login-utils/sulogin-consoles.c -test_consoles_CFLAGS = -DTEST_PROGRAM +test_consoles_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_consoles_LDADD = $(LDADD) libcommon.la endif # BUILD_SULOGIN diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 8e16b80a2..aa54919bd 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -20,9 +20,10 @@ usrbin_exec_PROGRAMS += logger dist_man_MANS += misc-utils/logger.1 logger_SOURCES = misc-utils/logger.c lib/strutils.c lib/strv.c logger_LDADD = $(LDADD) +logger_CFLAGS = $(AM_CFLAGS) if HAVE_SYSTEMD logger_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) $(SYSTEMD_JOURNAL_LIBS) -logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) +logger_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif check_PROGRAMS += test_logger diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index 957c14370..91295bf98 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -97,7 +97,7 @@ endif check_PROGRAMS += test_more test_more_SOURCES = $(more_SOURCES) -test_more_CFLAGS = -DTEST_PROGRAM +test_more_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM test_more_LDADD = $(more_LDADD) endif # BUILD_MORE -- cgit v1.2.3-55-g7522 From 5fde1d9f066ba794824ae6d8fa44462865a8f5cc Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 22 Feb 2016 23:30:17 +0100 Subject: tests: fix compiler warnings [-Wmissing-prototypes] Signed-off-by: Ruediger Meier --- libblkid/src/dev.c | 2 +- libblkid/src/tag.c | 2 +- libfdisk/src/ask.c | 2 +- libfdisk/src/gpt.c | 4 ++-- libfdisk/src/script.c | 8 ++++---- libfdisk/src/utils.c | 2 +- libfdisk/src/version.c | 2 +- libmount/src/cache.c | 6 +++--- libmount/src/context.c | 8 ++++---- libmount/src/lock.c | 8 ++++---- libmount/src/monitor.c | 8 ++++---- libmount/src/optstr.c | 20 ++++++++++---------- libmount/src/tab.c | 16 ++++++++-------- libmount/src/tab_diff.c | 2 +- libmount/src/utils.c | 22 +++++++++++----------- libmount/src/version.c | 2 +- libsmartcols/samples/wrap.c | 2 +- 17 files changed, 58 insertions(+), 58 deletions(-) (limited to 'libsmartcols/samples') diff --git a/libblkid/src/dev.c b/libblkid/src/dev.c index 9491331ab..99b70b682 100644 --- a/libblkid/src/dev.c +++ b/libblkid/src/dev.c @@ -208,7 +208,7 @@ extern char *optarg; extern int optind; #endif -void __attribute__((__noreturn__)) usage(char *prog) +static void __attribute__((__noreturn__)) usage(char *prog) { fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog); fprintf(stderr, "\tList all devices and exit\n"); diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c index c6bc37678..bfc7bb782 100644 --- a/libblkid/src/tag.c +++ b/libblkid/src/tag.c @@ -397,7 +397,7 @@ extern char *optarg; extern int optind; #endif -void __attribute__((__noreturn__)) usage(char *prog) +static void __attribute__((__noreturn__)) usage(char *prog) { fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " "[type value]\n", diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c index d81ebd76a..595bfe48a 100644 --- a/libfdisk/src/ask.c +++ b/libfdisk/src/ask.c @@ -1002,7 +1002,7 @@ int fdisk_info_new_partition( } #ifdef TEST_PROGRAM -int test_ranges(struct fdisk_test *ts, int argc, char *argv[]) +static int test_ranges(struct fdisk_test *ts, int argc, char *argv[]) { /* 1 - 3, 6, 8, 9, 11 13 */ size_t nums[] = { 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1 }; diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index 6bc0e3f07..c461bb511 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -2807,7 +2807,7 @@ struct fdisk_label *fdisk_new_gpt_label(struct fdisk_context *cxt) } #ifdef TEST_PROGRAM -int test_getattr(struct fdisk_test *ts, int argc, char *argv[]) +static int test_getattr(struct fdisk_test *ts, int argc, char *argv[]) { const char *disk = argv[1]; size_t part = strtoul(argv[2], NULL, 0) - 1; @@ -2829,7 +2829,7 @@ int test_getattr(struct fdisk_test *ts, int argc, char *argv[]) return 0; } -int test_setattr(struct fdisk_test *ts, int argc, char *argv[]) +static int test_setattr(struct fdisk_test *ts, int argc, char *argv[]) { const char *disk = argv[1]; size_t part = strtoul(argv[2], NULL, 0) - 1; diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c index 4022ab565..b80f88e3b 100644 --- a/libfdisk/src/script.c +++ b/libfdisk/src/script.c @@ -1373,7 +1373,7 @@ int fdisk_apply_script(struct fdisk_context *cxt, struct fdisk_script *dp) } #ifdef TEST_PROGRAM -int test_dump(struct fdisk_test *ts, int argc, char *argv[]) +static int test_dump(struct fdisk_test *ts, int argc, char *argv[]) { char *devname = argv[1]; struct fdisk_context *cxt; @@ -1392,7 +1392,7 @@ int test_dump(struct fdisk_test *ts, int argc, char *argv[]) return 0; } -int test_read(struct fdisk_test *ts, int argc, char *argv[]) +static int test_read(struct fdisk_test *ts, int argc, char *argv[]) { char *filename = argv[1]; struct fdisk_script *dp; @@ -1415,7 +1415,7 @@ int test_read(struct fdisk_test *ts, int argc, char *argv[]) return 0; } -int test_stdin(struct fdisk_test *ts, int argc, char *argv[]) +static int test_stdin(struct fdisk_test *ts, int argc, char *argv[]) { char buf[BUFSIZ]; struct fdisk_script *dp; @@ -1450,7 +1450,7 @@ int test_stdin(struct fdisk_test *ts, int argc, char *argv[]) return rc; } -int test_apply(struct fdisk_test *ts, int argc, char *argv[]) +static int test_apply(struct fdisk_test *ts, int argc, char *argv[]) { char *devname = argv[1], *scriptname = argv[2]; struct fdisk_context *cxt; diff --git a/libfdisk/src/utils.c b/libfdisk/src/utils.c index 5feea53f6..8b4d9ed58 100644 --- a/libfdisk/src/utils.c +++ b/libfdisk/src/utils.c @@ -167,7 +167,7 @@ char *fdisk_partname(const char *dev, size_t partno) struct fdisk_label *fdisk_new_dos_label(struct fdisk_context *cxt) { return NULL; } struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt) { return NULL; } -int test_partnames(struct fdisk_test *ts, int argc, char *argv[]) +static int test_partnames(struct fdisk_test *ts, int argc, char *argv[]) { size_t i; const char *disk = argv[1]; diff --git a/libfdisk/src/version.c b/libfdisk/src/version.c index bfbd7c5e3..9d84b4c96 100644 --- a/libfdisk/src/version.c +++ b/libfdisk/src/version.c @@ -91,7 +91,7 @@ int fdisk_get_library_features(const char ***features) } #ifdef TEST_PROGRAM -int test_version(struct fdisk_test *ts, int argc, char *argv[]) +static int test_version(struct fdisk_test *ts, int argc, char *argv[]) { const char *ver; const char **features; diff --git a/libmount/src/cache.c b/libmount/src/cache.c index b9b607bb0..b83706a37 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -720,7 +720,7 @@ char *mnt_resolve_spec(const char *spec, struct libmnt_cache *cache) #ifdef TEST_PROGRAM -int test_resolve_path(struct libmnt_test *ts, int argc, char *argv[]) +static int test_resolve_path(struct libmnt_test *ts, int argc, char *argv[]) { char line[BUFSIZ]; struct libmnt_cache *cache; @@ -743,7 +743,7 @@ int test_resolve_path(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_resolve_spec(struct libmnt_test *ts, int argc, char *argv[]) +static int test_resolve_spec(struct libmnt_test *ts, int argc, char *argv[]) { char line[BUFSIZ]; struct libmnt_cache *cache; @@ -766,7 +766,7 @@ int test_resolve_spec(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_read_tags(struct libmnt_test *ts, int argc, char *argv[]) +static int test_read_tags(struct libmnt_test *ts, int argc, char *argv[]) { char line[BUFSIZ]; struct libmnt_cache *cache; diff --git a/libmount/src/context.c b/libmount/src/context.c index 7b965a07f..e26135fb0 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -2412,7 +2412,7 @@ static void lock_fallback(void) mnt_unlock_file(lock); } -int test_mount(struct libmnt_test *ts, int argc, char *argv[]) +static int test_mount(struct libmnt_test *ts, int argc, char *argv[]) { int idx = 1, rc = 0; struct libmnt_context *cxt; @@ -2462,7 +2462,7 @@ int test_mount(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_umount(struct libmnt_test *ts, int argc, char *argv[]) +static int test_umount(struct libmnt_test *ts, int argc, char *argv[]) { int idx = 1, rc = 0; struct libmnt_context *cxt; @@ -2517,7 +2517,7 @@ err: return rc; } -int test_flags(struct libmnt_test *ts, int argc, char *argv[]) +static int test_flags(struct libmnt_test *ts, int argc, char *argv[]) { int idx = 1, rc = 0; struct libmnt_context *cxt; @@ -2555,7 +2555,7 @@ int test_flags(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_mountall(struct libmnt_test *ts, int argc, char *argv[]) +static int test_mountall(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_context *cxt; struct libmnt_iter *itr; diff --git a/libmount/src/lock.c b/libmount/src/lock.c index 0d943295a..4076a23f2 100644 --- a/libmount/src/lock.c +++ b/libmount/src/lock.c @@ -566,7 +566,7 @@ struct libmnt_lock *lock; * read number from @filename, increment the number and * write the number back to the file */ -void increment_data(const char *filename, int verbose, int loopno) +static void increment_data(const char *filename, int verbose, int loopno) { long num; FILE *f; @@ -594,7 +594,7 @@ void increment_data(const char *filename, int verbose, int loopno) filename, num - 1, num, loopno); } -void clean_lock(void) +static void clean_lock(void) { if (!lock) return; @@ -602,12 +602,12 @@ void clean_lock(void) mnt_free_lock(lock); } -void __attribute__((__noreturn__)) sig_handler(int sig) +static void __attribute__((__noreturn__)) sig_handler(int sig) { errx(EXIT_FAILURE, "\n%d: catch signal: %s\n", getpid(), strsignal(sig)); } -int test_lock(struct libmnt_test *ts, int argc, char *argv[]) +static int test_lock(struct libmnt_test *ts, int argc, char *argv[]) { time_t synctime = 0; unsigned int usecs; diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c index 9bc7ea32a..a71f2f503 100644 --- a/libmount/src/monitor.c +++ b/libmount/src/monitor.c @@ -863,7 +863,7 @@ err: /* * create a monitor and add the monitor fd to epoll */ -int __test_epoll(struct libmnt_test *ts, int argc, char *argv[], int cleanup) +static int __test_epoll(struct libmnt_test *ts, int argc, char *argv[], int cleanup) { int fd, efd = -1, rc = -1; struct epoll_event ev; @@ -927,12 +927,12 @@ done: /* * create a monitor and add the monitor fd to epoll */ -int test_epoll(struct libmnt_test *ts, int argc, char *argv[]) +static int test_epoll(struct libmnt_test *ts, int argc, char *argv[]) { return __test_epoll(ts, argc, argv, 0); } -int test_epoll_cleanup(struct libmnt_test *ts, int argc, char *argv[]) +static int test_epoll_cleanup(struct libmnt_test *ts, int argc, char *argv[]) { return __test_epoll(ts, argc, argv, 1); } @@ -940,7 +940,7 @@ int test_epoll_cleanup(struct libmnt_test *ts, int argc, char *argv[]) /* * create a monitor and wait for a change */ -int test_wait(struct libmnt_test *ts, int argc, char *argv[]) +static int test_wait(struct libmnt_test *ts, int argc, char *argv[]) { const char *filename; struct libmnt_monitor *mn = create_test_monitor(argc, argv); diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c index 9b21e63b1..b342b5f07 100644 --- a/libmount/src/optstr.c +++ b/libmount/src/optstr.c @@ -1081,7 +1081,7 @@ int mnt_optstr_fix_user(char **optstr) #ifdef TEST_PROGRAM -int test_append(struct libmnt_test *ts, int argc, char *argv[]) +static int test_append(struct libmnt_test *ts, int argc, char *argv[]) { const char *value = NULL, *name; char *optstr; @@ -1102,7 +1102,7 @@ int test_append(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_prepend(struct libmnt_test *ts, int argc, char *argv[]) +static int test_prepend(struct libmnt_test *ts, int argc, char *argv[]) { const char *value = NULL, *name; char *optstr; @@ -1123,7 +1123,7 @@ int test_prepend(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_split(struct libmnt_test *ts, int argc, char *argv[]) +static int test_split(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr, *user = NULL, *fs = NULL, *vfs = NULL; int rc; @@ -1147,7 +1147,7 @@ int test_split(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_flags(struct libmnt_test *ts, int argc, char *argv[]) +static int test_flags(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr; int rc; @@ -1173,7 +1173,7 @@ int test_flags(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_apply(struct libmnt_test *ts, int argc, char *argv[]) +static int test_apply(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr; int rc, map; @@ -1203,7 +1203,7 @@ int test_apply(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_set(struct libmnt_test *ts, int argc, char *argv[]) +static int test_set(struct libmnt_test *ts, int argc, char *argv[]) { const char *value = NULL, *name; char *optstr; @@ -1224,7 +1224,7 @@ int test_set(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_get(struct libmnt_test *ts, int argc, char *argv[]) +static int test_get(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr; const char *name; @@ -1253,7 +1253,7 @@ int test_get(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_remove(struct libmnt_test *ts, int argc, char *argv[]) +static int test_remove(struct libmnt_test *ts, int argc, char *argv[]) { const char *name; char *optstr; @@ -1271,7 +1271,7 @@ int test_remove(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_dedup(struct libmnt_test *ts, int argc, char *argv[]) +static int test_dedup(struct libmnt_test *ts, int argc, char *argv[]) { const char *name; char *optstr; @@ -1289,7 +1289,7 @@ int test_dedup(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_fix(struct libmnt_test *ts, int argc, char *argv[]) +static int test_fix(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr; int rc = 0; diff --git a/libmount/src/tab.c b/libmount/src/tab.c index f9d8b064f..102ed258d 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -1608,7 +1608,7 @@ static int parser_errcb(struct libmnt_table *tb, const char *filename, int line) return 1; /* all errors are recoverable -- this is the default */ } -struct libmnt_table *create_table(const char *file, int comments) +static struct libmnt_table *create_table(const char *file, int comments) { struct libmnt_table *tb; @@ -1630,7 +1630,7 @@ err: return NULL; } -int test_copy_fs(struct libmnt_test *ts, int argc, char *argv[]) +static int test_copy_fs(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_table *tb; struct libmnt_fs *fs; @@ -1660,7 +1660,7 @@ done: return rc; } -int test_parse(struct libmnt_test *ts, int argc, char *argv[]) +static int test_parse(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_table *tb = NULL; struct libmnt_iter *itr = NULL; @@ -1696,7 +1696,7 @@ done: return rc; } -int test_find(struct libmnt_test *ts, int argc, char *argv[], int dr) +static int test_find(struct libmnt_test *ts, int argc, char *argv[], int dr) { struct libmnt_table *tb; struct libmnt_fs *fs = NULL; @@ -1738,17 +1738,17 @@ done: return rc; } -int test_find_bw(struct libmnt_test *ts, int argc, char *argv[]) +static int test_find_bw(struct libmnt_test *ts, int argc, char *argv[]) { return test_find(ts, argc, argv, MNT_ITER_BACKWARD); } -int test_find_fw(struct libmnt_test *ts, int argc, char *argv[]) +static int test_find_fw(struct libmnt_test *ts, int argc, char *argv[]) { return test_find(ts, argc, argv, MNT_ITER_FORWARD); } -int test_find_pair(struct libmnt_test *ts, int argc, char *argv[]) +static int test_find_pair(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_table *tb; struct libmnt_fs *fs; @@ -1775,7 +1775,7 @@ done: return rc; } -int test_find_mountpoint(struct libmnt_test *ts, int argc, char *argv[]) +static int test_find_mountpoint(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_table *tb; struct libmnt_fs *fs; diff --git a/libmount/src/tab_diff.c b/libmount/src/tab_diff.c index 2d178d10f..7cf9e57ef 100644 --- a/libmount/src/tab_diff.c +++ b/libmount/src/tab_diff.c @@ -303,7 +303,7 @@ done: #ifdef TEST_PROGRAM -int test_diff(struct libmnt_test *ts, int argc, char *argv[]) +static int test_diff(struct libmnt_test *ts, int argc, char *argv[]) { struct libmnt_table *tb_old = NULL, *tb_new = NULL; struct libmnt_tabdiff *diff = NULL; diff --git a/libmount/src/utils.c b/libmount/src/utils.c index 50cca0671..5a62879a4 100644 --- a/libmount/src/utils.c +++ b/libmount/src/utils.c @@ -1096,7 +1096,7 @@ char *mnt_get_kernel_cmdline_option(const char *name) } #ifdef TEST_PROGRAM -int test_match_fstype(struct libmnt_test *ts, int argc, char *argv[]) +static int test_match_fstype(struct libmnt_test *ts, int argc, char *argv[]) { char *type = argv[1]; char *pattern = argv[2]; @@ -1105,7 +1105,7 @@ int test_match_fstype(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_match_options(struct libmnt_test *ts, int argc, char *argv[]) +static int test_match_options(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr = argv[1]; char *pattern = argv[2]; @@ -1114,7 +1114,7 @@ int test_match_options(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_startswith(struct libmnt_test *ts, int argc, char *argv[]) +static int test_startswith(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr = argv[1]; char *pattern = argv[2]; @@ -1123,7 +1123,7 @@ int test_startswith(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_endswith(struct libmnt_test *ts, int argc, char *argv[]) +static int test_endswith(struct libmnt_test *ts, int argc, char *argv[]) { char *optstr = argv[1]; char *pattern = argv[2]; @@ -1132,7 +1132,7 @@ int test_endswith(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_appendstr(struct libmnt_test *ts, int argc, char *argv[]) +static int test_appendstr(struct libmnt_test *ts, int argc, char *argv[]) { char *str = strdup(argv[1]); const char *ap = argv[2]; @@ -1144,7 +1144,7 @@ int test_appendstr(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_mountpoint(struct libmnt_test *ts, int argc, char *argv[]) +static int test_mountpoint(struct libmnt_test *ts, int argc, char *argv[]) { char *path = canonicalize_path(argv[1]), *mnt = path ? mnt_get_mountpoint(path) : NULL; @@ -1155,7 +1155,7 @@ int test_mountpoint(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_filesystems(struct libmnt_test *ts, int argc, char *argv[]) +static int test_filesystems(struct libmnt_test *ts, int argc, char *argv[]) { char **filesystems = NULL; int rc; @@ -1170,7 +1170,7 @@ int test_filesystems(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_chdir(struct libmnt_test *ts, int argc, char *argv[]) +static int test_chdir(struct libmnt_test *ts, int argc, char *argv[]) { int rc; char *path = canonicalize_path(argv[1]), @@ -1189,7 +1189,7 @@ int test_chdir(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_kernel_cmdline(struct libmnt_test *ts, int argc, char *argv[]) +static int test_kernel_cmdline(struct libmnt_test *ts, int argc, char *argv[]) { char *name = argv[1]; char *res; @@ -1207,7 +1207,7 @@ int test_kernel_cmdline(struct libmnt_test *ts, int argc, char *argv[]) return 0; } -int test_mkdir(struct libmnt_test *ts, int argc, char *argv[]) +static int test_mkdir(struct libmnt_test *ts, int argc, char *argv[]) { int rc; @@ -1219,7 +1219,7 @@ int test_mkdir(struct libmnt_test *ts, int argc, char *argv[]) return rc; } -int test_statfs_type(struct libmnt_test *ts, int argc, char *argv[]) +static int test_statfs_type(struct libmnt_test *ts, int argc, char *argv[]) { struct statfs vfs; int rc; diff --git a/libmount/src/version.c b/libmount/src/version.c index b9902b9d9..2d30954bb 100644 --- a/libmount/src/version.c +++ b/libmount/src/version.c @@ -105,7 +105,7 @@ int mnt_get_library_features(const char ***features) } #ifdef TEST_PROGRAM -int test_version(struct libmnt_test *ts, int argc, char *argv[]) +static int test_version(struct libmnt_test *ts, int argc, char *argv[]) { const char *ver; const char **features; 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'; -- cgit v1.2.3-55-g7522 From 2013b33f40cbd88def30725da84e4dff2f534632 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Tue, 23 Feb 2016 03:15:23 +0100 Subject: build-sys: disable unused parameter warnings for some test progs Signed-off-by: Ruediger Meier --- configure.ac | 2 ++ libfdisk/src/Makemodule.am | 2 +- libmount/src/Makemodule.am | 2 +- libsmartcols/samples/Makemodule.am | 20 ++++++++++++-------- text-utils/Makemodule.am | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) (limited to 'libsmartcols/samples') diff --git a/configure.ac b/configure.ac index 961c1ab84..7b6a9e725 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,8 @@ AC_SUBST([WARN_CFLAGS]) UL_WARN_ADD([-Wno-clobbered], [BSD_WARN_CFLAGS]) AC_SUBST([BSD_WARN_CFLAGS]) +UL_WARN_ADD([-Wno-unused-parameter], [NO_UNUSED_WARN_CFLAGS]) +AC_SUBST([NO_UNUSED_WARN_CFLAGS]) dnl libtool-2 LT_INIT diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am index 1f607b58d..fddf6d990 100644 --- a/libfdisk/src/Makemodule.am +++ b/libfdisk/src/Makemodule.am @@ -72,7 +72,7 @@ check_PROGRAMS += \ test_fdisk_utils \ test_fdisk_version -libfdisk_tests_cflags = -DTEST_PROGRAM $(libfdisk_la_CFLAGS) +libfdisk_tests_cflags = -DTEST_PROGRAM $(libfdisk_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS) libfdisk_tests_ldflags = libuuid.la -static libfdisk_tests_ldadd = $(LDADD) libfdisk.la $(UUID_LIBS) diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index 460a1fc83..b07a931d4 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -85,7 +85,7 @@ check_PROGRAMS += \ test_mount_monitor \ test_mount_debug -libmount_tests_cflags = -DTEST_PROGRAM $(libmount_la_CFLAGS) +libmount_tests_cflags = -DTEST_PROGRAM $(libmount_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS) libmount_tests_ldflags = libblkid.la -static libmount_tests_ldadd = $(LDADD) libmount.la $(UUID_LIBS) $(REALTIME_LIBS) diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am index 50c680c43..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 = $(LDADD) libsmartcols.la libcommon.la -sample_scols_tree_CFLAGS = $(AM_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 = $(LDADD) libsmartcols.la -sample_scols_title_CFLAGS = $(AM_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 = $(LDADD) libsmartcols.la -sample_scols_wrap_CFLAGS = $(AM_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 = $(LDADD) libsmartcols.la libcommon.la -sample_scols_continuous_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) +sample_scols_continuous_LDADD = $(sample_scols_ldadd) libcommon.la +sample_scols_continuous_CFLAGS = $(sample_scols_cflags) diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index 91295bf98..e42704dfe 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -97,7 +97,7 @@ endif check_PROGRAMS += test_more test_more_SOURCES = $(more_SOURCES) -test_more_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM +test_more_CFLAGS = -DTEST_PROGRAM $(more_CFLAGS) test_more_LDADD = $(more_LDADD) endif # BUILD_MORE -- cgit v1.2.3-55-g7522