Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/config Style.



details:   https://anonhg.NetBSD.org/src/rev/ee0a93e71246
branches:  trunk
changeset: 802942:ee0a93e71246
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Oct 09 19:33:43 2014 +0000

description:
Style.

diffstat:

 usr.bin/config/mkmakefile.c |  47 +++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diffs (116 lines):

diff -r 53d670ed29e4 -r ee0a93e71246 usr.bin/config/mkmakefile.c
--- a/usr.bin/config/mkmakefile.c       Thu Oct 09 19:27:04 2014 +0000
+++ b/usr.bin/config/mkmakefile.c       Thu Oct 09 19:33:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.23 2014/10/09 19:24:36 uebayasi Exp $ */
+/*     $NetBSD: mkmakefile.c,v 1.24 2014/10/09 19:33:43 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -100,7 +100,8 @@
            machine, machine);
        ifname = sourcepath(buf);
        if ((ifp = fopen(ifname, "r")) == NULL) {
-               /* Try a makefile for the architecture second.
+               /*
+                * Try a makefile for the architecture second.
                 */
                (void)snprintf(buf, sizeof(buf), "arch/%s/conf/Makefile.%s",
                    machinearch, machinearch);
@@ -232,11 +233,13 @@
                        if (option != NULL)
                                fputs(option->nv_str ? option->nv_str : "1",
                                    fp);
-                       /* Otherwise it's not a selected option and we don't
-                        * output anything. */
+                       /*
+                        * Otherwise it's not a selected option and we don't
+                        * output anything.
+                        */
                }
 
-               line = nextpct+1;
+               line = nextpct + 1;
        }
 }
 
@@ -295,12 +298,12 @@
        sp = "";
        for (nv = options; nv != NULL; nv = nv->nv_next) {
 
-               /* skip any options output to a header file */
+               /* Skip any options output to a header file */
                if (DEFINED_OPTION(nv->nv_name))
                        continue;
                fprintf(fp, "%s-D%s", sp, nv->nv_name);
                if (nv->nv_str)
-                   fprintf(fp, "=\"%s\"", nv->nv_str);
+                       fprintf(fp, "=\"%s\"", nv->nv_str);
                sp = " ";
        }
        putc('\n', fp);
@@ -339,12 +342,12 @@
                } else {
                        if (oi->oi_prefix != NULL) {
                                fprintf(fp, "\t%s%s/%s \\\n",
-                                           prefix_prologue(oi->oi_path),
-                                           oi->oi_prefix, oi->oi_path);
+                                   prefix_prologue(oi->oi_path),
+                                   oi->oi_prefix, oi->oi_path);
                        } else {
                                fprintf(fp, "\t%s%s \\\n",
-                                           filetype_prologue(&oi->oi_fit),
-                                           oi->oi_path);
+                                   filetype_prologue(&oi->oi_fit),
+                                   oi->oi_path);
                        }
                }
        }
@@ -447,12 +450,12 @@
                } else {
                        if (fi->fi_prefix != NULL) {
                                fprintf(fp, "\t%s%s/%s \\\n",
-                                           prefix_prologue(fi->fi_prefix),
-                                           fi->fi_prefix, fpath);
+                                   prefix_prologue(fi->fi_prefix),
+                                   fi->fi_prefix, fpath);
                        } else {
                                fprintf(fp, "\t%s%s \\\n",
-                                           filetype_prologue(&fi->fi_fit),
-                                           fpath);
+                                   filetype_prologue(&fi->fi_fit),
+                                   fpath);
                        }
                }
        }
@@ -490,13 +493,13 @@
                } else {
                        if (fi->fi_prefix != NULL) {
                                fprintf(fp, "%s.o: %s%s/%s\n", fi->fi_base,
-                                           prefix_prologue(fi->fi_prefix),
-                                           fi->fi_prefix, fpath);
+                                   prefix_prologue(fi->fi_prefix),
+                                   fi->fi_prefix, fpath);
                        } else {
                                fprintf(fp, "%s.o: %s%s\n",
-                                           fi->fi_base,
-                                           filetype_prologue(&fi->fi_fit),
-                                           fpath);
+                                   fi->fi_base,
+                                   filetype_prologue(&fi->fi_fit),
+                                   fpath);
                        }
                }
                if (fi->fi_mkrule != NULL) {
@@ -538,9 +541,9 @@
        TAILQ_FOREACH(cf, &allcf, cf_next) {
                fprintf(fp, "KERNELS+=%s\n", cf->cf_name);
                fprintf(fp, "%s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n",
-                       cf->cf_name, cf->cf_name);
+                   cf->cf_name, cf->cf_name);
                fprintf(fp, "swap%s.o: swap%s.c\n"
-                       "\t${NORMAL_C}\n\n", cf->cf_name, cf->cf_name);
+                   "\t${NORMAL_C}\n\n", cf->cf_name, cf->cf_name);
        }
        fputs("\n", fp);
 }



Home | Main Index | Thread Index | Old Index