From f86feb9be9110e8d94e6ff355a8529e615558af6 Mon Sep 17 00:00:00 2001 From: Max Okumoto Date: Fri, 17 Jun 2005 07:54:24 +0000 Subject: [PATCH] Remove spaces infront of tabs. --- usr.bin/make/arch.c | 8 ++--- usr.bin/make/buf.c | 4 +-- usr.bin/make/for.c | 4 +-- usr.bin/make/hash.c | 22 +++++++------- usr.bin/make/hash.h | 14 ++++----- usr.bin/make/lst.h | 8 ++--- usr.bin/make/main.c | 8 ++--- usr.bin/make/make.c | 14 ++++----- usr.bin/make/str.c | 6 ++-- usr.bin/make/suff.c | 74 ++++++++++++++++++++++----------------------- usr.bin/make/targ.c | 7 ++--- 11 files changed, 84 insertions(+), 85 deletions(-) diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index f3fb72736b..3d30a22504 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -37,7 +37,7 @@ * * @(#)arch.c 8.2 (Berkeley) 1/2/94 * $FreeBSD: src/usr.bin/make/arch.c,v 1.48 2005/02/10 14:39:05 harti Exp $ - * $DragonFly: src/usr.bin/make/arch.c,v 1.50 2005/06/16 21:47:38 okumoto Exp $ + * $DragonFly: src/usr.bin/make/arch.c,v 1.51 2005/06/17 07:54:24 okumoto Exp $ */ /*- @@ -676,9 +676,9 @@ ArchArchiveNext(struct arfile *ar) /* * Look whether this is a long name. There are several variants * of long names: - * "#1/12 " - 12 length of following filename - * "/17 " - index into name table - * " 17 " - index into name table + * "#1/12 " - 12 length of following filename + * "/17 " - index into name table + * " 17 " - index into name table * Note that in the last case we must also check that there is no * slash in the name because of filenames with leading spaces: * " 777.o/ " - filename 777.o diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c index ab8ea7d49b..82310a9351 100644 --- a/usr.bin/make/buf.c +++ b/usr.bin/make/buf.c @@ -39,7 +39,7 @@ * * @(#)buf.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/buf.c,v 1.32 2005/02/07 11:27:47 harti Exp $ - * $DragonFly: src/usr.bin/make/buf.c,v 1.38 2005/05/05 09:06:23 okumoto Exp $ + * $DragonFly: src/usr.bin/make/buf.c,v 1.39 2005/06/17 07:54:24 okumoto Exp $ */ /* @@ -68,7 +68,7 @@ Buf_Size(const Buffer *buf) /** * Returns a reference to the data contained in the buffer. - * + * * @note Adding data to the Buffer object may invalidate the reference. */ inline char * diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c index c1a9b3a9b8..8fb5ea3f3e 100644 --- a/usr.bin/make/for.c +++ b/usr.bin/make/for.c @@ -31,7 +31,7 @@ * * @(#)for.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/for.c,v 1.35 2005/02/10 14:39:05 harti Exp $ - * $DragonFly: src/usr.bin/make/for.c,v 1.41 2005/05/05 09:08:42 okumoto Exp $ + * $DragonFly: src/usr.bin/make/for.c,v 1.42 2005/06/17 07:54:24 okumoto Exp $ */ /*- @@ -39,7 +39,7 @@ * Functions to handle loops in a makefile. * * Interface: - * For_Eval Evaluate the loop in the passed line. + * For_Eval Evaluate the loop in the passed line. * For_Run Run accumulated loop * */ diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c index 49f3bf3a5f..113601fcb2 100644 --- a/usr.bin/make/hash.c +++ b/usr.bin/make/hash.c @@ -38,15 +38,15 @@ * * @(#)hash.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/hash.c,v 1.24 2005/02/01 10:50:35 harti Exp $ - * $DragonFly: src/usr.bin/make/hash.c,v 1.17 2005/05/05 09:06:23 okumoto Exp $ + * $DragonFly: src/usr.bin/make/hash.c,v 1.18 2005/06/17 07:54:24 okumoto Exp $ */ /* hash.c -- * - * This module contains routines to manipulate a hash table. - * See hash.h for a definition of the structure of the hash - * table. Hash tables grow automatically as the amount of - * information increases. + * This module contains routines to manipulate a hash table. + * See hash.h for a definition of the structure of the hash + * table. Hash tables grow automatically as the amount of + * information increases. */ #include @@ -74,9 +74,9 @@ static void RebuildTable(Hash_Table *); * * Hash_InitTable -- * - * Set up the hash table t with a given number of buckets, or a - * reasonable default if the number requested is less than or - * equal to zero. Hash tables will grow in size as needed. + * Set up the hash table t with a given number of buckets, or a + * reasonable default if the number requested is less than or + * equal to zero. Hash tables will grow in size as needed. * * * Results: @@ -153,7 +153,7 @@ Hash_DeleteTable(Hash_Table *t) * * Hash_FindEntry -- * - * Searches a hash table for an entry corresponding to key. + * Searches a hash table for an entry corresponding to key. * * Results: * The return value is a pointer to the entry for key, @@ -250,7 +250,7 @@ Hash_CreateEntry(Hash_Table *t, const char *key, Boolean *newPtr) * * Hash_DeleteEntry -- * - * Delete the given hash table entry and free memory associated with + * Delete the given hash table entry and free memory associated with * it. * * Results: @@ -361,7 +361,7 @@ Hash_EnumNext(Hash_Search *searchPtr) * is larger than the old one. * * Results: - * None. + * None. * * Side Effects: * The entire hash table is moved, so any bucket numbers diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h index 8c321ffe51..e5f195fbb6 100644 --- a/usr.bin/make/hash.h +++ b/usr.bin/make/hash.h @@ -38,7 +38,7 @@ * * from: @(#)hash.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/hash.h,v 1.19 2005/02/01 10:50:35 harti Exp $ - * $DragonFly: src/usr.bin/make/hash.h,v 1.16 2005/05/05 09:06:23 okumoto Exp $ + * $DragonFly: src/usr.bin/make/hash.h,v 1.17 2005/06/17 07:54:24 okumoto Exp $ */ #ifndef hash_h_f6312f46 @@ -46,8 +46,8 @@ /* hash.h -- * - * This file contains definitions used by the hash module, - * which maintains hash tables. + * This file contains definitions used by the hash module, + * which maintains hash tables. */ #include "util.h" @@ -64,9 +64,9 @@ typedef struct Hash_Entry { typedef struct Hash_Table { struct Hash_Entry **bucketPtr; /* Buckets in the table */ - int size; /* Actual size of array. */ - int numEntries; /* Number of entries in the table. */ - int mask; /* Used to select bits for hashing. */ + int size; /* Actual size of array. */ + int numEntries; /* Number of entries in the table. */ + int mask; /* Used to select bits for hashing. */ } Hash_Table; /* @@ -76,7 +76,7 @@ typedef struct Hash_Table { typedef struct Hash_Search { const Hash_Table *tablePtr; /* Table being searched. */ int nextIndex; /* Next bucket to check */ - Hash_Entry *hashEntryPtr; /* Next entry in current bucket */ + Hash_Entry *hashEntryPtr; /* Next entry in current bucket */ } Hash_Search; /* diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h index 4d12b78cbf..af0186bf56 100644 --- a/usr.bin/make/lst.h +++ b/usr.bin/make/lst.h @@ -38,7 +38,7 @@ * * from: @(#)lst.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/lst.h,v 1.28 2005/02/10 14:25:12 harti Exp $ - * $DragonFly: src/usr.bin/make/lst.h,v 1.28 2005/05/19 17:10:37 okumoto Exp $ + * $DragonFly: src/usr.bin/make/lst.h,v 1.29 2005/06/17 07:54:24 okumoto Exp $ */ #ifndef lst_h_38f3ead1 @@ -65,8 +65,8 @@ typedef struct LstNode LstNode; * The list itself */ struct Lst { - LstNode *firstPtr; /* first node in list */ - LstNode *lastPtr; /* last node in list */ + LstNode *firstPtr; /* first node in list */ + LstNode *lastPtr; /* last node in list */ }; typedef struct Lst Lst; @@ -110,7 +110,7 @@ void Lst_Append(Lst *, LstNode *, void *); /* Place an element at the front of a lst. */ #define Lst_AtFront(LST, D) (Lst_Insert((LST), Lst_First(LST), (D))) /* Place an element at the end of a lst. */ -#define Lst_AtEnd(LST, D) (Lst_Append((LST), Lst_Last(LST), (D))) +#define Lst_AtEnd(LST, D) (Lst_Append((LST), Lst_Last(LST), (D))) /* Remove an element */ void Lst_Remove(Lst *, LstNode *); /* Replace a node with a new value */ diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index dfdb29243e..d8fc228ad4 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -38,7 +38,7 @@ * @(#) Copyright (c) 1988, 1989, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/main.c,v 1.118 2005/02/13 13:33:56 harti Exp $ - * $DragonFly: src/usr.bin/make/main.c,v 1.110 2005/05/23 20:05:05 okumoto Exp $ + * $DragonFly: src/usr.bin/make/main.c,v 1.111 2005/06/17 07:54:24 okumoto Exp $ */ /* @@ -618,10 +618,10 @@ rearg: /** * Main_ParseArgLine - * Used by the parse module when a .MFLAGS or .MAKEFLAGS target + * Used by the parse module when a .MFLAGS or .MAKEFLAGS target * is encountered and by main() when reading the .MAKEFLAGS envariable. * Takes a line of arguments and breaks it into its - * component words and passes those words and the number of them to the + * component words and passes those words and the number of them to the * MainParseArgs function. * The line should have all its leading whitespace removed. * @@ -763,7 +763,7 @@ determine_objdir(const char machine[], char curdir[], char objdir[]) static void InitVariables(MakeFlags *mf, int argc, char *argv[], char curdir[], char objdir[]) { - const char *machine; + const char *machine; const char *machine_arch; const char *machine_cpu; diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index d719ec0821..c6ca3317c0 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -37,7 +37,7 @@ * * @(#)make.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/make.c,v 1.33 2005/02/04 12:38:57 harti Exp $ - * $DragonFly: src/usr.bin/make/make.c,v 1.28 2005/05/23 20:04:04 okumoto Exp $ + * $DragonFly: src/usr.bin/make/make.c,v 1.29 2005/06/17 07:54:24 okumoto Exp $ */ /* @@ -325,7 +325,7 @@ Make_HandleUse(GNode *cgn, GNode *pgn) * The unmade field of pgn is decremented and pgn may be placed on * the toBeMade queue if this field becomes 0. * - * If the child was made, the parent's childMade field will be set true + * If the child was made, the parent's childMade field will be set true * and its cmtime set to now. * * If the child wasn't made, the cmtime field of the parent will be @@ -359,10 +359,10 @@ Make_Update(GNode *cgn) * parse.h : parse.o * * parse.o : parse.y - * yacc -d parse.y - * cc -c y.tab.c - * mv y.tab.o parse.o - * cmp -s y.tab.h parse.h || mv y.tab.h parse.h + * yacc -d parse.y + * cc -c y.tab.c + * mv y.tab.o parse.o + * cmp -s y.tab.h parse.h || mv y.tab.h parse.h * * In this case, if the definitions produced by yacc haven't * changed from before, parse.h won't have been updated and @@ -485,7 +485,7 @@ Make_Update(GNode *cgn) * Side Effects: * The ALLSRC and OODATE variables of the given node is filled in. * If the node is a .JOIN node, its TARGET variable will be set to - * match its ALLSRC variable. + * match its ALLSRC variable. */ void Make_DoAllVar(GNode *gn) diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c index 8bd3af091a..c650875d28 100644 --- a/usr.bin/make/str.c +++ b/usr.bin/make/str.c @@ -37,7 +37,7 @@ * * @(#)str.c 5.8 (Berkeley) 6/1/90 * $FreeBSD: src/usr.bin/make/str.c,v 1.40 2005/02/07 07:54:23 harti Exp $ - * $DragonFly: src/usr.bin/make/str.c,v 1.34 2005/05/24 09:27:33 okumoto Exp $ + * $DragonFly: src/usr.bin/make/str.c,v 1.35 2005/06/17 07:54:24 okumoto Exp $ */ #include @@ -68,7 +68,7 @@ ArgArray_Init(ArgArray *aa) } /** - * Cleanup the memory allocated for in the argument array object. + * Cleanup the memory allocated for in the argument array object. */ void ArgArray_Done(ArgArray *aa) @@ -333,7 +333,7 @@ MAKEFLAGS_break(ArgArray *aa, const char str[]) if (aa->argc == aa->size) { aa->size *= 2; aa->argv = erealloc(aa->argv, - (aa->size + 1) * sizeof(char *)); + (aa->size + 1) * sizeof(char *)); } *arg++ = '\0'; diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index 202278c7a1..b341dedfc9 100644 --- a/usr.bin/make/suff.c +++ b/usr.bin/make/suff.c @@ -37,7 +37,7 @@ * * @(#)suff.c 8.4 (Berkeley) 3/21/94 * $FreeBSD: src/usr.bin/make/suff.c,v 1.43 2005/02/04 13:23:39 harti Exp $ - * $DragonFly: src/usr.bin/make/suff.c,v 1.61 2005/06/16 23:11:42 okumoto Exp $ + * $DragonFly: src/usr.bin/make/suff.c,v 1.62 2005/06/17 07:54:24 okumoto Exp $ */ /*- @@ -46,47 +46,47 @@ * using suffix transformation rules * * Interface: - * Suff_Init Initialize all things to do with suffixes. + * Suff_Init Initialize all things to do with suffixes. * - * Suff_DoPaths This function is used to make life easier - * when searching for a file according to its - * suffix. It takes the global search path, - * as defined using the .PATH: target, and appends - * its directories to the path of each of the - * defined suffixes, as specified using - * .PATH: targets. In addition, all - * directories given for suffixes labeled as - * include files or libraries, using the .INCLUDES - * or .LIBS targets, are played with using - * Dir_MakeFlags to create the .INCLUDES and - * .LIBS global variables. + * Suff_DoPaths This function is used to make life easier + * when searching for a file according to its + * suffix. It takes the global search path, + * as defined using the .PATH: target, and appends + * its directories to the path of each of the + * defined suffixes, as specified using + * .PATH: targets. In addition, all + * directories given for suffixes labeled as + * include files or libraries, using the .INCLUDES + * or .LIBS targets, are played with using + * Dir_MakeFlags to create the .INCLUDES and + * .LIBS global variables. * - * Suff_ClearSuffixes Clear out all the suffixes and defined - * transformations. + * Suff_ClearSuffixes Clear out all the suffixes and defined + * transformations. * - * Suff_IsTransform Return TRUE if the passed string is the lhs - * of a transformation rule. + * Suff_IsTransform Return TRUE if the passed string is the lhs + * of a transformation rule. * - * Suff_AddSuffix Add the passed string as another known suffix. + * Suff_AddSuffix Add the passed string as another known suffix. * - * Suff_GetPath Return the search path for the given suffix. + * Suff_GetPath Return the search path for the given suffix. * - * Suff_AddInclude Mark the given suffix as denoting an include - * file. + * Suff_AddInclude Mark the given suffix as denoting an include + * file. * - * Suff_AddLib Mark the given suffix as denoting a library. + * Suff_AddLib Mark the given suffix as denoting a library. * - * Suff_AddTransform Add another transformation to the suffix - * graph. Returns GNode suitable for framing, I - * mean, tacking commands, attributes, etc. on. + * Suff_AddTransform Add another transformation to the suffix + * graph. Returns GNode suitable for framing, I + * mean, tacking commands, attributes, etc. on. * - * Suff_SetNull Define the suffix to consider the suffix of - * any file that doesn't have a known one. + * Suff_SetNull Define the suffix to consider the suffix of + * any file that doesn't have a known one. * - * Suff_FindDeps Find implicit sources for and the location of - * a target based on its suffix. Returns the - * bottom-most node added to the graph or NULL - * if the target had no implicit sources. + * Suff_FindDeps Find implicit sources for and the location of + * a target based on its suffix. Returns the + * bottom-most node added to the graph or NULL + * if the target had no implicit sources. */ #include @@ -248,7 +248,7 @@ SuffTransFind(const char *name) return (NULL); } - /*********** Maintenance Functions ************/ + /*********** Maintenance Functions ************/ #if 0 /* @@ -867,7 +867,7 @@ SuffSrcCreate(char *file, char *prefix, Suff *suff, Src *parent, GNode *node) return (s); } - /********** Implicit Source Search Functions *********/ + /********** Implicit Source Search Functions *********/ /*- *----------------------------------------------------------------------- @@ -881,7 +881,7 @@ SuffSrcCreate(char *file, char *prefix, Suff *suff, Src *parent, GNode *node) * None * * Side Effects: - * Lots of structures are created and added to the list + * Lots of structures are created and added to the list *----------------------------------------------------------------------- */ static void @@ -1301,7 +1301,7 @@ SuffExpandWildcards(GNode *child, Lst *members) * Side Effects: * The expanded node is removed from the parent's list of children, * and the parent's unmade counter is decremented, but other nodes - * may be added. + * may be added. * *----------------------------------------------------------------------- */ @@ -1676,7 +1676,7 @@ SuffFindNormalDeps(GNode *gn, Lst *slst) break; ln = LST_NEXT(ln); } - + if (ln != NULL) { int prefLen; /* Length of the prefix */ Src *target; diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c index 0104d6aff4..292482e8e5 100644 --- a/usr.bin/make/targ.c +++ b/usr.bin/make/targ.c @@ -37,7 +37,7 @@ * * @(#)targ.c 8.2 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/targ.c,v 1.37 2005/02/04 12:38:57 harti Exp $ - * $DragonFly: src/usr.bin/make/targ.c,v 1.29 2005/05/15 17:50:09 okumoto Exp $ + * $DragonFly: src/usr.bin/make/targ.c,v 1.30 2005/06/17 07:54:24 okumoto Exp $ */ /* @@ -171,7 +171,7 @@ Targ_FindNode(const char *name, int flags) GNode *gn; /* node in that element */ Hash_Entry *he; /* New or used hash entry for node */ Boolean isNew; /* Set TRUE if Hash_CreateEntry had to create */ - /* an entry for the node */ + /* an entry for the node */ if (flags & TARG_CREATE) { he = Hash_CreateEntry(&targets, name, &isNew); @@ -390,8 +390,7 @@ TargPrintNode(const GNode *gn, int pass) printf("# non-existent (maybe): %s\n", gn->made == MADE ? "made" : gn->made == UPTODATE ? "up-to-date": - gn->made == ERROR?"error when made": - "aborted"); + gn->made == ERROR ? "error when made" : "aborted"); } else { printf("# unmade\n"); } -- 2.41.0