svn commit: r357227 - head/sbin/newfs_msdos

Dimitry Andric dim at FreeBSD.org
Tue Jan 28 20:12:30 UTC 2020


Author: dim
Date: Tue Jan 28 20:12:29 2020
New Revision: 357227
URL: https://svnweb.freebsd.org/changeset/base/357227

Log:
  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)
      ^
  
  MFC after:	3 days

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

Modified: head/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- head/sbin/newfs_msdos/newfs_msdos.c	Tue Jan 28 20:11:27 2020	(r357226)
+++ head/sbin/newfs_msdos/newfs_msdos.c	Tue Jan 28 20:12:29 2020	(r357227)
@@ -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-head mailing list