d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
113,261 Commits 4 Branches 49 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Hartmut Brandt
40fe2aa311 Convert several instances of negative logic to positive logic. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-11 10:49:01 +00:00
Hartmut Brandt
26478079f7 Buffers are already NUL-terminated so there is no need to explicitely add 
a NULL.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 17:01:46 +00:00
Hartmut Brandt
ed293d7304 Mostly stylistic nits in preparation for splitting up Var_Parse: 
use a more consistent style with regard to *str and str[0];
simplify code by introducing a temporary variable;
shift a break around and add braces where appropriate.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 17:00:16 +00:00
Hartmut Brandt
42e4f1252b Let the buffer just use the default size by specifying 0 as the size 
instead of specifying the default size explicitely.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:53:29 +00:00
Hartmut Brandt
c738c9b125 Mark the modification of the input string (which should really be const) 
with a comment.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:52:14 +00:00
Hartmut Brandt
302288aba2 Style nits: 
Move some assignments nearer to where they actually used. Convert a loop
from a for() to a while() to make it clearer and add braces to the long
body of it. Split assignment from variable declaration.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:50:34 +00:00
Hartmut Brandt
d2bda84a20 Describe a pre-condition of Var_Parse(). 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:43:22 +00:00
Hartmut Brandt
f804a7b3b1 Remove a comment that's not actual anymore. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:41:22 +00:00
Hartmut Brandt
5cb05d7962 Fix spacing by converting mixes of space and tab to tab. Also add a number 
of empty lines in appropriate places.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-10 14:39:05 +00:00
Hartmut Brandt
2890fef88d Use defines for character constants for open and closing braces and 
parantheses. This helps editors to find its way through the horrible
mess of Var_Parse. Rewrite a for() loop into a while() to make it clearer.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-09 18:44:09 +00:00
Hartmut Brandt
f2b48f62c6 Untangle VarFind and, while rewriting most of the function, fix the 
intendation. (A large part of the function was already at intendation 8).
 2005-02-09 13:13:59 +00:00
Hartmut Brandt
3f18a493f4 Introduce VarCreate and VarDestroy functions and used them where 
appropriate.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-09 09:53:28 +00:00
Hartmut Brandt
76749b8672 Remove an unneeded check. 2005-02-07 16:33:57 +00:00
Hartmut Brandt
9be6b372de Introduce a typedef for variable value modifation functions and use it 
where appropriate.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-07 16:27:19 +00:00
Hartmut Brandt
b3c3341784 Make the intention of a loop clearer. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-07 15:51:51 +00:00
Hartmut Brandt
46ca434737 Introduce Buf_StripNewLines() and use it where appropriate. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-07 11:27:47 +00:00
Hartmut Brandt
ae9eed1281 Invent a Buf_AppendRange function that appends a non-NUL-terminated string 
given by a pointer to the start of the string and a pointer one behind
the end.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-07 07:54:23 +00:00
Hartmut Brandt
d01d6678ad Invent a Buf_Append function to append a NUL-terminated string 
and use it thoughout the code.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-07 07:49:16 +00:00
Hartmut Brandt
b8900c134b None of the users of Buf_Discard used it to get rid of only a part of 
the buffer. So replace Buf_Discard by Buf_Clear which just gets rid
of the entire contents.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-04 13:34:16 +00:00
Hartmut Brandt
ce8c7083f4 General whitespace cleanup: remove mixes of tabs and spaces, remove 
space after function names, remove spaces on emtpy lines.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-04 12:38:57 +00:00
Hartmut Brandt
acd5b69dd1 Further constification. Use a temporary hack (copying the input string) 
until Var_Subst is fixed.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-04 12:10:20 +00:00
Hartmut Brandt
8cfa18d178 Use an extra variable to assign to instead of missusing an input 
parameter. This will help in constification.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-04 08:31:42 +00:00
Hartmut Brandt
e23bc3a201 Some more easy constification. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-04 07:51:00 +00:00