svn commit: r358078 - in stable: 11/sbin/sconfig 12/sbin/sconfig

[Dimitry Andric]

Author: dim
Date: Tue Feb 18 18:15:33 2020
New Revision: 358078
URL: https://svnweb.freebsd.org/changeset/base/358078

Log:
  MFC r357873:
  
  Merge r357864 from the clang1000-import branch:
  
  Fix the following -Werror warning from clang 10.0.0 in sconfig:
  
  sbin/sconfig/sconfig.c:909:5: error: misleading indentation; statement is not part of the previous 'else' [-Werror,-Wmisleading-indentation]
                                  exit (-1);
                                  ^
  sbin/sconfig/sconfig.c:907:6: note: previous statement is here
                          } else
                            ^
  
  The intent was to group the exit() call with the previous fprintf()
  call.

Modified:
  stable/11/sbin/sconfig/sconfig.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sbin/sconfig/sconfig.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sbin/sconfig/sconfig.c
==============================================================================
--- stable/11/sbin/sconfig/sconfig.c	Tue Feb 18 18:13:08 2020	(r358077)
+++ stable/11/sbin/sconfig/sconfig.c	Tue Feb 18 18:15:33 2020	(r358078)
@@ -904,9 +904,10 @@ setup_chan (int fd, int argc, char **argv)
 			} else if (strncasecmp ("rs449", argv[i]+5, 5) == 0) {
 				port = 2;
 				ioctl (fd, SERIAL_SETPORT, &port);
-			} else
+			} else {
 				fprintf (stderr, "invalid port type\n");
 				exit (-1);
+			}
 #if 1
 		} else if (strcasecmp ("reset", argv[i]) == 0) {
 			ioctl (fd, SERIAL_RESET, 0);