diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-06-25 01:51:46 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-06-25 01:51:46 +0300 |
| commit | b8b2e3b2deeaab19715af063fc009b7c230b2336 (patch) | |
| tree | c6ee1310487d59e37e3e143835b5609e78524f65 /src/backend/commands/trigger.c | |
| parent | 7eb8c7851458eb88def80c290a4b5bc37cc321f3 (diff) | |
| download | postgresql-b8b2e3b2deeaab19715af063fc009b7c230b2336.tar.gz postgresql-b8b2e3b2deeaab19715af063fc009b7c230b2336.zip | |
Replace int2/int4 in C code with int16/int32
The latter was already the dominant use, and it's preferable because
in C the convention is that intXX means XX bits. Therefore, allowing
mixed use of int2, int4, int8, int16, int32 is obviously confusing.
Remove the typedefs for int2 and int4 for now. They don't seem to be
widely used outside of the PostgreSQL source tree, and the few uses
can probably be cleaned up by the time this ships.
Diffstat (limited to 'src/backend/commands/trigger.c')
| -rw-r--r-- | src/backend/commands/trigger.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 834b694ec6b..faa7f0c4c50 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -121,7 +121,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, { int16 tgtype; int ncolumns; - int2 *columns; + int16 *columns; int2vector *tgattr; Node *whenClause; List *whenRtable; @@ -589,11 +589,11 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, ListCell *cell; int i = 0; - columns = (int2 *) palloc(ncolumns * sizeof(int2)); + columns = (int16 *) palloc(ncolumns * sizeof(int16)); foreach(cell, stmt->columns) { char *name = strVal(lfirst(cell)); - int2 attnum; + int16 attnum; int j; /* Lookup column name. System columns are not allowed */ @@ -1501,9 +1501,9 @@ RelationBuildTriggers(Relation relation) build->tgnattr = pg_trigger->tgattr.dim1; if (build->tgnattr > 0) { - build->tgattr = (int2 *) palloc(build->tgnattr * sizeof(int2)); + build->tgattr = (int16 *) palloc(build->tgnattr * sizeof(int16)); memcpy(build->tgattr, &(pg_trigger->tgattr.values), - build->tgnattr * sizeof(int2)); + build->tgnattr * sizeof(int16)); } else build->tgattr = NULL; @@ -1654,11 +1654,11 @@ CopyTriggerDesc(TriggerDesc *trigdesc) trigger->tgname = pstrdup(trigger->tgname); if (trigger->tgnattr > 0) { - int2 *newattr; + int16 *newattr; - newattr = (int2 *) palloc(trigger->tgnattr * sizeof(int2)); + newattr = (int16 *) palloc(trigger->tgnattr * sizeof(int16)); memcpy(newattr, trigger->tgattr, - trigger->tgnattr * sizeof(int2)); + trigger->tgnattr * sizeof(int16)); trigger->tgattr = newattr; } if (trigger->tgnargs > 0) @@ -1772,7 +1772,7 @@ equalTriggerDescs(TriggerDesc *trigdesc1, TriggerDesc *trigdesc2) return false; if (trig1->tgnattr > 0 && memcmp(trig1->tgattr, trig2->tgattr, - trig1->tgnattr * sizeof(int2)) != 0) + trig1->tgnattr * sizeof(int16)) != 0) return false; for (j = 0; j < trig1->tgnargs; j++) if (strcmp(trig1->tgargs[j], trig2->tgargs[j]) != 0) |