Hartmut Brandt
0c270d9eb0
Style: fix indentation.
2005-03-08 14:29:23 +00:00
Hartmut Brandt
7ca80f1cbc
Use the new Buf_Peel function to simplify things.
...
Remove an unused struct definition.
2005-03-08 13:15:51 +00:00
Hartmut Brandt
3509f4d713
Create a new function Buf_Peel that returns the string from inside
...
a Buffer and frees the Buffer.
2005-03-08 13:15:18 +00:00
Hartmut Brandt
1753d0e6a4
Add a debugging function that prints a message and appends the
...
current strerror.
2005-03-08 07:47:14 +00:00
Hartmut Brandt
a0aea18e18
Mark functions that don't return as dead.
2005-03-08 07:45:50 +00:00
Hartmut Brandt
34d49b885f
Finish constification of Var_Parse() and Var_Subst().
...
Patch: 0.18, 0.8, 7.110
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-08 07:43:57 +00:00
Hartmut Brandt
b37a89c4d4
Constify the callers of brk_string in this file.
...
Patch: 7.108
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-07 16:23:53 +00:00
Hartmut Brandt
f4d3f46b2e
Style: fix indendation of VarModify().
...
Patch: 7.107
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-07 16:14:50 +00:00
Hartmut Brandt
3cc51195c4
Constify the input argument to brk_string.
...
Patch: 7.106
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-07 16:10:39 +00:00
Hartmut Brandt
c4487a484d
Factor out the 'S' modifier into its own function. Move a variable
...
that is now used for both the 'M'/'N' branch and the 'S' branch of
the switch statement into a common scope.
Patch: 7.102-105
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-07 16:08:39 +00:00
Hartmut Brandt
ec3074aef1
Move the 'M' and 'N' modifiers into their own function.
...
Patch: 7.101
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-07 12:43:59 +00:00
Hartmut Brandt
573d78add6
Style: remove unneeded parantheses in conditionals.
2005-03-03 11:34:04 +00:00
Hartmut Brandt
b6bda8ea9d
Constify the code paths for the 'M' and 'N' modifiers.
...
Patch: 7.100
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-03 11:26:28 +00:00
Hartmut Brandt
179fc89109
Fix parsing of archives: in System V archive format the member names
...
is terminated with a slash. Although we are not System V, ar has
been configured to put that slash in. This format allows filenames
with trailing spaces.
2005-03-03 10:46:23 +00:00
Hartmut Brandt
5c78dee378
Fix parsing of archive specifications on the target side of
...
dependency lines. It seems that nobody is actually is using
the archive-feature of make.
2005-03-03 10:09:39 +00:00
Hartmut Brandt
49f5e8346a
Update the description comment of the function to reflect the
...
previous change.
2005-03-03 10:07:28 +00:00
Hartmut Brandt
d0330ee675
Transform VarParseLong() so that the lifetime and the constness of
...
variables gets clearer. Transform if() conditions to make the flow
clearer.
Patch: 7.93-99
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-03 07:25:04 +00:00
Hartmut Brandt
bf7c33df9c
Move the check for the error case (variable ends without a closing
...
paranthesis or brace) into the loop and don't leak the buffer in this
case. Remove the check for Var_Parse returning NULL - it can't.
Patch: 7.92
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-02 15:52:04 +00:00
Hartmut Brandt
b7beb62744
Fix indentation on a block of code.
...
Patch: 7.91
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-02 14:43:40 +00:00
Hartmut Brandt
09394f0073
Push the length computation down into VarParseShort().
...
Return always malloc()-ed strings from VarParseShort() to get
rid of warnings when returning string constants from a non-const char *
function.
Patch: 7.90
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-02 14:30:36 +00:00
Hartmut Brandt
c21044494f
Convert a function call to Lst_ForEach with a macro call to LST_FOREACH.
2005-03-02 12:00:21 +00:00
Hartmut Brandt
b93324d35e
Use the LST_FOREACH macro instead of the Lst_ForEach function. This
...
saves function calls and reduces void casting.
2005-03-02 08:30:49 +00:00
Hartmut Brandt
41664cddcd
Make sure the length variable is initialized to 0 before passing
...
it to Var_Parse().
Patch: 7.85
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-01 17:52:18 +00:00
Hartmut Brandt
f1c603af79
Split out ParseModifiers from VarParseLong.
...
Patch: 7.84
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-01 12:26:32 +00:00
Hartmut Brandt
73058038d5
VarParseLong: Create new else block for haveModifier. Move the call
...
to VarExpand down into the branches of the if as well as cleanup code.
Eliminate code that is now obviously dead.
Patch: 7.83
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-01 12:22:07 +00:00
Hartmut Brandt
aeadeefcdf
Reverse a condition so that the else clause can be changed
...
to a fallthrough.
Patch: 7.82
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-03-01 07:58:18 +00:00
Hartmut Brandt
4866acd4de
VarParseLong: Move the initialisation of dynamic up which saves
...
an else clause. Move the assignment to the lengthPtr down to
just before the return statements.
Patch: 7.81
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-28 17:23:17 +00:00
Hartmut Brandt
09fdd614d4
Buf_GetAll wants a pointer as its second argument, not a boolean -
...
replace FALSE by NULL.
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-28 17:05:26 +00:00
Hartmut Brandt
9944ed62ba
Don't modify the input string in VarParseLong(). It is not
...
necessary to NUL-terminated it, because we know the lengths
from the pointers.
Patch: 7.80
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-28 15:01:37 +00:00
Hartmut Brandt
4ce3340f48
Major clean up and split the Var_Parse monster function into three
...
functions: one for the single letter variables, one for the others
and one that does the recursive expansion.
Patches: 7.68-7.79
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-26 08:54:40 +00:00
Hartmut Brandt
179078e76d
Change the return value of Var_Subst to return a Buffer instead
...
of a char *.
Patch: 7.49
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-25 13:16:56 +00:00
Hartmut Brandt
d057118357
Var_Parse: Separate different error states by introducing an else block
...
after a return. Move assignments to {freePtr, dynamic, start} closer to the
return statements to clarify which variables are actually used for
communication between the losely coupled blocks of the code. Clear up
an if-expression to make common structures of the conditions clearer.
Use strchr instead of switch statements to check for a character beeing
a member of a set.
Patches: 7-62.2, 7-62.3, 7-64, 7-65.1, 7-65.2
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-24 16:05:45 +00:00
Hartmut Brandt
a65e9283c5
Push assignments to just before the returns from the function to
...
get it clearer what variables are actually needed.
Patches: 7.62.2, 7.62.3
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-24 10:35:39 +00:00
Hartmut Brandt
0cb1c98b7a
Fix wording of a comment.
...
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-24 10:30:23 +00:00
Hartmut Brandt
9a2bfd7ef5
Replace the calls to Lst_ForEach with the new LST_FOREACH macro and
...
fix the prototype for Compat_RunCommand to take the actual argument
types instead of void *.
2005-02-24 10:23:31 +00:00
Hartmut Brandt
592dcf0422
Use the LST_FOREACH macro instead of the Lst_ForEach function
...
and so get rid of the ForExec helper function by inlining it
into For_Run.
2005-02-23 14:03:18 +00:00
Hartmut Brandt
7175fefe00
Style: fix indent, use tabs instead of space+tab for aligning things.
...
Add a couple of comments.
2005-02-23 13:58:56 +00:00
Hartmut Brandt
09dd1bb9a1
Fix the indendation of some multi-line comments.
...
Noted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-23 10:20:58 +00:00
Hartmut Brandt
6a1865cdbb
Fix the prototypes by addings some constness. This should have been
...
committed together with the commit to dir.c:1.48.
2005-02-22 08:17:05 +00:00
Hartmut Brandt
e4597ce6ea
Use the new LST_FOREACH macro throughout the file and replace calls to
...
Lst_ForEach and Lst_Find.
2005-02-22 08:00:06 +00:00
Hartmut Brandt
36120d91e5
Invent the LST_FOREACH macro for looping through a list. In contrast
...
to the Lst_ForEach function this macro reduces the number of function
calls per invocation by N + 1 (where N is the number of list elements)
and increases code locality thereby increasing readability and
(maybe) performance.
2005-02-22 07:58:53 +00:00
Hartmut Brandt
1d2a8153d3
Style: fix indendation to be 8 and use tabulators. Fix lines longer than
...
80 characters and slightly reorder functions to get rid of static
prototypes.
2005-02-21 13:36:22 +00:00
Hartmut Brandt
6abaece6ae
Forgot to set *freePtr to FALSE in another place.
...
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-21 08:10:21 +00:00
Hartmut Brandt
436834581b
Fix a bug in handling archive members: when a member was not found
...
when looking into an already hashed archive, the code tried to use
the name shortened to the maximum length allowed for the archive.
Unfortunately it passed a buffer of junk to the hashing routine when
the name actually wasn't too long. Theoretically this could lead to
a false positive.
2005-02-21 08:06:34 +00:00
Hartmut Brandt
7f2e1af188
Push the assignments of some variables down into the sub-blocks where
...
it is actually needed. This makes clear in which subblocks the variables
are not needed and which can easier be split out.
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-18 15:32:06 +00:00
Hartmut Brandt
1aaa4432a5
Push down variables into local scope in Var_Parse to make their
...
liveness clear for splitting up this monster function.
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-18 07:33:43 +00:00
Hartmut Brandt
5fdd47f89b
Whitespace cleanup: substitute mixed tabs and spaces by canonical
...
whitespace and line up some variable definitions.
2005-02-17 12:35:32 +00:00
Hartmut Brandt
b2a8c56e3a
Move error case to begin of if-else chain. Do not needless initialize
...
startc, but only at the place where the initialisation is needed. Remove
a needless else.
Submitted by: Max Okumoto <okumoto@ucsd.edu> (partly)
2005-02-17 12:31:53 +00:00
Hartmut Brandt
3ff4a47ba0
Fix two typos in comments.
...
Submitted by: ru & Max Okumoto <okumoto@ucsd.edu>
2005-02-17 09:09:34 +00:00
Hartmut Brandt
768820f8c7
Sort out the error case that a single '$' was passed a little bit
...
earlier instead of mixing its handling with other cases.
Submitted by: Max Okumoto <okumoto@ucsd.edu>
2005-02-17 09:01:19 +00:00