diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-11-07 23:08:36 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-11-07 23:08:36 +0000 |
| commit | 86ef36c9078311d5ccba53c17702af0450b11e25 (patch) | |
| tree | a37836f78c4328e4b3a3ad6308a3779725546525 /src/backend/utils/adt/varlena.c | |
| parent | df723a8a8aa3326d2ade8ad846a296e2e2500a64 (diff) | |
| download | postgresql-86ef36c9078311d5ccba53c17702af0450b11e25.tar.gz postgresql-86ef36c9078311d5ccba53c17702af0450b11e25.zip | |
New NameStr macro to convert Name to Str. No need for var.data anymore.
Fewer calls to nameout.
Better use of RelationGetRelationName.
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |