diff options
author | Bruce Momjian <bruce@momjian.us> | 2000-04-12 17:17:23 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2000-04-12 17:17:23 +0000 |
commit | 52f77df613cea1803ce86321c37229626d9f213c (patch) | |
tree | bd9ac9f667f295cb65f4c448a5bb5a062d656b27 /src/backend/access/common | |
parent | db4518729d85da83eafdacbcebaeb12618517595 (diff) | |
download | postgresql-52f77df613cea1803ce86321c37229626d9f213c.tar.gz postgresql-52f77df613cea1803ce86321c37229626d9f213c.zip |
Ye-old pgindent run. Same 4-space tabs.
Diffstat (limited to 'src/backend/access/common')
-rw-r--r-- | src/backend/access/common/heaptuple.c | 24 | ||||
-rw-r--r-- | src/backend/access/common/indextuple.c | 6 | ||||
-rw-r--r-- | src/backend/access/common/tupdesc.c | 31 |
3 files changed, 31 insertions, 30 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 4eec6ed6d07..d30e4c7fe64 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.61 2000/01/26 05:55:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.62 2000/04/12 17:14:36 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -137,9 +137,9 @@ DataFill(char *data, *((int32 *) value[i])); break; default: - Assert(att[i]->attlen >= 0); - memmove(data, DatumGetPointer(value[i]), - (size_t)(att[i]->attlen)); + Assert(att[i]->attlen >= 0); + memmove(data, DatumGetPointer(value[i]), + (size_t) (att[i]->attlen)); break; } data = (char *) att_addlength((long) data, att[i]->attlen, value[i]); @@ -326,7 +326,7 @@ nocachegetattr(HeapTuple tuple, Form_pg_attribute *att = tupleDesc->attrs; int slow = 0; /* do we have to walk nulls? */ - (void)isnull; /*not used*/ + (void) isnull; /* not used */ #ifdef IN_MACRO /* This is handled in the macro */ Assert(attnum > 0); @@ -681,7 +681,7 @@ heap_formtuple(TupleDesc tupleDescriptor, len += bitmaplen; } - hoff = len = MAXALIGN(len); /* be conservative here */ + hoff = len = MAXALIGN(len); /* be conservative here */ len += ComputeDataSize(tupleDescriptor, value, nulls); @@ -806,11 +806,9 @@ void heap_freetuple(HeapTuple htup) { if (htup->t_data != NULL) - if (htup->t_datamcxt != NULL && (char *)(htup->t_data) != - ((char *) htup + HEAPTUPLESIZE)) - { + if (htup->t_datamcxt != NULL && (char *) (htup->t_data) != + ((char *) htup + HEAPTUPLESIZE)) elog(NOTICE, "TELL Jan Wieck: heap_freetuple() found separate t_data"); - } pfree(htup); } @@ -835,7 +833,7 @@ heap_addheader(uint32 natts, /* max domain index */ len = offsetof(HeapTupleHeaderData, t_bits); - hoff = len = MAXALIGN(len); /* be conservative */ + hoff = len = MAXALIGN(len); /* be conservative */ len += structlen; tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len); tuple->t_datamcxt = CurrentMemoryContext; @@ -850,8 +848,8 @@ heap_addheader(uint32 natts, /* max domain index */ td->t_infomask = 0; td->t_infomask |= HEAP_XMAX_INVALID; - if (structlen > 0) - memmove((char *) td + hoff, structure, (size_t)structlen); + if (structlen > 0) + memmove((char *) td + hoff, structure, (size_t) structlen); return tuple; } diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 438318747d2..e11ddbc1dc9 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.42 2000/01/26 05:55:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.43 2000/04/12 17:14:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ index_formtuple(TupleDesc tupleDescriptor, hoff = IndexInfoFindDataOffset(infomask); size = hoff + ComputeDataSize(tupleDescriptor, value, null); - size = MAXALIGN(size); /* be conservative */ + size = MAXALIGN(size); /* be conservative */ tp = (char *) palloc(size); tuple = (IndexTuple) tp; @@ -134,7 +134,7 @@ nocache_index_getattr(IndexTuple tup, int data_off; /* tuple data offset */ Form_pg_attribute *att = tupleDesc->attrs; - (void)isnull; + (void) isnull; /* ---------------- * sanity checks * ---------------- diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index b2af4ff932e..1e8d2ae0034 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.61 2000/01/31 04:35:48 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.62 2000/04/12 17:14:37 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -229,17 +229,19 @@ FreeTupleDesc(TupleDesc tupdesc) bool equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) { - int i; + int i; if (tupdesc1->natts != tupdesc2->natts) return false; for (i = 0; i < tupdesc1->natts; i++) { - Form_pg_attribute attr1 = tupdesc1->attrs[i]; - Form_pg_attribute attr2 = tupdesc2->attrs[i]; + Form_pg_attribute attr1 = tupdesc1->attrs[i]; + Form_pg_attribute attr2 = tupdesc2->attrs[i]; - /* We do not need to check every single field here, and in fact - * some fields such as attdisbursion probably shouldn't be compared. + /* + * We do not need to check every single field here, and in fact + * some fields such as attdisbursion probably shouldn't be + * compared. */ if (strcmp(NameStr(attr1->attname), NameStr(attr2->attname)) != 0) return false; @@ -254,8 +256,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) } if (tupdesc1->constr != NULL) { - TupleConstr *constr1 = tupdesc1->constr; - TupleConstr *constr2 = tupdesc2->constr; + TupleConstr *constr1 = tupdesc1->constr; + TupleConstr *constr2 = tupdesc2->constr; if (constr2 == NULL) return false; @@ -263,8 +265,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) return false; for (i = 0; i < (int) constr1->num_defval; i++) { - AttrDefault *defval1 = constr1->defval + i; - AttrDefault *defval2 = constr2->defval + i; + AttrDefault *defval1 = constr1->defval + i; + AttrDefault *defval2 = constr2->defval + i; if (defval1->adnum != defval2->adnum) return false; @@ -275,8 +277,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2) return false; for (i = 0; i < (int) constr1->num_check; i++) { - ConstrCheck *check1 = constr1->check + i; - ConstrCheck *check2 = constr2->check + i; + ConstrCheck *check1 = constr1->check + i; + ConstrCheck *check2 = constr2->check + i; if (strcmp(check1->ccname, check2->ccname) != 0) return false; @@ -585,8 +587,9 @@ BuildDescForRelation(List *schema, char *relname) constr->has_not_null = true; desc->attrs[attnum - 1]->attnotnull = entry->is_not_null; - /* Note we copy only pre-cooked default expressions. - * Digestion of raw ones is someone else's problem. + /* + * Note we copy only pre-cooked default expressions. Digestion of + * raw ones is someone else's problem. */ if (entry->cooked_default != NULL) { |