Tue Sep 1 12:32:26 2015 UTC ()
Clean up struct files.


(uebayasi)
diff -r1.78 -r1.79 src/usr.bin/config/defs.h

cvs diff -r1.78 -r1.79 src/usr.bin/config/defs.h (expand / switch to unified diff)

--- src/usr.bin/config/defs.h 2015/09/01 12:10:56 1.78
+++ src/usr.bin/config/defs.h 2015/09/01 12:32:26 1.79
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: defs.h,v 1.78 2015/09/01 12:10:56 uebayasi Exp $ */ 1/* $NetBSD: defs.h,v 1.79 2015/09/01 12:32:26 uebayasi Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This software was developed by the Computer Systems Engineering group 7 * This software was developed by the Computer Systems Engineering group
8 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and 8 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
9 * contributed to Berkeley. 9 * contributed to Berkeley.
10 * 10 *
11 * All advertising materials mentioning features or use of this software 11 * All advertising materials mentioning features or use of this software
12 * must display the following acknowledgement: 12 * must display the following acknowledgement:
13 * This product includes software developed by the University of 13 * This product includes software developed by the University of
14 * California, Lawrence Berkeley Laboratories. 14 * California, Lawrence Berkeley Laboratories.
@@ -327,40 +327,39 @@ struct devi { @@ -327,40 +327,39 @@ struct devi {
327 int i_locoff; /* offset in locators.vec */ 327 int i_locoff; /* offset in locators.vec */
328 328
329}; 329};
330/* special units */ 330/* special units */
331#define STAR (-1) /* unit number for, e.g., "sd*" */ 331#define STAR (-1) /* unit number for, e.g., "sd*" */
332#define WILD (-2) /* unit number for, e.g., "sd?" */ 332#define WILD (-2) /* unit number for, e.g., "sd?" */
333 333
334/* 334/*
335 * Files (*.c, *.S, or *.o). This structure defines the common fields 335 * Files (*.c, *.S, or *.o). This structure defines the common fields
336 * between the two. 336 * between the two.
337 */ 337 */
338struct files { 338struct files {
339 TAILQ_ENTRY(files) fi_next; 339 TAILQ_ENTRY(files) fi_next;
340 TAILQ_ENTRY(files) fi_snext; 340 TAILQ_ENTRY(files) fi_snext; /* per-suffix list */
341 const char *fi_srcfile; /* the name of the "files" file that got us */ 341 const char *fi_srcfile; /* the name of the "files" file that got us */
342 u_short fi_srcline; /* and the line number */ 342 u_short fi_srcline; /* and the line number */
343 u_char fi_flags; /* as below */ 343 u_char fi_flags; /* as below */
344 char fi_lastc; /* last char from path */ 
345 const char *fi_tail; /* name, i.e., strrchr(fi_path, '/') + 1 */ 344 const char *fi_tail; /* name, i.e., strrchr(fi_path, '/') + 1 */
346 const char *fi_base; /* tail minus ".c" (or whatever) */ 345 const char *fi_base; /* tail minus ".c" (or whatever) */
347 const char *fi_path; /* full file path */ 346 const char *fi_path; /* full file path */
348 const char *fi_prefix; /* any file prefix */ 347 const char *fi_prefix; /* any file prefix */
349 int fi_suffix; /* single char suffix */ 348 int fi_suffix; /* single char suffix */
350 size_t fi_len; /* path string length */ 349 size_t fi_len; /* path string length */
351 struct condexpr *fi_optx; /* options expression */ 350 struct condexpr *fi_optx; /* options expression */
352 struct nvlist *fi_optf; /* flattened version of above, if needed */ 351 struct nvlist *fi_optf; /* flattened version of above, if needed */
353 const char *fi_mkrule; /* special make rule, if any */ 352 const char *fi_mkrule; /* special make rule, if any */
354 struct attr *fi_attr; /* owner attr */ 353 struct attr *fi_attr; /* owner attr */
355 TAILQ_ENTRY(files) fi_anext; /* next file in attr */ 354 TAILQ_ENTRY(files) fi_anext; /* next file in attr */
356}; 355};
357 356
358/* flags */ 357/* flags */
359#define FI_SEL 0x01 /* selected */ 358#define FI_SEL 0x01 /* selected */
360#define FI_NEEDSCOUNT 0x02 /* needs-count */ 359#define FI_NEEDSCOUNT 0x02 /* needs-count */
361#define FI_NEEDSFLAG 0x04 /* needs-flag */ 360#define FI_NEEDSFLAG 0x04 /* needs-flag */
362#define FI_HIDDEN 0x08 /* obscured by other(s), base names overlap */ 361#define FI_HIDDEN 0x08 /* obscured by other(s), base names overlap */
363 362
364/* 363/*
365 * Condition expressions. 364 * Condition expressions.
366 */ 365 */