From: Ruediger Meier Date: Mon, 22 Feb 2016 23:26:46 +0000 (+0100) Subject: misc: fix warnings "unused parameter" [-Wunused-parameter] X-Git-Tag: v2.28-rc1~67^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71177ab8f9460c9aafec89a3870bb5a46fc8b50b;p=thirdparty%2Futil-linux.git misc: fix warnings "unused parameter" [-Wunused-parameter] Signed-off-by: Ruediger Meier --- diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c index cb8b84f3a3..d350f8978e 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 011ad95216..d12472c7ec 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/xfs.c b/libblkid/src/superblocks/xfs.c index d13c849e1f..575651b22c 100644 --- a/libblkid/src/superblocks/xfs.c +++ b/libblkid/src/superblocks/xfs.c @@ -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 c505a72043..f44fe528f4 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/libfdisk/src/dos.c b/libfdisk/src/dos.c index c04ee7106b..d4d66f6396 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.")); diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c index b80f88e3b6..6fba120df9 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); diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index d6622be64e..55306389a7 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 */