svn commit: r318474 - head/usr.sbin/makefs

[Ed Maste]

On 18 May 2017 at 13:55, Ed Maste <emaste at freebsd.org> wrote:
> Author: emaste
> Date: Thu May 18 17:55:33 2017
> New Revision: 318474
> URL: https://svnweb.freebsd.org/changeset/base/318474
>
> Log:
>   makefs: drop WARNS back to 2
>
>   GCC warns about additional signed comparision issues compared to Clang.
>   Drop WARNS for now until the underlying issue is fixed.

FYI the GCC warning came from the same blksize macro, but from the
conditional expression this time.

#define blksize(fs, ip, lbn) \
        (((lbn) >= UFS_NDADDR || (ip)->i_size >= \
            (uint64_t)smalllblktosize(fs, (lbn) + 1)) \
            ? (fs)->fs_bsize \
            : (fragroundup(fs, blkoff(fs, (ip)->i_size))))

(fs)->fs_bsize is a signed int, while fragroundup is unsigned (from i_size).

>
> Modified:
>   head/usr.sbin/makefs/Makefile
>
> Modified: head/usr.sbin/makefs/Makefile
> ==============================================================================
> --- head/usr.sbin/makefs/Makefile       Thu May 18 17:44:45 2017        (r318473)
> +++ head/usr.sbin/makefs/Makefile       Thu May 18 17:55:33 2017        (r318474)
> @@ -14,7 +14,7 @@ SRCS= cd9660.c ffs.c \
>         walk.c
>  MAN=   makefs.8
>
> -WARNS?=        3
> +WARNS?=        2
>
>  .include "${SRCDIR}/cd9660/Makefile.inc"
>  .include "${SRCDIR}/ffs/Makefile.inc"
>