svn commit: r357513 - stable/12/sbin/newfs_msdos

Dimitry Andric dim at FreeBSD.org
Tue Feb 4 19:01:18 UTC 2020


Author: dim
Date: Tue Feb  4 19:01:17 2020
New Revision: 357513
URL: https://svnweb.freebsd.org/changeset/base/357513

Log:
  MFC r357227:
  
  Merge r357225 from the clang1000-import branch:
  
  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)
      ^

Modified:
  stable/12/sbin/newfs_msdos/newfs_msdos.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- stable/12/sbin/newfs_msdos/newfs_msdos.c	Tue Feb  4 18:56:26 2020	(r357512)
+++ stable/12/sbin/newfs_msdos/newfs_msdos.c	Tue Feb  4 19:01:17 2020	(r357513)
@@ -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);


More information about the svn-src-all mailing list