mirror of
https://github.com/postgres/postgres.git
synced 2025-11-09 06:21:09 +03:00
Fix pgproc names over 15 chars in output. Add strNcpy() function. remove some (void) casts that are unnecessary.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.30 1997/08/03 02:35:28 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.31 1997/08/12 20:15:31 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -1004,8 +1004,7 @@ makeTargetNames(ParseState *pstate, List *cols)
|
||||
Ident *id = makeNode(Ident);
|
||||
|
||||
id->name = palloc(NAMEDATALEN);
|
||||
strncpy(id->name, attr[i]->attname.data, NAMEDATALEN);
|
||||
id->name[NAMEDATALEN-1]='\0';
|
||||
strNcpy(id->name, attr[i]->attname.data, NAMEDATALEN-1);
|
||||
id->indirection = NIL;
|
||||
id->isRel = false;
|
||||
if (tl == NIL)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.19 1997/07/24 20:13:01 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.20 1997/08/12 20:15:32 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -1488,7 +1488,7 @@ func_error(char *caller, char *funcname, int nargs, Oid *argtypes)
|
||||
*ptr++ = ' ';
|
||||
}
|
||||
if (argtypes[i] != 0) {
|
||||
(void) strcpy(ptr, tname(get_id_type(argtypes[i])));
|
||||
strcpy(ptr, tname(get_id_type(argtypes[i])));
|
||||
*(ptr + NAMEDATALEN) = '\0';
|
||||
} else
|
||||
strcpy(ptr, "opaque");
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.34 1997/05/22 00:24:07 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.35 1997/08/12 20:15:33 momjian Exp $
|
||||
*
|
||||
* HISTORY
|
||||
* AUTHOR DATE MAJOR EVENT
|
||||
@@ -2190,8 +2190,7 @@ opt_id: Id { $$ = $1; }
|
||||
relation_name: SpecialRuleRelation
|
||||
{
|
||||
$$ = $1;
|
||||
strncpy(saved_relname, $1, NAMEDATALEN);
|
||||
saved_relname[NAMEDATALEN-1] = '\0';
|
||||
strNcpy(saved_relname, $1, NAMEDATALEN-1);
|
||||
}
|
||||
| Id
|
||||
{
|
||||
@@ -2204,8 +2203,7 @@ relation_name: SpecialRuleRelation
|
||||
} else {
|
||||
$$ = $1;
|
||||
}
|
||||
strncpy(saved_relname, $1, NAMEDATALEN);
|
||||
saved_relname[NAMEDATALEN-1] = '\0';
|
||||
strNcpy(saved_relname, $1, NAMEDATALEN-1);
|
||||
}
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user