mirror of
https://github.com/postgres/postgres.git
synced 2025-07-21 16:02:15 +03:00
New NameStr macro to convert Name to Str. No need for var.data anymore.
Fewer calls to nameout. Better use of RelationGetRelationName.
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user