diff options
50 files changed, 175 insertions, 158 deletions
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/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/disk-utils/partx.c b/disk-utils/partx.c index ffc74d698..f01cf22c5 100644 --- a/disk-utils/partx.c +++ b/disk-utils/partx.c @@ -137,7 +137,7 @@ static void assoc_loopdev(const char *fname) static inline int get_column_id(int num) { assert(ARRAY_SIZE(columns) == NCOLS); - assert(num < ncolumns); + assert((size_t)num < ncolumns); assert(columns[num] < (int) NCOLS); return columns[num]; } @@ -548,7 +548,7 @@ static int add_scols_line(struct libscols_table *table, blkid_partition par) return -ENOMEM; } - for (i = 0; i < ncolumns; i++) { + for (i = 0; (size_t)i < ncolumns; i++) { char *str = NULL; /* allocated string */ const char *cstr = NULL; /* foreign string */ @@ -637,7 +637,7 @@ static int show_parts(blkid_partlist ls, int scols_flags, int lower, int upper) scols_table_enable_export(table, !!(scols_flags & PARTX_EXPORT)); scols_table_enable_noheadings(table, !!(scols_flags & PARTX_NOHEADINGS)); - for (i = 0; i < ncolumns; i++) { + for (i = 0; (size_t)i < ncolumns; i++) { struct colinfo *col = get_column_info(i); if (!scols_table_new_column(table, col->name, col->whint, col->flags)) { diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 8e1fea25e..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_LDADD = libcommon.la +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_LDADD = libcommon.la +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_LDADD = libcommon.la +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_LDADD = libcommon.la +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 0ffbf1477..e14d13fec 100644 --- a/libblkid/samples/Makemodule.am +++ b/libblkid/samples/Makemodule.am @@ -6,17 +6,17 @@ check_PROGRAMS += \ sample-topology sample_mkfs_SOURCES = libblkid/samples/mkfs.c -sample_mkfs_LDADD = libblkid.la -sample_mkfs_CFLAGS = -I$(ul_libblkid_incdir) +sample_mkfs_LDADD = $(LDADD) libblkid.la +sample_mkfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_partitions_SOURCES = libblkid/samples/partitions.c -sample_partitions_LDADD = libblkid.la -sample_partitions_CFLAGS = -I$(ul_libblkid_incdir) +sample_partitions_LDADD = $(LDADD) libblkid.la +sample_partitions_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_superblocks_SOURCES = libblkid/samples/superblocks.c -sample_superblocks_LDADD = libblkid.la -sample_superblocks_CFLAGS = -I$(ul_libblkid_incdir) +sample_superblocks_LDADD = $(LDADD) libblkid.la +sample_superblocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) sample_topology_SOURCES = libblkid/samples/topology.c -sample_topology_LDADD = libblkid.la -sample_topology_CFLAGS = -I$(ul_libblkid_incdir) +sample_topology_LDADD = $(LDADD) libblkid.la +sample_topology_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 1d03d92d6..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 @@ -158,7 +159,7 @@ blkid_tests_ldadd = libblkid.la if BUILD_LIBUUID blkid_tests_ldflags += libuuid.la -blkid_tests_ldadd += $(UUID_LIBS) +blkid_tests_ldadd += $(LDADD) $(UUID_LIBS) endif blkid_tests_ldflags += -static 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/partitions/partitions.c b/libblkid/src/partitions/partitions.c index 0b5e68099..c8e0bfeb0 100644 --- a/libblkid/src/partitions/partitions.c +++ b/libblkid/src/partitions/partitions.c @@ -481,7 +481,7 @@ int blkid_partlist_increment_partno(blkid_partlist ls) } /* allows to set "parent" for the next nested partition */ -int blkid_partlist_set_parent(blkid_partlist ls, blkid_partition par) +static int blkid_partlist_set_parent(blkid_partlist ls, blkid_partition par) { if (!ls) return -1; @@ -537,7 +537,7 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id, uint64_t off; int rc = BLKID_PROBE_NONE; /* default is nothing */ - if (pr->size <= 0 || (id->minsz && id->minsz > pr->size)) + if (pr->size <= 0 || (id->minsz && (unsigned)id->minsz > pr->size)) goto nothing; /* the device is too small */ if (pr->flags & BLKID_FL_NOSCAN_DEV) goto nothing; @@ -1040,7 +1040,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno if (partno != blkid_partition_get_partno(par)) continue; - if (size == blkid_partition_get_size(par) || + if (size == (uint64_t)blkid_partition_get_size(par) || (blkid_partition_is_extended(par) && size <= 1024ULL)) return par; @@ -1053,12 +1053,12 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno for (i = 0; i < ls->nparts; i++) { blkid_partition par = &ls->parts[i]; - if (blkid_partition_get_start(par) == start && - blkid_partition_get_size(par) == size) + if ((uint64_t)blkid_partition_get_start(par) == start && + (uint64_t)blkid_partition_get_size(par) == size) return par; /* exception for extended dos partitions */ - if (blkid_partition_get_start(par) == start && + if ((uint64_t)blkid_partition_get_start(par) == start && blkid_partition_is_extended(par) && size <= 1024ULL) return par; @@ -1196,7 +1196,7 @@ blkid_partition blkid_parttable_get_parent(blkid_parttable tab) */ blkid_loff_t blkid_parttable_get_offset(blkid_parttable tab) { - return tab ? tab->offset : -1; + return tab ? (blkid_loff_t)tab->offset : -1; } /** @@ -1407,7 +1407,7 @@ int blkid_partition_get_partno(blkid_partition par) */ blkid_loff_t blkid_partition_get_start(blkid_partition par) { - return par ? par->start : -1; + return par ? (blkid_loff_t)par->start : -1; } /** @@ -1428,7 +1428,7 @@ blkid_loff_t blkid_partition_get_start(blkid_partition par) */ blkid_loff_t blkid_partition_get_size(blkid_partition par) { - return par ? par->size : -1; + return par ? (blkid_loff_t)par->size : -1; } /** diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 5f15b0981..cc4586bf2 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -390,7 +390,7 @@ static const char *blkid_probe_get_probername(blkid_probe pr) { struct blkid_chain *chn = blkid_probe_get_chain(pr); - if (chn && chn->idx >= 0 && chn->idx < chn->driver->nidinfos) + if (chn && chn->idx >= 0 && (unsigned)chn->idx < chn->driver->nidinfos) return chn->driver->idinfos[chn->idx]->name; return NULL; @@ -904,7 +904,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd, else if (S_ISREG(sb.st_mode)) devsiz = sb.st_size; /* regular file */ - pr->size = size ? size : devsiz; + pr->size = size ? (uint64_t)size : devsiz; if (off && size == 0) /* only offset without size specified */ @@ -1218,7 +1218,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) offset, offset, len, chn->driver->name, chn->idx, dryrun ? "yes" : "not")); l = blkid_llseek(fd, offset, SEEK_SET); - if (l == (off_t) -1) + if ((blkid_loff_t)l == (off_t) -1) return -1; memset(buf, 0, len); diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c index d099467a2..8991c6b9f 100644 --- a/libblkid/src/superblocks/iso9660.c +++ b/libblkid/src/superblocks/iso9660.c @@ -19,6 +19,7 @@ #include <ctype.h> #include "superblocks.h" +#include "iso9660.h" struct iso9660_date { unsigned char year[4]; diff --git a/libblkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c index dee293b41..e6b496a35 100644 --- a/libblkid/src/superblocks/linux_raid.c +++ b/libblkid/src/superblocks/linux_raid.c @@ -148,11 +148,11 @@ static int probe_raid0(blkid_probe pr, uint64_t off) size <<= 10; /* convert KiB to bytes */ - if (pr->size < 0 || (uint64_t) pr->size < size + MD_RESERVED_BYTES) + if (pr->size < size + MD_RESERVED_BYTES) /* device is too small */ return 1; - if (off < 0 || (uint64_t) off < size) + if (off < size) /* no space before superblock */ return 1; @@ -212,7 +212,7 @@ static int probe_raid1(blkid_probe pr, off_t off) return 0; } -int probe_raid(blkid_probe pr, +static int probe_raid(blkid_probe pr, const struct blkid_idmag *mag __attribute__((__unused__))) { const char *ver = NULL; diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c index cb8b84f3a..d350f8978 100644 --- a/libblkid/src/superblocks/minix.c +++ b/libblkid/src/superblocks/minix.c @@ -71,7 +71,8 @@ static int get_minix_version(const unsigned char *data, int *other_endian) return version; } -static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag) +static int probe_minix(blkid_probe pr, + const struct blkid_idmag *mag __attribute__((__unused__))) { unsigned char *ext; const unsigned char *data; diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c index 011ad9521..d12472c7e 100644 --- a/libblkid/src/superblocks/nilfs.c +++ b/libblkid/src/superblocks/nilfs.c @@ -89,7 +89,8 @@ static int nilfs_valid_sb(blkid_probe pr, struct nilfs_super_block *sb, int is_b return blkid_probe_verify_csum(pr, crc, le32_to_cpu(sb->s_sum)); } -static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) +static int probe_nilfs2(blkid_probe pr, + const struct blkid_idmag *mag __attribute__((__unused__))) { struct nilfs_super_block *sb, *sbp, *sbb; int valid[2], swp = 0; diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c index 2b850305d..987a647d5 100644 --- a/libblkid/src/superblocks/superblocks.c +++ b/libblkid/src/superblocks/superblocks.c @@ -372,7 +372,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn) continue; } - if (id->minsz && id->minsz > pr->size) { + if (id->minsz && (unsigned)id->minsz > pr->size) { rc = BLKID_PROBE_NONE; continue; /* the device is too small */ } diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c index 50a71c9cf..a4f598dfb 100644 --- a/libblkid/src/superblocks/vfat.c +++ b/libblkid/src/superblocks/vfat.c @@ -262,6 +262,9 @@ static int fat_valid_superblock(blkid_probe pr, return 1; /* valid */ } +/* function prototype to avoid warnings (duplicate in partitions/dos.c) */ +extern int blkid_probe_is_vfat(blkid_probe pr); + /* * This function is used by MBR partition table parser to avoid * misinterpretation of FAT filesystem. diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c index d13c849e1..01e9cda82 100644 --- a/libblkid/src/superblocks/xfs.c +++ b/libblkid/src/superblocks/xfs.c @@ -138,7 +138,7 @@ static int xfs_verify_sb(struct xfs_super_block *ondisk) sbp->sb_blocksize > XFS_MAX_BLOCKSIZE || sbp->sb_blocklog < XFS_MIN_BLOCKSIZE_LOG || sbp->sb_blocklog > XFS_MAX_BLOCKSIZE_LOG || - sbp->sb_blocksize != (1 << sbp->sb_blocklog) || + sbp->sb_blocksize != (1ULL << sbp->sb_blocklog) || sbp->sb_inodesize < XFS_DINODE_MIN_SIZE || sbp->sb_inodesize > XFS_DINODE_MAX_SIZE || sbp->sb_inodelog < XFS_DINODE_MIN_LOG || @@ -241,7 +241,8 @@ static int xlog_valid_rec_header(struct xlog_rec_header *rhead) } /* xlog record header will be in some sector in the first 256k */ -static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag) +static int probe_xfs_log(blkid_probe pr, + const struct blkid_idmag *mag __attribute__((__unused__))) { int i; struct xlog_rec_header *rhead; diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c index c505a7204..f44fe528f 100644 --- a/libblkid/src/superblocks/zfs.c +++ b/libblkid/src/superblocks/zfs.c @@ -199,7 +199,8 @@ static int find_uberblocks(const void *label, loff_t *ub_offset, int *swap_endia /* ZFS has 128x1kB host-endian root blocks, stored in 2 areas at the start * of the disk, and 2 areas at the end of the disk. Check only some of them... * #4 (@ 132kB) is the first one written on a new filesystem. */ -static int probe_zfs(blkid_probe pr, const struct blkid_idmag *mag) +static int probe_zfs(blkid_probe pr, + const struct blkid_idmag *mag __attribute__((__unused__))) { int swab_endian = 0; struct zfs_uberblock *ub; 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/Makemodule.am b/libfdisk/src/Makemodule.am index 69a3f3e34..fddf6d990 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) \ @@ -71,9 +72,9 @@ 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 = libfdisk.la $(UUID_LIBS) +libfdisk_tests_ldadd = $(LDADD) libfdisk.la $(UUID_LIBS) if BUILD_LIBBLKID libfdisk_tests_ldflags += libblkid.la diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c index d81ebd76a..7d55b5488 100644 --- a/libfdisk/src/ask.c +++ b/libfdisk/src/ask.c @@ -361,7 +361,7 @@ static char *mk_string_list(char *ptr, size_t *len, size_t *begin, return ptr; } - if (*begin + *run == cur) { /* no gap, continue */ + if (*begin + *run == (size_t)cur) { /* no gap, continue */ (*run)++; return ptr; } @@ -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/context.c b/libfdisk/src/context.c index 7383c8879..88b9f8afb 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c @@ -432,7 +432,7 @@ int fdisk_is_labeltype(struct fdisk_context *cxt, enum fdisk_labeltype id) { assert(cxt); - return cxt->label && fdisk_label_get_type(cxt->label) == id; + return cxt->label && (unsigned)fdisk_label_get_type(cxt->label) == id; } /** @@ -715,7 +715,7 @@ int fdisk_is_readonly(struct fdisk_context *cxt) */ void fdisk_unref_context(struct fdisk_context *cxt) { - int i; + unsigned i; if (!cxt) return; @@ -1057,7 +1057,7 @@ int fdisk_set_size_unit(struct fdisk_context *cxt, int unit) * * Returns: unit */ -int fdisk_get_size_units(struct fdisk_context *cxt) +int fdisk_get_size_unit(struct fdisk_context *cxt) { assert(cxt); return cxt->sizeunit; diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c index c04ee7106..2f3a37bcb 100644 --- a/libfdisk/src/dos.c +++ b/libfdisk/src/dos.c @@ -985,7 +985,7 @@ static fdisk_sector_t get_possible_last(struct fdisk_context *cxt, size_t n) * last[] are fill_bounds() results */ static fdisk_sector_t get_unused_last(struct fdisk_context *cxt, size_t n, fdisk_sector_t start, - fdisk_sector_t first[], fdisk_sector_t last[]) + fdisk_sector_t first[]) { size_t i; fdisk_sector_t limit = get_possible_last(cxt, n); @@ -1127,7 +1127,7 @@ static int add_partition(struct fdisk_context *cxt, size_t n, } } - limit = get_unused_last(cxt, n, start, first, last); + limit = get_unused_last(cxt, n, start, first); if (start > limit) { fdisk_warnx(cxt, _("No free sectors available.")); @@ -1788,7 +1788,7 @@ static int dos_locate_disklabel(struct fdisk_context *cxt, int n, break; default: /* extended partitions */ - if (n - 1 + 4 < cxt->label->nparts_max) { + if ((size_t)n - 1 + 4 < cxt->label->nparts_max) { struct pte *pe = self_pte(cxt, n - 1 + 4); assert(pe->private_sectorbuffer); diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h index 494eda989..85c38492a 100644 --- a/libfdisk/src/fdiskP.h +++ b/libfdisk/src/fdiskP.h @@ -391,11 +391,6 @@ struct fdisk_context { int fdisk_wipe_collisions(struct fdisk_context *cxt); -/* partition.c */ -int fdisk_partition_next_partno(struct fdisk_partition *pa, - struct fdisk_context *cxt, - size_t *n); - /* context.c */ extern int __fdisk_switch_label(struct fdisk_context *cxt, struct fdisk_label *lb); @@ -415,7 +410,6 @@ extern void fdisk_zeroize_device_properties(struct fdisk_context *cxt); extern int fdisk_init_firstsector_buffer(struct fdisk_context *cxt, unsigned int protect_off, unsigned int protect_size); extern int fdisk_read_firstsector(struct fdisk_context *cxt); -extern char *fdisk_partname(const char *dev, size_t partno); /* label.c */ extern int fdisk_probe_labels(struct fdisk_context *cxt); diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index 6bc0e3f07..f795b35a2 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -810,7 +810,7 @@ static ssize_t read_lba(struct fdisk_context *cxt, uint64_t lba, if (lseek(cxt->dev_fd, offset, SEEK_SET) == (off_t) -1) return -1; - return read(cxt->dev_fd, buffer, bytes) != bytes; + return (size_t)read(cxt->dev_fd, buffer, bytes) != bytes; } @@ -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 ac3ca5cbb..3ca3f597f 100644 --- a/libfdisk/src/script.c +++ b/libfdisk/src/script.c @@ -40,7 +40,7 @@ struct fdisk_script { }; -static void fdisk_script_free_header(struct fdisk_script *dp, struct fdisk_scriptheader *fi) +static void fdisk_script_free_header(struct fdisk_scriptheader *fi) { if (!fi) return; @@ -152,7 +152,7 @@ static void fdisk_reset_script(struct fdisk_script *dp) while (!list_empty(&dp->headers)) { struct fdisk_scriptheader *fi = list_entry(dp->headers.next, struct fdisk_scriptheader, headers); - fdisk_script_free_header(dp, fi); + fdisk_script_free_header(fi); } INIT_LIST_HEAD(&dp->headers); } @@ -275,7 +275,7 @@ int fdisk_script_set_header(struct fdisk_script *dp, DBG(SCRIPT, ul_debugobj(dp, "freeing header %s", name)); /* no data, remove the header */ - fdisk_script_free_header(dp, fi); + fdisk_script_free_header(fi); return 0; } @@ -290,7 +290,7 @@ int fdisk_script_set_header(struct fdisk_script *dp, fi->name = strdup(name); fi->data = strdup(data); if (!fi->data || !fi->name) { - fdisk_script_free_header(dp, fi); + fdisk_script_free_header(fi); return -ENOMEM; } list_add_tail(&fi->headers, &dp->headers); @@ -554,7 +554,7 @@ static int write_file_json(struct fdisk_script *dp, FILE *f) if (fdisk_partition_is_bootable(pa)) fprintf(f, ", \"bootable\": true"); - if (ct < fdisk_table_get_nents(dp->table)) + if ((size_t)ct < fdisk_table_get_nents(dp->table)) fputs("},\n", f); else fputs("}\n", f); @@ -1123,7 +1123,7 @@ static int parse_line_valcommas(struct fdisk_script *dp, char *s) } /* modifies @s ! */ -int fdisk_script_read_buffer(struct fdisk_script *dp, char *s) +static int fdisk_script_read_buffer(struct fdisk_script *dp, char *s) { int rc = 0; @@ -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..5ba9e0466 100644 --- a/libfdisk/src/utils.c +++ b/libfdisk/src/utils.c @@ -30,7 +30,7 @@ static int read_from_device(struct fdisk_context *cxt, } r = read(cxt->dev_fd, buf, size); - if (r < 0 || r != size) { + if (r < 0 || (size_t)r != size) { if (!errno) errno = EINVAL; /* probably too small file/device */ DBG(CXT, ul_debugobj(cxt, "failed to read %zu from offset %ju: %m", @@ -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/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt index 03aa4cebe..8f12c2d11 100644 --- a/libmount/docs/libmount-sections.txt +++ b/libmount/docs/libmount-sections.txt @@ -226,6 +226,7 @@ mnt_fs_set_freq mnt_fs_set_fstype mnt_fs_set_options mnt_fs_set_passno +mnt_fs_set_priority mnt_fs_set_root mnt_fs_set_source mnt_fs_set_target diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index 36bb00c56..b07a931d4 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) \ @@ -84,9 +85,9 @@ 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 = libmount.la $(UUID_LIBS) $(REALTIME_LIBS) +libmount_tests_ldadd = $(LDADD) libmount.la $(UUID_LIBS) $(REALTIME_LIBS) if HAVE_SELINUX libmount_tests_ldadd += $(SELINUX_LIBS) 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/libmount.h.in b/libmount/src/libmount.h.in index 91b1698ca..cadf4a72d 100644 --- a/libmount/src/libmount.h.in +++ b/libmount/src/libmount.h.in @@ -391,6 +391,7 @@ extern const char *mnt_fs_get_swaptype(struct libmnt_fs *fs); extern off_t mnt_fs_get_size(struct libmnt_fs *fs); extern off_t mnt_fs_get_usedsize(struct libmnt_fs *fs); extern int mnt_fs_get_priority(struct libmnt_fs *fs); +extern int mnt_fs_set_priority(struct libmnt_fs *fs, int prio); extern const char *mnt_fs_get_comment(struct libmnt_fs *fs); extern int mnt_fs_set_comment(struct libmnt_fs *fs, const char *comm); diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym index 7da969e17..f0210c240 100644 --- a/libmount/src/libmount.sym +++ b/libmount/src/libmount.sym @@ -313,4 +313,5 @@ MOUNT_2.26 { MOUNT_2.28 { mnt_table_find_target_with_option; + mnt_fs_set_priority; } MOUNT_2.26; 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/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'; 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/libsmartcols/src/table.c b/libsmartcols/src/table.c index d4261c067..251fe2169 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -332,7 +332,7 @@ int scols_table_next_column(struct libscols_table *tb, */ int scols_table_get_ncols(struct libscols_table *tb) { - return tb ? tb->ncols : -EINVAL; + return tb ? (int)tb->ncols : -EINVAL; } /** @@ -343,7 +343,7 @@ int scols_table_get_ncols(struct libscols_table *tb) */ int scols_table_get_nlines(struct libscols_table *tb) { - return tb ? tb->nlines : -EINVAL; + return tb ? (int)tb->nlines : -EINVAL; } /** diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 96ec13759..d1dcb65bd 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -281,8 +281,7 @@ static const char *get_cell_color(struct libscols_table *tb, static void print_newline_padding(struct libscols_table *tb, struct libscols_column *cl, struct libscols_line *ln, /* optional */ - size_t bufsz, - size_t len) + size_t bufsz) { size_t i; @@ -509,7 +508,7 @@ static int print_data(struct libscols_table *tb, return 0; if (len > width && !scols_column_is_trunc(cl)) - print_newline_padding(tb, cl, ln, buf->bufsz, len); /* next column starts on next line */ + print_newline_padding(tb, cl, ln, buf->bufsz); /* next column starts on next line */ else fputs(colsep(tb), tb->out); /* columns separator */ @@ -751,7 +750,7 @@ static int print_title(struct libscols_table *tb) &width, align, 0, (int) *tb->symbols->title_padding); - if (rc == (size_t) -1) { + if (rc == -1) { rc = -EINVAL; goto done; } diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index dc8d8672a..f2f66ba5c 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -1,8 +1,8 @@ check_PROGRAMS += test_uuid_parser test_uuid_parser_SOURCES = libuuid/src/test_uuid.c -test_uuid_parser_LDADD = libuuid.la $(SOCKET_LIBS) -test_uuid_parser_CFLAGS = -I$(ul_libuuid_incdir) +test_uuid_parser_LDADD = $(LDADD) libuuid.la $(SOCKET_LIBS) +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 fb58b46cd..502ecd503 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -31,8 +31,8 @@ endif check_PROGRAMS += test_consoles test_consoles_SOURCES = login-utils/sulogin-consoles.c -test_consoles_CFLAGS = -DTEST_PROGRAM -test_consoles_LDADD = libcommon.la +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 f49200312..aa54919bd 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -19,9 +19,11 @@ if BUILD_LOGGER 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_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) $(SYSTEMD_JOURNAL_LIBS) +logger_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif check_PROGRAMS += test_logger diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 1e893a914..4201e4335 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -405,7 +405,7 @@ static const char *rfc3164_current_time(void) } #define next_iovec(ary, idx) __extension__ ({ \ - assert(ARRAY_SIZE(ary) > idx); \ + assert(ARRAY_SIZE(ary) > (size_t)idx); \ assert(idx >= 0); \ &ary[idx++]; \ }) diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index 957c14370..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 = -DTEST_PROGRAM +test_more_CFLAGS = -DTEST_PROGRAM $(more_CFLAGS) test_more_LDADD = $(more_LDADD) endif # BUILD_MORE |