svn commit: r357519 - in stable: 10/usr.bin/procstat 11/usr.bin/procstat 12/usr.bin/procstat

[Dimitry Andric]

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

Log:
  MFC r357268:
  
  Merge r357260 from the clang1000-import branch:
  
  Fix the following -Werror warning from clang 10.0.0 in procstat:
  
  usr.bin/procstat/procstat_sigs.c:79:3: error: misleading indentation; statement is not part of the previous 'else' [-Werror,-Wmisleading-indentation]
                  xo_close_container(name);
                  ^
  usr.bin/procstat/procstat_sigs.c:77:4: note: previous statement is here
          } else
            ^
  
  The intent was to group the xo_close_container() call to the previous
  snprintf() call.

Modified:
  stable/12/usr.bin/procstat/procstat_sigs.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/usr.bin/procstat/procstat_sigs.c
  stable/11/usr.bin/procstat/procstat_sigs.c
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)

Modified: stable/12/usr.bin/procstat/procstat_sigs.c
==============================================================================
--- stable/12/usr.bin/procstat/procstat_sigs.c	Tue Feb  4 19:24:10 2020	(r357518)
+++ stable/12/usr.bin/procstat/procstat_sigs.c	Tue Feb  4 19:31:01 2020	(r357519)
@@ -74,9 +74,10 @@ procstat_close_signame(int sig)
 		for (i = 0; name[i] != 0; i++)
 			name[i] = toupper(name[i]);
 		xo_close_container(name);
-	} else
+	} else {
 		snprintf(name, 12, "%d", sig);
 		xo_close_container(name);
+	}
 }
 
 static void