diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-19 13:31:10 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-19 13:31:10 -0400 |
| commit | a859e640035680db31531ccd19a67292dd726baf (patch) | |
| tree | c06c1f5df27cde6bc5cf1a91c02e9241aae03fbb /src/backend/regex/regcomp.c | |
| parent | 6eefd2422ef232aec2fe12465d9ec4018c63814d (diff) | |
| download | postgresql-a859e640035680db31531ccd19a67292dd726baf.tar.gz postgresql-a859e640035680db31531ccd19a67292dd726baf.zip | |
Clean up another pre-ANSI-C-ism in regex code: get rid of pcolor typedef.
pcolor was used to represent function arguments that are nominally of
type color, but when using a pre-ANSI C compiler would be passed as the
promoted integer type. We really don't need that anymore.
Diffstat (limited to 'src/backend/regex/regcomp.c')
| -rw-r--r-- | src/backend/regex/regcomp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 48d63da11de..b211cc0a189 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -97,19 +97,19 @@ static chr chrnamed(struct vars *, const chr *, const chr *, chr); static void initcm(struct vars *, struct colormap *); static void freecm(struct colormap *); static void cmtreefree(struct colormap *, union tree *, int); -static color setcolor(struct colormap *, chr, pcolor); +static color setcolor(struct colormap *, chr, color); static color maxcolor(struct colormap *); static color newcolor(struct colormap *); -static void freecolor(struct colormap *, pcolor); +static void freecolor(struct colormap *, color); static color pseudocolor(struct colormap *); static color subcolor(struct colormap *, chr c); -static color newsub(struct colormap *, pcolor); +static color newsub(struct colormap *, color); static void subrange(struct vars *, chr, chr, struct state *, struct state *); static void subblock(struct vars *, chr, struct state *, struct state *); static void okcolors(struct nfa *, struct colormap *); static void colorchain(struct colormap *, struct arc *); static void uncolorchain(struct colormap *, struct arc *); -static void rainbow(struct nfa *, struct colormap *, int, pcolor, struct state *, struct state *); +static void rainbow(struct nfa *, struct colormap *, int, color, struct state *, struct state *); static void colorcomplement(struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *); #ifdef REG_DEBUG @@ -125,13 +125,13 @@ static struct state *newfstate(struct nfa *, int flag); static void dropstate(struct nfa *, struct state *); static void freestate(struct nfa *, struct state *); static void destroystate(struct nfa *, struct state *); -static void newarc(struct nfa *, int, pcolor, struct state *, struct state *); -static void createarc(struct nfa *, int, pcolor, struct state *, struct state *); +static void newarc(struct nfa *, int, color, struct state *, struct state *); +static void createarc(struct nfa *, int, color, struct state *, struct state *); static struct arc *allocarc(struct nfa *, struct state *); static void freearc(struct nfa *, struct arc *); static void changearctarget(struct arc *, struct state *); static int hasnonemptyout(struct state *); -static struct arc *findarc(struct state *, int, pcolor); +static struct arc *findarc(struct state *, int, color); static void cparc(struct nfa *, struct arc *, struct state *, struct state *); static void sortins(struct nfa *, struct state *); static int sortins_cmp(const void *, const void *); |