diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/like.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/name.c | 36 | ||||
-rw-r--r-- | src/backend/utils/adt/regexp.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/regproc.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/ruleutils.c | 31 | ||||
-rw-r--r-- | src/backend/utils/adt/varchar.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/varlena.c | 10 | ||||
-rw-r--r-- | src/backend/utils/cache/catcache.c | 6 | ||||
-rw-r--r-- | src/backend/utils/cache/inval.c | 4 | ||||
-rw-r--r-- | src/backend/utils/cache/lsyscache.c | 8 | ||||
-rw-r--r-- | src/backend/utils/cache/relcache.c | 36 | ||||
-rw-r--r-- | src/backend/utils/cache/temprel.c | 6 | ||||
-rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 4 | ||||
-rw-r--r-- | src/backend/utils/misc/database.c | 4 |
14 files changed, 86 insertions, 85 deletions
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 8c877c3ffdc..ad5c5453e7d 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -10,7 +10,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.31 1999/09/07 19:09:46 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.32 1999/11/07 23:08:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,7 +82,7 @@ namelike(NameData *n, struct varlena * p) { if (!n) return FALSE; - return fixedlen_like(n->data, p, NAMEDATALEN); + return fixedlen_like(NameStr(*n), p, NAMEDATALEN); } bool diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index b4d0a7da728..fd457afcbe0 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.23 1999/07/17 20:17:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.24 1999/11/07 23:08:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,11 +40,11 @@ namein(char *s) return NULL; result = (NameData *) palloc(NAMEDATALEN); /* always keep it null-padded */ - StrNCpy(result->data, s, NAMEDATALEN); - len = strlen(result->data); + StrNCpy(NameStr(*result), s, NAMEDATALEN); + len = strlen(NameStr(*result)); while (len < NAMEDATALEN) { - *(result->data + len) = '\0'; + *(NameStr(*result) + len) = '\0'; len++; } return result; @@ -59,7 +59,7 @@ nameout(NameData *s) if (s == NULL) return "-"; else - return pstrdup(s->data); + return pstrdup(NameStr(*s)); } @@ -87,7 +87,7 @@ nameeq(NameData *arg1, NameData *arg2) if (!arg1 || !arg2) return 0; else - return (bool) strncmp(arg1->data, arg2->data, NAMEDATALEN) == 0; + return (bool) strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) == 0; } bool @@ -95,7 +95,7 @@ namene(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) return (bool) 0; - return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) != 0); + return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) != 0); } bool @@ -103,7 +103,7 @@ namelt(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) return (bool) 0; - return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) < 0); + return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) < 0); } bool @@ -111,7 +111,7 @@ namele(NameData *arg1, NameData *arg2) { if (arg1 == NULL || arg2 == NULL) return (bool) 0; - return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) <= 0); + return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) <= 0); } bool @@ -120,7 +120,7 @@ namegt(NameData *arg1, NameData *arg2) if (arg1 == NULL || arg2 == NULL) return (bool) 0; - return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) > 0); + return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) > 0); } bool @@ -129,7 +129,7 @@ namege(NameData *arg1, NameData *arg2) if (arg1 == NULL || arg2 == NULL) return (bool) 0; - return (bool) (strncmp(arg1->data, arg2->data, NAMEDATALEN) >= 0); + return (bool) (strncmp(NameStr(*arg1), NameStr(*arg2), NAMEDATALEN) >= 0); } @@ -140,7 +140,7 @@ namecpy(Name n1, Name n2) { if (!n1 || !n2) return -1; - strncpy(n1->data, n2->data, NAMEDATALEN); + strncpy(NameStr(*n1), NameStr(*n2), NAMEDATALEN); return 0; } @@ -148,7 +148,7 @@ namecpy(Name n1, Name n2) int namecat(Name n1, Name n2) { - return namestrcat(n1, n2->data); /* n2 can't be any longer than n1 */ + return namestrcat(n1, NameStr(*n2)); /* n2 can't be any longer than n1 */ } #endif @@ -157,7 +157,7 @@ namecat(Name n1, Name n2) int namecmp(Name n1, Name n2) { - return strncmp(n1->data, n2->data, NAMEDATALEN); + return strncmp(NameStr(*n1), NameStr(*n2), NAMEDATALEN); } #endif @@ -167,7 +167,7 @@ namestrcpy(Name name, char *str) { if (!name || !str) return -1; - StrNCpy(name->data, str, NAMEDATALEN); + StrNCpy(NameStr(*name), str, NAMEDATALEN); return 0; } @@ -181,7 +181,7 @@ namestrcat(Name name, char *str) if (!name || !str) return -1; - for (i = 0, p = name->data; i < NAMEDATALEN && *p; ++i, ++p) + for (i = 0, p = NameStr(*name); i < NAMEDATALEN && *p; ++i, ++p) ; for (q = str; i < NAMEDATALEN; ++i, ++p, ++q) { @@ -203,7 +203,7 @@ namestrcmp(Name name, char *str) return -1; /* NULL < anything */ if (!str) return 1; /* NULL < anything */ - return strncmp(name->data, str, NAMEDATALEN); + return strncmp(NameStr(*name), str, NAMEDATALEN); } /***************************************************************************** @@ -217,7 +217,7 @@ NameComputeLength(Name name) char *charP; int length; - for (length = 0, charP = name->data; + for (length = 0, charP = NameStr(*name); length < NAMEDATALEN && *charP != '\0'; length++, charP++) ; diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 082b1dba62a..bf0a598c16f 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.28 1999/07/17 20:17:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.29 1999/11/07 23:08:24 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -200,7 +200,7 @@ nameregexeq(NameData *n, struct varlena * p) { if (!n) return FALSE; - return fixedlen_regexeq(n->data, p, NAMEDATALEN, REG_EXTENDED); + return fixedlen_regexeq(NameStr(*n), p, NAMEDATALEN, REG_EXTENDED); } bool @@ -248,7 +248,7 @@ nameicregexeq(NameData *n, struct varlena * p) { if (!n) return FALSE; - return (fixedlen_regexeq(n->data, p, NAMEDATALEN, + return (fixedlen_regexeq(NameStr(*n), p, NAMEDATALEN, REG_ICASE | REG_EXTENDED)); } diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index b3179e864c1..74dd671e968 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.43 1999/09/18 19:07:49 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.44 1999/11/07 23:08:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -173,7 +173,7 @@ regprocout(RegProcedure proid) { char *s; - s = ((Form_pg_proc) GETSTRUCT(proctup))->proname.data; + s = NameStr(((Form_pg_proc) GETSTRUCT(proctup))->proname); StrNCpy(result, s, NAMEDATALEN); } else @@ -261,7 +261,7 @@ oid8types(Oid *oidArray) { char *s; - s = ((Form_pg_type) GETSTRUCT(typetup))->typname.data; + s = NameStr(((Form_pg_type) GETSTRUCT(typetup))->typname); StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, NAMEDATALEN); strcat(VARDATA(result), " "); diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 83e593c5301..22f904b60d5 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.29 1999/10/31 18:57:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.30 1999/11/07 23:08:24 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -138,7 +138,7 @@ pg_get_ruledef(NameData *rname) * We need the rules name somewhere deep down * ---------- */ - rulename = nameout(rname); + rulename = pstrdup(NameStr(*rname)); /* ---------- * Connect to SPI manager @@ -238,7 +238,7 @@ pg_get_viewdef(NameData *rname) * We need the rules name somewhere deep down * ---------- */ - rulename = nameout(rname); + rulename = pstrdup(NameStr(*rname)); /* ---------- * Connect to SPI manager @@ -410,10 +410,10 @@ pg_get_indexdef(Oid indexrelid) spirc = SPI_execp(plan_getam, spi_args, spi_nulls, 1); if (spirc != SPI_OK_SELECT) elog(ERROR, "failed to get pg_am tuple for index %s", - nameout(&(idxrelrec->relname))); + idxrelrec->relname); if (SPI_processed != 1) elog(ERROR, "failed to get pg_am tuple for index %s", - nameout(&(idxrelrec->relname))); + idxrelrec->relname); spi_tup = SPI_tuptable->vals[0]; spi_ttc = SPI_tuptable->tupdesc; spi_fno = SPI_fnumber(spi_ttc, "amname"); @@ -425,8 +425,8 @@ pg_get_indexdef(Oid indexrelid) initStringInfo(&buf); appendStringInfo(&buf, "CREATE %sINDEX %s ON %s USING %s (", idxrec->indisunique ? "UNIQUE " : "", - quote_identifier(nameout(&(idxrelrec->relname))), - quote_identifier(nameout(&(indrelrec->relname))), + quote_identifier(pstrdup(NameStr(idxrelrec->relname))), + quote_identifier(pstrdup(NameStr(indrelrec->relname))), quote_identifier(SPI_getvalue(spi_tup, spi_ttc, spi_fno))); @@ -491,7 +491,7 @@ pg_get_indexdef(Oid indexrelid) procStruct = (Form_pg_proc) GETSTRUCT(proctup); appendStringInfo(&buf, "%s(%s) ", - quote_identifier(nameout(&(procStruct->proname))), + quote_identifier(pstrdup(NameStr(procStruct->proname))), keybuf.data); spi_args[0] = ObjectIdGetDatum(idxrec->indclass[0]); @@ -561,7 +561,7 @@ pg_get_userbyid(int32 uid) * ---------- */ result = (NameData *) palloc(NAMEDATALEN); - memset(result->data, 0, NAMEDATALEN); + memset(NameStr(*result), 0, NAMEDATALEN); /* ---------- * Get the pg_shadow entry and print the result @@ -572,7 +572,7 @@ pg_get_userbyid(int32 uid) if (HeapTupleIsValid(usertup)) { user_rec = (Form_pg_shadow) GETSTRUCT(usertup); - StrNCpy(result->data, (&(user_rec->usename))->data, NAMEDATALEN); + StrNCpy(NameStr(*result), NameStr(user_rec->usename), NAMEDATALEN); } else sprintf((char *) result, "unknown (UID=%d)", uid); @@ -1446,7 +1446,7 @@ get_func_expr(Expr *expr, deparse_context *context) elog(ERROR, "cache lookup for proc %u failed", func->funcid); procStruct = (Form_pg_proc) GETSTRUCT(proctup); - proname = nameout(&(procStruct->proname)); + proname = pstrdup(NameStr(procStruct->proname)); /* * nullvalue() and nonnullvalue() should get turned into special syntax @@ -1555,7 +1555,8 @@ get_tle_expr(TargetEntry *tle, deparse_context *context) elog(ERROR, "cache lookup for type %u failed", procStruct->prorettype); typeStruct = (Form_pg_type) GETSTRUCT(tup); - if (strncmp(procStruct->proname.data, typeStruct->typname.data, + if (strncmp(NameStr(procStruct->proname), + NameStr(typeStruct->typname), NAMEDATALEN) != 0) { get_rule_expr(tle->expr, context); @@ -1662,7 +1663,7 @@ get_const_expr(Const *constval, deparse_context *context) /* These types can be left unlabeled */ break; default: - extval = (char *) nameout(&(typeStruct->typname)); + extval = pstrdup(NameStr(typeStruct->typname)); appendStringInfo(buf, "::%s", quote_identifier(extval)); pfree(extval); break; @@ -1800,7 +1801,7 @@ get_relation_name(Oid relid) elog(ERROR, "cache lookup of relation %u failed", relid); classStruct = (Form_pg_class) GETSTRUCT(classtup); - return nameout(&(classStruct->relname)); + return pstrdup(NameStr(classStruct->relname)); } @@ -1823,7 +1824,7 @@ get_attribute_name(Oid relid, int2 attnum) attnum, relid); attStruct = (Form_pg_attribute) GETSTRUCT(atttup); - return nameout(&(attStruct->attname)); + return pstrdup(NameStr(attStruct->attname)); } diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 8d27a1ca6d8..9ac113301d7 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.54 1999/07/17 20:18:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.55 1999/11/07 23:08:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -273,12 +273,12 @@ bpchar_name(char *s) #endif result = (NameData *) palloc(NAMEDATALEN); - StrNCpy(result->data, VARDATA(s), NAMEDATALEN); + StrNCpy(NameStr(*result), VARDATA(s), NAMEDATALEN); /* now null pad to full length... */ while (len < NAMEDATALEN) { - *(result->data + len) = '\0'; + *(NameStr(*result) + len) = '\0'; len++; } @@ -297,7 +297,7 @@ name_bpchar(NameData *s) if (s == NULL) return NULL; - len = strlen(s->data); + len = strlen(NameStr(*s)); #ifdef STRINGDEBUG printf("bpchar- convert string length %d (%d) ->%d\n", @@ -305,7 +305,7 @@ name_bpchar(NameData *s) #endif result = (char *) palloc(VARHDRSZ + len); - strncpy(VARDATA(result), s->data, len); + strncpy(VARDATA(result), NameStr(*s), len); VARSIZE(result) = len + VARHDRSZ; return result; diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 08eac37460a..90f898fe971 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.53 1999/07/17 20:18:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.54 1999/11/07 23:08:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -801,12 +801,12 @@ text_name(text *s) #endif result = palloc(NAMEDATALEN); - StrNCpy(result->data, VARDATA(s), NAMEDATALEN); + StrNCpy(NameStr(*result), VARDATA(s), NAMEDATALEN); /* now null pad to full length... */ while (len < NAMEDATALEN) { - *(result->data + len) = '\0'; + *(NameStr(*result) + len) = '\0'; len++; } @@ -825,7 +825,7 @@ name_text(NameData *s) if (s == NULL) return NULL; - len = strlen(s->data); + len = strlen(NameStr(*s)); #ifdef STRINGDEBUG printf("text- convert string length %d (%d) ->%d\n", @@ -833,7 +833,7 @@ name_text(NameData *s) #endif result = palloc(VARHDRSZ + len); - strncpy(VARDATA(result), s->data, len); + strncpy(VARDATA(result), NameStr(*s), len); VARSIZE(result) = len + VARHDRSZ; return result; diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index d3c022c2479..cc86bae0fb6 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.50 1999/11/01 02:29:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.51 1999/11/07 23:08:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -209,7 +209,7 @@ CatalogCacheInitializeCache(struct catcache * cache, cache->cc_skey[i].sk_nargs = cache->cc_skey[i].sk_func.fn_nargs; CACHE5_elog(DEBUG, "CatalogCacheInit %s %d %d %x", - &relation->rd_rel->relname, + RelationGetRelationName(relation), i, tupdesc->attrs[cache->cc_key[i] - 1]->attlen, cache); @@ -304,7 +304,7 @@ comphash(long l, char *v) * typelen so this may break them - XXX */ namestrcpy(&n, v); - v = n.data; + v = NameStr(n); } else if (l < 0) l = VARSIZE(v); diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 1671a8e9ecd..e5f7beea339 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.27 1999/07/16 05:00:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.28 1999/11/07 23:08:26 momjian Exp $ * * Note - this code is real crufty... * @@ -584,7 +584,7 @@ RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple) * this only works for system relations now * ---------------- */ - if (!IsSystemRelationName(RelationGetForm(relation)->relname.data)) + if (!IsSystemRelationName(NameStr(RelationGetForm(relation)->relname))) return; /* ---------------- diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 75994a31f27..d2b097ed2f5 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.34 1999/09/09 02:36:04 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.35 1999/11/07 23:08:26 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -62,7 +62,7 @@ get_attname(Oid relid, AttrNumber attnum) if (HeapTupleIsValid(tp)) { Form_pg_attribute att_tup = (Form_pg_attribute) GETSTRUCT(tp); - return pstrdup(att_tup->attname.data); + return pstrdup(NameStr(att_tup->attname)); } else return NULL; @@ -292,7 +292,7 @@ get_opname(Oid opno) if (HeapTupleIsValid(tp)) { Form_pg_operator optup = (Form_pg_operator) GETSTRUCT(tp); - return pstrdup(optup->oprname.data); + return pstrdup(NameStr(optup->oprname)); } else return NULL; @@ -529,7 +529,7 @@ get_rel_name(Oid relid) if (HeapTupleIsValid(tp)) { Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp); - return pstrdup(reltup->relname.data); + return pstrdup(NameStr(reltup->relname)); } else return NULL; diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 0090c826149..f780cf96b39 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.75 1999/11/04 08:00:59 inoue Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.76 1999/11/07 23:08:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,7 +133,7 @@ typedef struct relnamecacheent do { \ RelIdCacheEnt *idhentry; RelNameCacheEnt *namehentry; \ char *relname; Oid reloid; bool found; \ - relname = (RELATION->rd_rel->relname).data; \ + relname = RelationGetRelationName(RELATION); \ namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \ relname, \ HASH_ENTER, \ @@ -186,7 +186,7 @@ do { \ do { \ RelNameCacheEnt *namehentry; RelIdCacheEnt *idhentry; \ char *relname; Oid reloid; bool found; \ - relname = (RELATION->rd_rel->relname).data; \ + relname = RelationGetRelationName(RELATION); \ namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \ relname, \ HASH_REMOVE, \ @@ -534,7 +534,7 @@ build_tupdesc_ind(RelationBuildDescInfo buildinfo, if (!HeapTupleIsValid(atttup)) elog(ERROR, "cannot find attribute %d of relation %s", i, - relation->rd_rel->relname.data); + RelationGetRelationName(relation)); attp = (Form_pg_attribute) GETSTRUCT(atttup); relation->rd_att->attrs[i - 1] = @@ -962,7 +962,7 @@ formrdesc(char *relationName, relation->rd_rel = (Form_pg_class) palloc((Size) (sizeof(*relation->rd_rel))); MemSet(relation->rd_rel, 0, sizeof(FormData_pg_class)); - namestrcpy(&relation->rd_rel->relname, relationName); + strcpy(RelationGetRelationName(relation), relationName); /* ---------------- initialize attribute tuple form @@ -1092,7 +1092,7 @@ RelationNameCacheGetRelation(char *relationName) * null-padded */ namestrcpy(&name, relationName); - RelationNameCacheLookup(name.data, rd); + RelationNameCacheLookup(NameStr(name), rd); if (RelationIsValid(rd)) { @@ -1373,7 +1373,7 @@ RelationForgetRelation(Oid rid) } if (curr == NIL) elog(FATAL, "Local relation %s not found in list", - (RelationGetRelationName(relation))->data); + RelationGetRelationName(relation)); if (prev == NIL) newlyCreatedRelns = lnext(newlyCreatedRelns); else @@ -1745,16 +1745,16 @@ AttrDefaultFetch(Relation relation) continue; if (attrdef[i].adbin != NULL) elog(ERROR, "AttrDefaultFetch: second record found for attr %s in rel %s", - relation->rd_att->attrs[adform->adnum - 1]->attname.data, - relation->rd_rel->relname.data); + NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname), + RelationGetRelationName(relation)); val = (struct varlena *) fastgetattr(&tuple, Anum_pg_attrdef_adbin, adrel->rd_att, &isnull); if (isnull) elog(ERROR, "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s", - relation->rd_att->attrs[adform->adnum - 1]->attname.data, - relation->rd_rel->relname.data); + NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname), + RelationGetRelationName(relation)); attrdef[i].adbin = textout(val); break; } @@ -1763,12 +1763,12 @@ AttrDefaultFetch(Relation relation) if (i >= ndef) elog(ERROR, "AttrDefaultFetch: unexpected record found for attr %d in rel %s", adform->adnum, - relation->rd_rel->relname.data); + RelationGetRelationName(relation)); } if (found < ndef) elog(ERROR, "AttrDefaultFetch: %d record not found for rel %s", - ndef - found, relation->rd_rel->relname.data); + ndef - found, RelationGetRelationName(relation)); index_endscan(sd); pfree(sd); @@ -1818,21 +1818,21 @@ RelCheckFetch(Relation relation) continue; if (found == ncheck) elog(ERROR, "RelCheckFetch: unexpected record found for rel %s", - relation->rd_rel->relname.data); + RelationGetRelationName(relation)); rcname = (Name) fastgetattr(&tuple, Anum_pg_relcheck_rcname, rcrel->rd_att, &isnull); if (isnull) elog(ERROR, "RelCheckFetch: rcname IS NULL for rel %s", - relation->rd_rel->relname.data); - check[found].ccname = nameout(rcname); + RelationGetRelationName(relation)); + check[found].ccname = pstrdup(NameStr(*rcname)); val = (struct varlena *) fastgetattr(&tuple, Anum_pg_relcheck_rcbin, rcrel->rd_att, &isnull); if (isnull) elog(ERROR, "RelCheckFetch: rcbin IS NULL for rel %s", - relation->rd_rel->relname.data); + RelationGetRelationName(relation)); check[found].ccbin = textout(val); found++; ReleaseBuffer(buffer); @@ -1841,7 +1841,7 @@ RelCheckFetch(Relation relation) if (found < ncheck) elog(ERROR, "RelCheckFetch: %d record not found for rel %s", ncheck - found, - relation->rd_rel->relname.data); + RelationGetRelationName(relation)); index_endscan(sd); pfree(sd); diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index e8cc0c24873..0119f9e59ec 100644 --- a/src/backend/utils/cache/temprel.c +++ b/src/backend/utils/cache/temprel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.14 1999/09/04 22:03:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.15 1999/11/07 23:08:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,8 +62,8 @@ create_temp_relation(char *relname, HeapTuple pg_class_tuple) /* save user-supplied name */ strcpy(temp_rel->user_relname, relname); - StrNCpy(temp_rel->relname, ((Form_pg_class) - GETSTRUCT(pg_class_tuple))->relname.data, NAMEDATALEN); + StrNCpy(temp_rel->relname, NameStr(((Form_pg_class) + GETSTRUCT(pg_class_tuple))->relname), NAMEDATALEN); temp_rel->relid = pg_class_tuple->t_data->t_oid; temp_rel->relkind = ((Form_pg_class) GETSTRUCT(pg_class_tuple))->relkind; temp_rel->xid = GetCurrentTransactionId(); diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 15b22bdfa41..18f573d6d16 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.35 1999/10/02 21:33:25 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.36 1999/11/07 23:08:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs) } procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple); - proname = procedureStruct->proname.data; + proname = NameStr(procedureStruct->proname); pronargs_save = *pronargs = procedureStruct->pronargs; probinattr = heap_getattr(procedureTuple, Anum_pg_proc_probin, diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index cda5cfbdab3..c7cd9f838de 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.31 1999/10/25 03:07:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.32 1999/11/07 23:08:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -254,7 +254,7 @@ GetRawDatabaseInfo(char *name, Oid *db_id, char *path) */ tup_db = (Form_pg_database) GETSTRUCT(&tup); - if (strcmp(name, tup_db->datname.data) == 0) + if (strcmp(name, NameStr(tup_db->datname)) == 0) { /* Found it; extract the OID and the database path. */ *db_id = tup.t_data->t_oid; |