mirror of
https://github.com/postgres/postgres.git
synced 2025-07-02 09:02:37 +03:00
Another pgindent run with updated typedefs.
This commit is contained in:
Bruce Momjian
@ -28,7 +28,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_color.c,v 1.2 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_color.c,v 1.3 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*
|
||||
* Note that there are some incestuous relationships between this code and
|
||||
@ -144,7 +144,7 @@ cmtreefree(struct colormap * cm,
|
||||
/*
|
||||
* setcolor - set the color of a character in a colormap
|
||||
*/
|
||||
static color /* previous color */
|
||||
static color /* previous color */
|
||||
setcolor(struct colormap * cm,
|
||||
chr c,
|
||||
pcolor co)
|
||||
@ -218,7 +218,7 @@ maxcolor(struct colormap * cm)
|
||||
* newcolor - find a new color (must be subject of setcolor at once)
|
||||
* Beware: may relocate the colordescs.
|
||||
*/
|
||||
static color /* COLORLESS for error */
|
||||
static color /* COLORLESS for error */
|
||||
newcolor(struct colormap * cm)
|
||||
{
|
||||
struct colordesc *cd;
|
||||
@ -421,7 +421,7 @@ subrange(struct vars * v,
|
||||
|
||||
/* first, align "from" on a tree-block boundary */
|
||||
uf = (uchr) from;
|
||||
i = (int) (((uf + BYTTAB - 1) & (uchr) ~ BYTMASK) - uf);
|
||||
i = (int) (((uf + BYTTAB - 1) & (uchr) ~BYTMASK) - uf);
|
||||
for (; from <= to && i > 0; i--, from++)
|
||||
newarc(v->nfa, PLAIN, subcolor(v->cm, from), lp, rp);
|
||||
if (from > to) /* didn't reach a boundary */
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_cvec.c,v 1.2 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_cvec.c,v 1.3 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -52,7 +52,7 @@ newcvec(int nchrs, /* to hold this many chrs... */
|
||||
if (cv == NULL)
|
||||
return NULL;
|
||||
cv->chrspace = nchrs;
|
||||
cv->chrs = (chr *) & cv->mcces[nmcces]; /* chrs just after MCCE
|
||||
cv->chrs = (chr *) &cv->mcces[nmcces]; /* chrs just after MCCE
|
||||
* ptrs */
|
||||
cv->mccespace = nmcces;
|
||||
cv->ranges = cv->chrs + nchrs + nmcces * (MAXMCCE + 1);
|
||||
@ -71,7 +71,7 @@ clearcvec(struct cvec * cv)
|
||||
|
||||
assert(cv != NULL);
|
||||
cv->nchrs = 0;
|
||||
assert(cv->chrs == (chr *) & cv->mcces[cv->mccespace]);
|
||||
assert(cv->chrs == (chr *) &cv->mcces[cv->mccespace]);
|
||||
cv->nmcces = 0;
|
||||
cv->nmccechrs = 0;
|
||||
cv->nranges = 0;
|
||||
@ -111,8 +111,8 @@ addrange(struct cvec * cv, /* character vector */
|
||||
*/
|
||||
static void
|
||||
addmcce(struct cvec * cv, /* character vector */
|
||||
chr * startp, /* beginning of text */
|
||||
chr * endp) /* just past end of text */
|
||||
chr *startp, /* beginning of text */
|
||||
chr *endp) /* just past end of text */
|
||||
{
|
||||
int len;
|
||||
int i;
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_lex.c,v 1.2 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_lex.c,v 1.3 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -201,8 +201,8 @@ prefixes(struct vars * v)
|
||||
*/
|
||||
static void
|
||||
lexnest(struct vars * v,
|
||||
chr * beginp, /* start of interpolation */
|
||||
chr * endp) /* one past end of interpolation */
|
||||
chr *beginp, /* start of interpolation */
|
||||
chr *endp) /* one past end of interpolation */
|
||||
{
|
||||
assert(v->savenow == NULL); /* only one level of nesting */
|
||||
v->savenow = v->now;
|
||||
@ -876,7 +876,7 @@ lexescape(struct vars * v)
|
||||
/*
|
||||
* lexdigits - slurp up digits and return chr value
|
||||
*/
|
||||
static chr /* chr value; errors signalled via ERR */
|
||||
static chr /* chr value; errors signalled via ERR */
|
||||
lexdigits(struct vars * v,
|
||||
int base,
|
||||
int minlen,
|
||||
@ -1121,8 +1121,8 @@ newline(void)
|
||||
*/
|
||||
static chr
|
||||
chrnamed(struct vars * v,
|
||||
chr * startp, /* start of name */
|
||||
chr * endp, /* just past end of name */
|
||||
chr *startp, /* start of name */
|
||||
chr *endp, /* just past end of name */
|
||||
chr lastresort) /* what to return if name lookup fails */
|
||||
{
|
||||
celt c;
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
* permission to use and distribute the software in accordance with the
|
||||
* terms specified in this license.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_locale.c,v 1.2 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regc_locale.c,v 1.3 2003/08/08 21:41:56 momjian Exp $
|
||||
*/
|
||||
|
||||
/* ASCII character-name table */
|
||||
@ -453,8 +453,8 @@ allmcces(struct vars * v, /* context */
|
||||
*/
|
||||
static celt
|
||||
element(struct vars * v, /* context */
|
||||
chr * startp, /* points to start of name */
|
||||
chr * endp) /* points just past end of name */
|
||||
chr *startp, /* points to start of name */
|
||||
chr *endp) /* points just past end of name */
|
||||
{
|
||||
struct cname *cn;
|
||||
size_t len;
|
||||
@ -593,8 +593,8 @@ eclass(struct vars * v, /* context */
|
||||
*/
|
||||
static struct cvec *
|
||||
cclass(struct vars * v, /* context */
|
||||
chr * startp, /* where the name starts */
|
||||
chr * endp, /* just past the end of the name */
|
||||
chr *startp, /* where the name starts */
|
||||
chr *endp, /* just past the end of the name */
|
||||
int cases) /* case-independent? */
|
||||
{
|
||||
size_t len;
|
||||
@ -804,7 +804,7 @@ allcases(struct vars * v, /* context */
|
||||
* stop at embedded NULs!
|
||||
*/
|
||||
static int /* 0 for equal, nonzero for unequal */
|
||||
cmp(const chr * x, const chr * y, /* strings to compare */
|
||||
cmp(const chr *x, const chr *y, /* strings to compare */
|
||||
size_t len) /* exact length of comparison */
|
||||
{
|
||||
return memcmp(VS(x), VS(y), len * sizeof(chr));
|
||||
@ -819,7 +819,7 @@ cmp(const chr * x, const chr * y, /* strings to compare */
|
||||
* stop at embedded NULs!
|
||||
*/
|
||||
static int /* 0 for equal, nonzero for unequal */
|
||||
casecmp(const chr * x, const chr * y, /* strings to compare */
|
||||
casecmp(const chr *x, const chr *y, /* strings to compare */
|
||||
size_t len) /* exact length of comparison */
|
||||
{
|
||||
for (; len > 0; len--, x++, y++)
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regcomp.c,v 1.37 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regcomp.c,v 1.38 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -293,7 +293,7 @@ static struct fns functions = {
|
||||
*/
|
||||
int
|
||||
pg_regcomp(regex_t *re,
|
||||
const chr * string,
|
||||
const chr *string,
|
||||
size_t len,
|
||||
int flags)
|
||||
{
|
||||
@ -1052,8 +1052,8 @@ parseqatom(struct vars * v,
|
||||
/*
|
||||
* prepare a general-purpose state skeleton
|
||||
*
|
||||
* ---> [s] ---prefix---> [begin] ---atom---> [end] ----rest---> [rp] /
|
||||
* / [lp] ----> [s2] ----bypass---------------------
|
||||
* ---> [s] ---prefix---> [begin] ---atom---> [end] ----rest---> [rp] / /
|
||||
* [lp] ----> [s2] ----bypass---------------------
|
||||
*
|
||||
* where bypass is an empty, and prefix is some repetitions of atom
|
||||
*/
|
||||
@ -1758,7 +1758,7 @@ dovec(struct vars * v,
|
||||
/*
|
||||
* nextleader - find next MCCE leader within range
|
||||
*/
|
||||
static celt /* NOCELT means none */
|
||||
static celt /* NOCELT means none */
|
||||
nextleader(struct vars * v,
|
||||
chr from,
|
||||
chr to)
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/rege_dfa.c,v 1.2 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/rege_dfa.c,v 1.3 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
static chr * /* endpoint, or NULL */
|
||||
longest(struct vars * v, /* used only for debug and exec flags */
|
||||
struct dfa * d,
|
||||
chr * start, /* where the match should start */
|
||||
chr * stop, /* match must end at or before here */
|
||||
chr *start, /* where the match should start */
|
||||
chr *stop, /* match must end at or before here */
|
||||
int *hitstopp) /* record whether hit v->stop, if non-NULL */
|
||||
{
|
||||
chr *cp;
|
||||
@ -142,10 +142,10 @@ longest(struct vars * v, /* used only for debug and exec flags */
|
||||
static chr * /* endpoint, or NULL */
|
||||
shortest(struct vars * v,
|
||||
struct dfa * d,
|
||||
chr * start, /* where the match should start */
|
||||
chr * min, /* match must end at or after here */
|
||||
chr * max, /* match must end at or before here */
|
||||
chr ** coldp, /* store coldstart pointer here, if
|
||||
chr *start, /* where the match should start */
|
||||
chr *min, /* match must end at or after here */
|
||||
chr *max, /* match must end at or before here */
|
||||
chr **coldp, /* store coldstart pointer here, if
|
||||
* nonNULL */
|
||||
int *hitstopp) /* record whether hit v->stop, if non-NULL */
|
||||
{
|
||||
@ -394,7 +394,7 @@ hash(unsigned *uv,
|
||||
static struct sset *
|
||||
initialize(struct vars * v, /* used only for debug flags */
|
||||
struct dfa * d,
|
||||
chr * start)
|
||||
chr *start)
|
||||
{
|
||||
struct sset *ss;
|
||||
int i;
|
||||
@ -430,8 +430,8 @@ miss(struct vars * v, /* used only for debug flags */
|
||||
struct dfa * d,
|
||||
struct sset * css,
|
||||
pcolor co,
|
||||
chr * cp, /* next chr */
|
||||
chr * start) /* where the attempt got started */
|
||||
chr *cp, /* next chr */
|
||||
chr *start) /* where the attempt got started */
|
||||
{
|
||||
struct cnfa *cnfa = d->cnfa;
|
||||
int i;
|
||||
@ -538,7 +538,7 @@ miss(struct vars * v, /* used only for debug flags */
|
||||
static int /* predicate: constraint satisfied? */
|
||||
lacon(struct vars * v,
|
||||
struct cnfa * pcnfa, /* parent cnfa */
|
||||
chr * cp,
|
||||
chr *cp,
|
||||
pcolor co) /* "color" of the lookahead constraint */
|
||||
{
|
||||
int n;
|
||||
@ -571,8 +571,8 @@ lacon(struct vars * v,
|
||||
static struct sset *
|
||||
getvacant(struct vars * v, /* used only for debug flags */
|
||||
struct dfa * d,
|
||||
chr * cp,
|
||||
chr * start)
|
||||
chr *cp,
|
||||
chr *start)
|
||||
{
|
||||
int i;
|
||||
struct sset *ss;
|
||||
@ -639,8 +639,8 @@ getvacant(struct vars * v, /* used only for debug flags */
|
||||
static struct sset *
|
||||
pickss(struct vars * v, /* used only for debug flags */
|
||||
struct dfa * d,
|
||||
chr * cp,
|
||||
chr * start)
|
||||
chr *cp,
|
||||
chr *start)
|
||||
{
|
||||
int i;
|
||||
struct sset *ss;
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regexec.c,v 1.22 2003/08/04 00:43:21 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/regex/regexec.c,v 1.23 2003/08/08 21:41:56 momjian Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -166,9 +166,9 @@ static struct sset *pickss(struct vars *, struct dfa *, chr *, chr *);
|
||||
*/
|
||||
int
|
||||
pg_regexec(regex_t *re,
|
||||
const chr * string,
|
||||
const chr *string,
|
||||
size_t len,
|
||||
rm_detail_t * details,
|
||||
rm_detail_t *details,
|
||||
size_t nmatch,
|
||||
regmatch_t pmatch[],
|
||||
int flags)
|
||||
@ -399,7 +399,7 @@ cfindloop(struct vars * v,
|
||||
struct colormap * cm,
|
||||
struct dfa * d,
|
||||
struct dfa * s,
|
||||
chr ** coldp) /* where to put coldstart pointer */
|
||||
chr **coldp) /* where to put coldstart pointer */
|
||||
{
|
||||
chr *begin;
|
||||
chr *end;
|
||||
@ -528,8 +528,8 @@ zapmem(struct vars * v,
|
||||
static void
|
||||
subset(struct vars * v,
|
||||
struct subre * sub,
|
||||
chr * begin,
|
||||
chr * end)
|
||||
chr *begin,
|
||||
chr *end)
|
||||
{
|
||||
int n = sub->subno;
|
||||
|
||||
@ -548,8 +548,8 @@ subset(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
dissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
assert(t != NULL);
|
||||
MDEBUG(("dissect %ld-%ld\n", LOFF(begin), LOFF(end)));
|
||||
@ -589,8 +589,8 @@ dissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
condissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
struct dfa *d;
|
||||
struct dfa *d2;
|
||||
@ -671,8 +671,8 @@ condissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
altdissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
struct dfa *d;
|
||||
int i;
|
||||
@ -706,8 +706,8 @@ altdissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
cdissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
int er;
|
||||
|
||||
@ -754,8 +754,8 @@ cdissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
ccondissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
struct dfa *d;
|
||||
struct dfa *d2;
|
||||
@ -855,8 +855,8 @@ ccondissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
crevdissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
struct dfa *d;
|
||||
struct dfa *d2;
|
||||
@ -953,8 +953,8 @@ crevdissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
cbrdissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
int i;
|
||||
int n = t->subno;
|
||||
@ -1020,8 +1020,8 @@ cbrdissect(struct vars * v,
|
||||
static int /* regexec return code */
|
||||
caltdissect(struct vars * v,
|
||||
struct subre * t,
|
||||
chr * begin, /* beginning of relevant substring */
|
||||
chr * end) /* end of same */
|
||||
chr *begin, /* beginning of relevant substring */
|
||||
chr *end) /* end of same */
|
||||
{
|
||||
struct dfa *d;
|
||||
int er;
|
||||
|
||||
Reference in New Issue
Block a user