svn commit: r210145 - stable/8/usr.sbin/config

[Warner Losh]

Author: imp
Date: Thu Jul 15 22:34:30 2010
New Revision: 210145
URL: http://svn.freebsd.org/changeset/base/210145

Log:
  MFC: r209135
  r209135 | imp | 2010-06-13 10:54:11 -0600 (Sun, 13 Jun 2010) | 9 lines
  
  style(9) fixes:
  
  o make cmd scoped to the whole do_rules function, since it really is
    scoped to the whole fucnion.  Making it static was the wrong way to
    fix referencing it outside of the block in which it was declared
    (and conforms to the style of the rest of the file).
  o remove a couple of meaningless blank lines
  o properly wrap one line.

Modified:
  stable/8/usr.sbin/config/mkmakefile.c
Directory Properties:
  stable/8/usr.sbin/config/   (props changed)

Modified: stable/8/usr.sbin/config/mkmakefile.c
==============================================================================
--- stable/8/usr.sbin/config/mkmakefile.c	Thu Jul 15 22:28:19 2010	(r210144)
+++ stable/8/usr.sbin/config/mkmakefile.c	Thu Jul 15 22:34:30 2010	(r210145)
@@ -683,6 +683,7 @@ do_rules(FILE *f)
 	char *cp, *np, och;
 	struct file_list *ftp;
 	char *compilewith;
+	char cmd[128];
 
 	STAILQ_FOREACH(ftp, &ftab, f_next) {
 		if (ftp->f_warn)
@@ -720,25 +721,24 @@ do_rules(FILE *f)
 		compilewith = ftp->f_compilewith;
 		if (compilewith == 0) {
 			const char *ftype = NULL;
-			static char cmd[128];
 
 			switch (ftp->f_type) {
-
 			case NORMAL:
 				ftype = "NORMAL";
 				break;
-
 			case PROFILING:
 				if (!profiling)
 					continue;
 				ftype = "PROFILE";
 				break;
-
 			default:
 				printf("config: don't know rules for %s\n", np);
 				break;
 			}
-			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if defined(NORMAL_CTFCONVERT) && !empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype,
+			snprintf(cmd, sizeof(cmd),
+			    "${%s_%c%s}\n.if defined(NORMAL_CTFCONVERT) && "
+			    "!empty(NORMAL_CTFCONVERT)\n"
+			    "\t${NORMAL_CTFCONVERT}\n.endif", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;