d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r357225 from the clang1000-import branch:

Browse Source 
Fix the following -Werror warning from clang 10.0.0 in newfs_msdos:

sbin/newfs_msdos/newfs_msdos.c:181:2: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
        if (o.align) {
        ^
sbin/newfs_msdos/newfs_msdos.c:179:5: note: previous statement is here
    if (argc < 1 || argc > 2)
    ^

MFC after:	3 days
This commit is contained in:
dim 2020-01-28 20:12:29 +00:00
parent 99f5021500
commit 63da139a92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/newfs_msdos/newfs_msdos.c
View File

@ -178,10 +178,10 @@ main(int argc, char *argv[])
argv += optind;
if (argc < 1 || argc > 2)
usage();
if (o.align) {
if (o.reserved_sectors)
errx(1, "align (-A) is incompatible with -r");
}
if (o.align) {
if (o.reserved_sectors)
errx(1, "align (-A) is incompatible with -r");
}
fname = *argv++;
if (!o.create_size && !strchr(fname, '/')) {
snprintf(buf, sizeof(buf), "%s%s", _PATH_DEV, fname);