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.

MFC after:	3 days
This commit is contained in:
dim 2020-02-13 19:28:30 +00:00
parent 38d2f2c7fd
commit b8ffac9475

View File

@ -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);