From bf2bcf345c7184264184fe9a632ace903ef22e30 Mon Sep 17 00:00:00 2001 From: Max Okumoto Date: Sun, 9 Jan 2005 23:03:28 +0000 Subject: [PATCH] - Cleanup white space. style(9) --- usr.bin/make/arch.c | 131 +++++++++++++++++++++--------------------- usr.bin/make/buf.c | 28 ++++----- usr.bin/make/buf.h | 4 +- usr.bin/make/compat.c | 8 +-- usr.bin/make/make.c | 4 +- usr.bin/make/parse.c | 18 +++--- usr.bin/make/suff.c | 12 ++-- usr.bin/make/targ.c | 6 +- usr.bin/make/var.c | 6 +- 9 files changed, 105 insertions(+), 112 deletions(-) diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index cae8de78c8..c7be905f9b 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.15.2.1 2001/02/13 03:13:57 will Exp $ - * $DragonFly: src/usr.bin/make/arch.c,v 1.25 2005/01/08 21:58:23 okumoto Exp $ + * $DragonFly: src/usr.bin/make/arch.c,v 1.26 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -51,39 +51,39 @@ * is referenced. * * The interface to this module is: - * Arch_ParseArchive Given an archive specification, return a list - * of GNode's, one for each member in the spec. - * FAILURE is returned if the specification is - * invalid for some reason. + * Arch_ParseArchive Given an archive specification, return a list + * of GNode's, one for each member in the spec. + * FAILURE is returned if the specification is + * invalid for some reason. * - * Arch_Touch Alter the modification time of the archive - * member described by the given node to be - * the current time. + * Arch_Touch Alter the modification time of the archive + * member described by the given node to be + * the current time. * - * Arch_TouchLib Update the modification time of the library - * described by the given node. This is special - * because it also updates the modification time - * of the library's table of contents. + * Arch_TouchLib Update the modification time of the library + * described by the given node. This is special + * because it also updates the modification time + * of the library's table of contents. * - * Arch_MTime Find the modification time of a member of - * an archive *in the archive*. The time is also - * placed in the member's GNode. Returns the - * modification time. + * Arch_MTime Find the modification time of a member of + * an archive *in the archive*. The time is also + * placed in the member's GNode. Returns the + * modification time. * - * Arch_MemTime Find the modification time of a member of - * an archive. Called when the member doesn't - * already exist. Looks in the archive for the - * modification time. Returns the modification - * time. + * Arch_MemTime Find the modification time of a member of + * an archive. Called when the member doesn't + * already exist. Looks in the archive for the + * modification time. Returns the modification + * time. * - * Arch_FindLib Search for a library along a path. The - * library name in the GNode should be in - * -l format. + * Arch_FindLib Search for a library along a path. The + * library name in the GNode should be in + * -l format. * - * Arch_LibOODate Special function to decide if a library node - * is out-of-date. + * Arch_LibOODate Special function to decide if a library node + * is out-of-date. * - * Arch_Init Initialize this module. + * Arch_Init Initialize this module. */ #include @@ -110,11 +110,11 @@ static Lst archives = Lst_Initializer(archives); typedef struct Arch { - char *name; /* Name of archive */ - Hash_Table members; /* All the members of the archive described - * by key/value pairs */ - char *fnametab; /* Extended name table strings */ - size_t fnamesize; /* Size of the string table */ + char *name; /* Name of archive */ + Hash_Table members; /* All the members of the archive described + * by key/value pairs */ + char *fnametab; /* Extended name table strings */ + size_t fnamesize; /* Size of the string table */ } Arch; static struct ar_hdr *ArchStatMember(const char *, const char *, Boolean); @@ -146,14 +146,14 @@ static int ArchSVR4Entry(Arch *, char *, size_t, FILE *); ReturnStatus Arch_ParseArchive(char **linePtr, Lst *nodeLst, GNode *ctxt) { - char *cp; /* Pointer into line */ - GNode *gn; /* New node */ - char *libName; /* Library-part of specification */ - char *memName; /* Member-part of specification */ - char *nameBuf; /* temporary place for node name */ - char saveChar; /* Ending delimiter of member-name */ - Boolean subLibName; /* TRUE if libName should have/had - * variable substitution performed on it */ + char *cp; /* Pointer into line */ + GNode *gn; /* New node */ + char *libName; /* Library-part of specification */ + char *memName; /* Member-part of specification */ + char *nameBuf; /* temporary place for node name */ + char saveChar; /* Ending delimiter of member-name */ + Boolean subLibName; /* TRUE if libName should have/had + * variable substitution performed on it */ libName = *linePtr; @@ -431,16 +431,15 @@ static struct ar_hdr * ArchStatMember(const char *archive, const char *member, Boolean hash) { #define AR_MAX_NAME_LEN (sizeof(arh.ar_name) - 1) - FILE * arch; /* Stream to archive */ - int size; /* Size of archive member */ - char *cp; /* Useful character pointer */ - char magic[SARMAG]; - LstNode *ln; /* Lst member containing archive descriptor */ - Arch *ar; /* Archive descriptor */ - Hash_Entry *he; /* Entry containing member's description */ - struct ar_hdr arh; /* archive-member header for reading archive */ - char memName[MAXPATHLEN]; - /* Current member name while hashing. */ + FILE *arch; /* Stream to archive */ + int size; /* Size of archive member */ + char *cp; /* Useful character pointer */ + char magic[SARMAG]; + LstNode *ln; /* Lst member containing archive descriptor */ + Arch *ar; /* Archive descriptor */ + Hash_Entry *he; /* Entry containing member's description */ + struct ar_hdr arh; /* archive-member header for reading archive */ + char memName[MAXPATHLEN]; /* Current member name while hashing. */ /* * Because of space constraints and similar things, files are archived @@ -510,7 +509,7 @@ ArchStatMember(const char *archive, const char *member, Boolean hash) * can handle... */ if ((fread(magic, SARMAG, 1, arch) != 1) || - (strncmp(magic, ARMAG, SARMAG) != 0)) { + (strncmp(magic, ARMAG, SARMAG) != 0)) { fclose(arch); return (NULL); } @@ -750,7 +749,7 @@ ArchFindMember(const char *archive, const char *member, struct ar_hdr *arhPtr, c * can handle... */ if ((fread(magic, SARMAG, 1, arch) != 1) || - (strncmp(magic, ARMAG, SARMAG) != 0)) { + (strncmp(magic, ARMAG, SARMAG) != 0)) { fclose(arch); return (NULL); } @@ -913,9 +912,9 @@ void Arch_TouchLib(GNode *gn) { #ifdef RANLIBMAG - FILE * arch; /* Stream open to archive */ - struct ar_hdr arh; /* Header describing table of contents */ - struct utimbuf times; /* Times for utime() call */ + FILE *arch; /* Stream open to archive */ + struct ar_hdr arh; /* Header describing table of contents */ + struct utimbuf times; /* Times for utime() call */ arch = ArchFindMember(gn->path, RANLIBMAG, &arh, "r+"); snprintf(arh.ar_date, sizeof(arh.ar_date), "%-12ld", (long) now); @@ -985,10 +984,10 @@ Arch_MTime(GNode *gn) int Arch_MemMTime(GNode *gn) { - LstNode *ln; - GNode *pgn; - char *nameStart, - *nameEnd; + LstNode *ln; + GNode *pgn; + char *nameStart; + char *nameEnd; for (ln = Lst_First(&gn->parents); ln != NULL; ln = Lst_Succ(ln)) { pgn = Lst_Datum(ln); @@ -1077,13 +1076,13 @@ Arch_FindLib(GNode *gn, Lst *path) * A library will be considered out-of-date for any of these reasons, * given that it is a target on a dependency line somewhere: * Its modification time is less than that of one of its - * sources (gn->mtime < gn->cmtime). + * sources (gn->mtime < gn->cmtime). * Its modification time is greater than the time at which the - * make began (i.e. it's been modified in the course - * of the make, probably by archiving). + * make began (i.e. it's been modified in the course + * of the make, probably by archiving). * The modification time of one of its sources is greater than * the one of its RANLIBMAG member (i.e. its table of contents - * is out-of-date). We don't compare of the archive time + * is out-of-date). We don't compare of the archive time * vs. TOC time because they can be too close. In my * opinion we should not bother with the TOC at all since * this is used by 'ar' rules that affect the data contents @@ -1101,7 +1100,7 @@ Arch_FindLib(GNode *gn, Lst *path) Boolean Arch_LibOODate(GNode *gn) { - Boolean oodate; + Boolean oodate; if (OP_NOP(gn->type) && Lst_IsEmpty(&gn->children)) { oodate = FALSE; @@ -1109,8 +1108,8 @@ Arch_LibOODate(GNode *gn) oodate = TRUE; } else { #ifdef RANLIBMAG - struct ar_hdr *arhPtr; /* Header for __.SYMDEF */ - int modTimeTOC; /* The table-of-contents's mod time */ + struct ar_hdr *arhPtr; /* Header for __.SYMDEF */ + int modTimeTOC; /* The table-of-contents's mod time */ arhPtr = ArchStatMember(gn->path, RANLIBMAG, FALSE); diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c index 39f0c3b650..4096763538 100644 --- a/usr.bin/make/buf.c +++ b/usr.bin/make/buf.c @@ -38,7 +38,7 @@ * * @(#)buf.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/buf.c,v 1.11 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/buf.c,v 1.14 2005/01/06 21:04:20 okumoto Exp $ + * $DragonFly: src/usr.bin/make/buf.c,v 1.15 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -59,13 +59,13 @@ /* * BufExpand -- - * Expand the given buffer to hold the given number of additional + * Expand the given buffer to hold the given number of additional * bytes. * Makes sure there's room for an extra NULL byte at the end of the * buffer in case it holds a string. */ #define BufExpand(bp, nb) do { \ - if ((bp)->left < (nb) + 1) { \ + if ((bp)->left < (nb) + 1) { \ int newSize = (bp)->size + max((nb) + 1, BUF_ADD_INC); \ Byte *newBuf = erealloc((bp)->buffer, newSize); \ \ @@ -77,9 +77,9 @@ } \ } while (0) -#define BUF_DEF_SIZE 256 /* Default buffer size */ -#define BUF_ADD_INC 256 /* Expansion increment when Adding */ -#define BUF_UNGET_INC 16 /* Expansion increment when Ungetting */ +#define BUF_DEF_SIZE 256 /* Default buffer size */ +#define BUF_ADD_INC 256 /* Expansion increment when Adding */ +#define BUF_UNGET_INC 16 /* Expansion increment when Ungetting */ /*- *----------------------------------------------------------------------- @@ -97,7 +97,6 @@ void Buf_OvAddByte(Buffer *bp, Byte byte) { - bp->left = 0; BufExpand(bp, 1); @@ -126,7 +125,6 @@ Buf_OvAddByte(Buffer *bp, Byte byte) void Buf_AddBytes(Buffer *bp, size_t numBytes, const Byte *bytesPtr) { - BufExpand(bp, numBytes); memcpy(bp->inPtr, bytesPtr, numBytes); @@ -155,7 +153,6 @@ Buf_AddBytes(Buffer *bp, size_t numBytes, const Byte *bytesPtr) Byte * Buf_GetAll(Buffer *bp, size_t *numBytesPtr) { - if (numBytesPtr != NULL) *numBytesPtr = bp->inPtr - bp->outPtr; @@ -178,7 +175,6 @@ Buf_GetAll(Buffer *bp, size_t *numBytesPtr) void Buf_Discard(Buffer *bp, size_t numBytes) { - if ((size_t)(bp->inPtr - bp->outPtr) <= numBytes) { bp->inPtr = bp->outPtr = bp->buffer; bp->left = bp->size; @@ -204,7 +200,6 @@ Buf_Discard(Buffer *bp, size_t numBytes) size_t Buf_Size(Buffer *buf) { - return (buf->inPtr - buf->outPtr); } @@ -226,7 +221,7 @@ Buf_Size(Buffer *buf) Buffer * Buf_Init(size_t size) { - Buffer *bp; /* New Buffer */ + Buffer *bp; /* New Buffer */ bp = emalloc(sizeof(*bp)); @@ -257,7 +252,6 @@ Buf_Init(size_t size) void Buf_Destroy(Buffer *buf, Boolean freeData) { - if (freeData) free(buf->buffer); free(buf); @@ -266,14 +260,14 @@ Buf_Destroy(Buffer *buf, Boolean freeData) /*- *----------------------------------------------------------------------- * Buf_ReplaceLastByte -- - * Replace the last byte in a buffer. + * Replace the last byte in a buffer. * * Results: - * None. + * None. * * Side Effects: - * If the buffer was empty intially, then a new byte will be added. - * Otherwise, the last byte is overwritten. + * If the buffer was empty intially, then a new byte will be added. + * Otherwise, the last byte is overwritten. * *----------------------------------------------------------------------- */ diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h index c61c554638..4965051bec 100644 --- a/usr.bin/make/buf.h +++ b/usr.bin/make/buf.h @@ -40,7 +40,7 @@ * * from: @(#)buf.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/buf.h,v 1.9 1999/08/28 01:03:26 peter Exp $ - * $DragonFly: src/usr.bin/make/buf.h,v 1.11 2005/01/06 21:04:20 okumoto Exp $ + * $DragonFly: src/usr.bin/make/buf.h,v 1.12 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -68,7 +68,7 @@ typedef char Byte; typedef struct Buffer { - size_t size; /* Current size of the buffer */ + size_t size; /* Current size of the buffer */ size_t left; /* Space left (== size - (inPtr - buffer)) */ Byte *buffer; /* The buffer itself */ Byte *inPtr; /* Place to write to */ diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index 4d54505ddc..5b8219b98f 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -38,7 +38,7 @@ * * @(#)compat.c 8.2 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/compat.c,v 1.16.2.2 2000/07/01 12:24:21 ps Exp $ - * $DragonFly: src/usr.bin/make/Attic/compat.c,v 1.23 2005/01/09 22:23:25 okumoto Exp $ + * $DragonFly: src/usr.bin/make/Attic/compat.c,v 1.24 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -133,7 +133,7 @@ CompatCatchSig(int signo) *----------------------------------------------------------------------- */ static void -CompatInterrupt (int signo) +CompatInterrupt(int signo) { GNode *gn; sigset_t nmask, omask; @@ -271,7 +271,7 @@ Compat_RunCommand(void *cmdp, void *gnp) } else { cmd = cmdStart; } - Lst_Replace (cmdNode, cmdStart); + Lst_Replace(cmdNode, cmdStart); if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) { Lst_AtEnd(&ENDNode->commands, cmdStart); @@ -377,7 +377,7 @@ Compat_RunCommand(void *cmdp, void *gnp) } if (cpid == 0) { execvp(av[0], av); - write(STDERR_FILENO, av[0], strlen (av[0])); + write(STDERR_FILENO, av[0], strlen(av[0])); write(STDERR_FILENO, ":", 1); write(STDERR_FILENO, strerror(errno), strlen(strerror(errno))); write(STDERR_FILENO, "\n", 1); diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index 63e6adff76..21b6794fe1 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.11 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/make.c,v 1.18 2005/01/06 10:53:00 okumoto Exp $ + * $DragonFly: src/usr.bin/make/make.c,v 1.19 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -503,7 +503,7 @@ Make_Update(GNode *cgn) */ cpref = Var_Value(PREFIX, cgn, &ptr); for (ln = Lst_First(&cgn->iParents); ln != NULL; ln = Lst_Succ(ln)) { - pgn = Lst_Datum (ln); + pgn = Lst_Datum(ln); if (pgn->make) { Var_Set(IMPSRC, cname, pgn); Var_Set(PREFIX, cpref, pgn); diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 3f492836cf..e43da33549 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -37,7 +37,7 @@ * * @(#)parse.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/parse.c,v 1.22.2.2 2004/07/10 08:14:42 eik Exp $ - * $DragonFly: src/usr.bin/make/parse.c,v 1.33 2005/01/08 22:27:02 okumoto Exp $ + * $DragonFly: src/usr.bin/make/parse.c,v 1.34 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -681,7 +681,7 @@ ParseClearPath(void *path, void *dummy __unused) *--------------------------------------------------------------------- */ static void -ParseDoDependency (char *line) +ParseDoDependency(char *line) { char *cp; /* our current position */ GNode *gn; /* a general purpose temporary node */ @@ -1128,7 +1128,7 @@ ParseDoDependency (char *line) } else { Lst curSrcs = Lst_Initializer(curSrc); /* list of sources in order */ - + while (*line) { /* * The targets take real sources, so we must beware of archive @@ -1610,7 +1610,7 @@ ParseDoWarning(char *warnmsg) *--------------------------------------------------------------------- */ static void -ParseDoInclude (char *file) +ParseDoInclude(char *file) { char *fullname; /* full pathname of file */ IFile *oldFile; /* state associated with current file */ @@ -1742,7 +1742,7 @@ ParseDoInclude (char *file) * is placed on a list with other IFile structures. The list makes * a very nice stack to track how we got here... */ - oldFile = emalloc(sizeof (IFile)); + oldFile = emalloc(sizeof(IFile)); memcpy(oldFile, &curFile, sizeof(IFile)); Lst_AtFront(&includes, oldFile); @@ -1795,7 +1795,7 @@ Parse_FromString(char *str, int lineno) Lst_AtFront(&includes, oldFile); curFile.F = NULL; - curFile.p = emalloc(sizeof (PTR)); + curFile.p = emalloc(sizeof(PTR)); curFile.p->str = curFile.p->ptr = str; curFile.lineno = lineno; curFile.fname = estrdup(curFile.fname); @@ -1819,7 +1819,7 @@ Parse_FromString(char *str, int lineno) *--------------------------------------------------------------------- */ static void -ParseTraditionalInclude (char *file) +ParseTraditionalInclude(char *file) { char *fullname; /* full pathname of file */ IFile *oldFile; /* state associated with current file */ @@ -2408,7 +2408,7 @@ Parse_File(char *name, FILE *stream) continue; } if (strncmp(cp, "include", 7) == 0) { - ParseDoInclude (cp + 7); + ParseDoInclude(cp + 7); goto nextLine; } else if (strncmp(cp, "error", 5) == 0) { ParseDoError(cp + 5); @@ -2501,7 +2501,7 @@ Parse_File(char *name, FILE *stream) Lst_Destroy(&targets, NOFREE); inLine = TRUE; - ParseDoDependency (line); + ParseDoDependency(line); } nextLine: diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index fc11f04302..0d16b3d14b 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.12.2.2 2004/06/10 13:07:53 ru Exp $ - * $DragonFly: src/usr.bin/make/suff.c,v 1.26 2005/01/08 21:58:23 okumoto Exp $ + * $DragonFly: src/usr.bin/make/suff.c,v 1.27 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -440,7 +440,7 @@ SuffInsert(Lst *l, Suff *s) DEBUGF(SUFF, ("inserting %s(%d)...", s->name, s->sNum)); if (ln == NULL) { DEBUGF(SUFF, ("at end of list\n")); - Lst_AtEnd (l, s); + Lst_AtEnd(l, s); s->refCount++; Lst_AtEnd(&s->ref, l); } else if (s2->sNum != s->sNum) { @@ -548,7 +548,7 @@ SuffParseTransform(char *str, Suff **srcPtr, Suff **targPtr) } return (FALSE); } - src = Lst_Datum (srcLn); + src = Lst_Datum(srcLn); str2 = str + src->nameLen; if (*str2 == '\0') { single = src; @@ -803,7 +803,7 @@ Suff_AddSuffix(char *str) s = emalloc(sizeof(Suff)); s->name = estrdup(str); - s->nameLen = strlen (s->name); + s->nameLen = strlen(s->name); Lst_Init(&s->searchPath); Lst_Init(&s->children); Lst_Init(&s->parents); @@ -1198,7 +1198,7 @@ SuffFindThem(Lst *srcs, Lst *slst) *----------------------------------------------------------------------- */ static Src * -SuffFindCmds (Src *targ, Lst *slst) +SuffFindCmds(Src *targ, Lst *slst) { LstNode *ln; /* General-purpose list node */ GNode *t, /* Target GNode */ @@ -2164,7 +2164,7 @@ SuffFindDeps(GNode *gn, Lst *slst) if (gn->suffix) gn->suffix->refCount--; if (ln != NULL) { - gn->suffix = s = Lst_Datum (ln); + gn->suffix = s = Lst_Datum(ln); gn->suffix->refCount++; Arch_FindLib(gn, &s->searchPath); } else { diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c index 8afaaca1f1..4d302ad5b2 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.10 1999/09/11 13:08:02 hoek Exp $ - * $DragonFly: src/usr.bin/make/targ.c,v 1.22 2005/01/08 12:38:32 okumoto Exp $ + * $DragonFly: src/usr.bin/make/targ.c,v 1.23 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -192,7 +192,7 @@ Targ_FindNode(const char *name, int flags) he = Hash_CreateEntry(&targets, name, &isNew); if (isNew) { gn = Targ_NewGN(name); - Hash_SetValue (he, gn); + Hash_SetValue(he, gn); Lst_AtEnd(&allTargets, gn); } } else { @@ -390,7 +390,7 @@ Targ_FmtTime(time_t modtime) parts = localtime(&modtime); - strftime(buf, sizeof buf, "%H:%M:%S %b %d, %Y", parts); + strftime(buf, sizeof(buf), "%H:%M:%S %b %d, %Y", parts); buf[sizeof(buf) - 1] = '\0'; return (buf); } diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 7b85ff3a25..c2b2b20b7f 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -37,7 +37,7 @@ * * @(#)var.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $ - * $DragonFly: src/usr.bin/make/var.c,v 1.38 2005/01/08 22:27:02 okumoto Exp $ + * $DragonFly: src/usr.bin/make/var.c,v 1.39 2005/01/09 23:03:28 okumoto Exp $ */ /*- @@ -617,7 +617,7 @@ VarModify(char *str, Boolean (*modProc)(const char *, Boolean, Buffer *, void *) for (i = 1; i < ac; i++) addSpace = (*modProc)(av[i], addSpace, buf, datum); - Buf_AddByte (buf, '\0'); + Buf_AddByte(buf, '\0'); str = (char *)Buf_GetAll(buf, (size_t *)NULL); Buf_Destroy(buf, FALSE); return (str); @@ -1856,7 +1856,7 @@ Var_Subst(const char *var, const char *str, GNode *ctxt, Boolean undefErr) str += length; errorReported = TRUE; } else { - Buf_AddByte (buf, (Byte)*str); + Buf_AddByte(buf, (Byte)*str); str += 1; } } else { -- 2.41.0