Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6ed1715

Browse files
committed
Cleanup for NAMEDATALEN use.
1 parentea210dc commit6ed1715

File tree

16 files changed

+49
-49
lines changed

16 files changed

+49
-49
lines changed

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.11 1996/11/05 07:42:46 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.12 1997/08/03 02:34:19 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -328,7 +328,7 @@ BuildDescForRelation(List *schema, char *relname)
328328

329329
attnum=0;
330330

331-
typename=palloc(NAMEDATALEN+1);
331+
typename=palloc(NAMEDATALEN);
332332

333333
foreach(p,schema) {
334334
ColumnDef*entry;

‎src/backend/commands/async.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.13 1997/03/10 00:18:09 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.14 1997/08/03 02:34:34 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -456,8 +456,8 @@ Async_Listen(char *relname, int pid)
456456
* to unlisten prior to dying.
457457
*/
458458
relnamei=malloc(NAMEDATALEN);/* persists to process exit */
459-
memset (relnamei,0,NAMEDATALEN);
460459
strncpy(relnamei,relname,NAMEDATALEN);
460+
relnamei[NAMEDATALEN-1]='\0';
461461
on_exitpg(Async_UnlistenOnExit, (caddr_t)relnamei);
462462
}
463463

‎src/backend/commands/cluster.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.10 1997/01/10 20:17:05 momjian Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.11 1997/08/03 02:34:45 momjian Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -83,10 +83,10 @@ cluster(char oldrelname[], char oldindexname[])
8383
RelationOldHeap,OldIndex;
8484
RelationNewHeap;
8585

86-
charNewIndexName[NAMEDATALEN+1];
87-
charNewHeapName[NAMEDATALEN+1];
88-
charsaveoldrelname[NAMEDATALEN+1];
89-
charsaveoldindexname[NAMEDATALEN+1];
86+
charNewIndexName[NAMEDATALEN];
87+
charNewHeapName[NAMEDATALEN];
88+
charsaveoldrelname[NAMEDATALEN];
89+
charsaveoldindexname[NAMEDATALEN];
9090

9191

9292
/* Save the old names because they will get lost when the old relations
@@ -258,7 +258,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
258258
Old_pg_index_relation_Form=
259259
(Form_pg_class)GETSTRUCT(Old_pg_index_relation_Tuple);
260260

261-
NewIndexName=palloc(NAMEDATALEN+1);/* XXX */
261+
NewIndexName=palloc(NAMEDATALEN);/* XXX */
262262
sprintf(NewIndexName,"temp_%x",OIDOldIndex);/* Set the name. */
263263

264264
/*

‎src/backend/commands/creatinh.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.7 1997/08/02 19:09:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.8 1997/08/03 02:34:53 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,7 +46,7 @@ static void StoreCatalogInheritance(Oid relationId, List *supers);
4646
void
4747
DefineRelation(CreateStmt*stmt)
4848
{
49-
char*relname=palloc(NAMEDATALEN+1);
49+
char*relname=palloc(NAMEDATALEN);
5050
List*schema=stmt->tableElts;
5151
intnumberOfAttributes;
5252
OidrelationId;
@@ -58,11 +58,12 @@ DefineRelation(CreateStmt *stmt)
5858

5959
char*typename=NULL;/* the typename of this relation. not useod for now */
6060

61-
if (strlen(stmt->relname)>NAMEDATALEN)
62-
elog(WARN,"the relation name %s is > %d characters long",stmt->relname,
61+
if (strlen(stmt->relname) >=NAMEDATALEN)
62+
elog(WARN,"the relation name %s is >= %d characters long",stmt->relname,
6363
NAMEDATALEN);
64-
strncpy(relname,stmt->relname,NAMEDATALEN+1);/* make full length for copy */
65-
64+
strncpy(relname,stmt->relname,NAMEDATALEN);/* make full length for copy */
65+
relname[NAMEDATALEN-1]='\0';
66+
6667
/* ----------------
6768
* Handle parameters
6869
* XXX parameter handling missing below.

‎src/backend/commands/define.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.11 1996/11/30 17:47:07 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.12 1997/08/03 02:35:01 momjian Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -187,7 +187,7 @@ CreateFunction(ProcedureStmt *stmt, CommandDest dest)
187187
/* SQL that executes this function, if any */
188188
char*prorettype;
189189
/* Type of return value (or member of set of values) from function */
190-
charlanguageName[NAMEDATALEN+1];
190+
charlanguageName[NAMEDATALEN];
191191
/* name of language of function, with case adjusted:
192192
"C", "internal", or "SQL"
193193
*/

‎src/backend/nodes/print.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.3 1996/11/10 03:00:49 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.4 1997/08/03 02:35:13 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHORDATEMAJOR EVENT
@@ -350,14 +350,14 @@ print_plan_recursive (Plan* p, Query *parsetree, int indentLevel, char* label)
350350
RangeTblEntry*rte;
351351
rte=rt_fetch(((Scan*)p)->scanrelid,parsetree->rtable);
352352
strncpy(extraInfo,rte->relname,NAMEDATALEN);
353-
extraInfo[NAMEDATALEN]='\0';
353+
extraInfo[NAMEDATALEN-1]='\0';
354354
}else
355355
if (IsA(p,IndexScan)) {
356356
strncpy(extraInfo,
357357
((RangeTblEntry*)(nth(((IndexScan*)p)->scan.scanrelid-1,
358358
parsetree->rtable)))->relname,
359359
NAMEDATALEN);
360-
extraInfo[NAMEDATALEN]='\0';
360+
extraInfo[NAMEDATALEN-1]='\0';
361361
}else
362362
extraInfo[0]='\0';
363363
if (extraInfo[0]!='\0')

‎src/backend/parser/analyze.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.29 1997/07/30 04:42:26 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.30 1997/08/03 02:35:28 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1003,9 +1003,9 @@ makeTargetNames(ParseState *pstate, List *cols)
10031003
for(i=0;i<numcol;i++) {
10041004
Ident*id=makeNode(Ident);
10051005

1006-
id->name=palloc(NAMEDATALEN+1);
1006+
id->name=palloc(NAMEDATALEN);
10071007
strncpy(id->name,attr[i]->attname.data,NAMEDATALEN);
1008-
id->name[NAMEDATALEN]='\0';
1008+
id->name[NAMEDATALEN-1]='\0';
10091009
id->indirection=NIL;
10101010
id->isRel= false;
10111011
if (tl==NIL)

‎src/backend/postmaster/postmaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.48 1997/07/30 14:08:11 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.49 1997/08/03 02:36:01 momjian Exp $
1414
*
1515
* NOTES
1616
*
@@ -625,7 +625,7 @@ ConnStartup(Port *port, int *status,
625625
char*errormsg,constinterrormsg_len)
626626
{
627627
MsgTypemsgType;
628-
charnamebuf[NAMEDATALEN+1];
628+
charnamebuf[NAMEDATALEN];
629629
intpid;
630630
PacketBuf*p;
631631
StartupInfosp;
@@ -653,7 +653,7 @@ ConnStartup(Port *port, int *status,
653653
msgType= (MsgType)ntohl(port->buf.msgtype);
654654

655655
(void)strncpy(namebuf,sp.user,NAMEDATALEN);
656-
namebuf[NAMEDATALEN]='\0';
656+
namebuf[NAMEDATALEN-1]='\0';
657657
if (!namebuf[0]) {
658658
strncpy(errormsg,
659659
"No Postgres username specified in startup packet.",

‎src/backend/storage/smgr/md.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.14 1997/07/24 20:14:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.15 1997/08/03 02:36:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -167,8 +167,8 @@ mdunlink(Relation reln)
167167
** to do this.
168168
*/
169169

170-
memset(fname,0,NAMEDATALEN);
171170
strncpy(fname,RelationGetRelationName(reln)->data,NAMEDATALEN);
171+
fname[NAMEDATALEN-1]='\0';
172172

173173
if (FileNameUnlink(fname)<0)
174174
return (SM_FAIL);

‎src/backend/utils/adt/acl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.10 1997/07/24 20:15:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.11 1997/08/03 02:36:41 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -85,7 +85,7 @@ char *
8585
aclparse(char*s,AclItem*aip,unsigned*modechg)
8686
{
8787
HeapTuplehtp;
88-
charname[NAMEDATALEN+1];
88+
charname[NAMEDATALEN];
8989

9090
Assert(s&&aip&&modechg);
9191

‎src/backend/utils/adt/name.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.2 1997/03/14 23:20:43 scrappy Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.3 1997/08/03 02:36:57 momjian Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -39,8 +39,8 @@ NameData *namein(char *s)
3939
return(NULL);
4040
result= (NameData*)palloc(NAMEDATALEN);
4141
/* always keep it null-padded */
42-
memset(result->data,0,NAMEDATALEN);
43-
(void)strncpy(result->data,s,NAMEDATALEN-1);
42+
(void)strncpy(result->data,s,NAMEDATALEN);
43+
result->data[NAMEDATALEN-1]='\0';
4444
return(result);
4545
}
4646

@@ -145,8 +145,8 @@ namestrcpy(Name name, char *str)
145145
{
146146
if (!name|| !str)
147147
return(-1);
148-
memset(name->data,0,sizeof(NameData));
149148
(void)strncpy(name->data,str,NAMEDATALEN);
149+
name->data[NAMEDATALEN-1]='\0';
150150
return(0);
151151
}
152152

‎src/backend/utils/adt/oidname.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.2 1996/11/06 06:49:56 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.3 1997/08/03 02:37:08 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -35,7 +35,7 @@ oidnamein(char *inStr)
3535
if (*inptr) {
3636
oc->id= (Oid)pg_atoi(inStr,sizeof(Oid),',');
3737
/* copy one less to ensure null-padding */
38-
strncpy(oc->name.data,++inptr,NAMEDATALEN-1);
38+
strncpy(oc->name.data,++inptr,NAMEDATALEN);
3939
/* namestrcpy(&oc->name, ++inptr); */
4040
}else
4141
elog(WARN,"Bad input data for type oidname");

‎src/backend/utils/cache/relcache.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.10 1997/07/28 00:56:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.11 1997/08/03 02:37:32 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1066,7 +1066,6 @@ RelationNameCacheGetRelation(char *relationName)
10661066

10671067
/* make sure that the name key used for hash lookup is properly
10681068
null-padded */
1069-
memset(&name,0,NAMEDATALEN);
10701069
namestrcpy(&name,relationName);
10711070
RelationNameCacheLookup(name.data,rd);
10721071

‎src/bin/psql/psql.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.80 1997/08/01 04:07:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.81 1997/08/03 02:37:58 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -835,7 +835,7 @@ do_copy(const char *args, PsqlSettings * settings)
835835
/* The direction of the copy is from a file to a table. */
836836
charfile[MAXPATHLEN+1];
837837
/* The pathname of the file from/to which we copy */
838-
chartable[NAMEDATALEN+1];
838+
chartable[NAMEDATALEN];
839839
/* The name of the table from/to which we copy */
840840
boolsyntax_error;
841841
/* The \c command has invalid syntax */

‎src/include/storage/buf_internals.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: buf_internals.h,v 1.12 1997/03/28 07:06:48 scrappy Exp $
9+
* $Id: buf_internals.h,v 1.13 1997/08/03 02:38:25 momjian Exp $
1010
*
1111
* NOTE
1212
*If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -118,10 +118,10 @@ struct sbufdesc_unpadded {
118118
#ifdefHAS_TEST_AND_SET
119119
slock_tio_in_progress_lock;
120120
#endif/* HAS_TEST_AND_SET */
121-
charsb_dbname[NAMEDATALEN+1];
121+
charsb_dbname[NAMEDATALEN];
122122

123123
/* NOTE NO PADDING OF THE MEMBER HERE */
124-
charsb_relname[NAMEDATALEN+1];
124+
charsb_relname[NAMEDATALEN];
125125
};
126126

127127
/* THE REAL STRUCTURE - the structure above must match it, minus sb_pad */
@@ -143,7 +143,7 @@ struct sbufdesc {
143143
slock_tio_in_progress_lock;
144144
#endif/* HAS_TEST_AND_SET */
145145

146-
charsb_dbname[NAMEDATALEN+1];/* name of db in which buf belongs */
146+
charsb_dbname[NAMEDATALEN];/* name of db in which buf belongs */
147147

148148
/*
149149
* I padded this structure to a power of 2 (PADDED_SBUFDESC_SIZE) because
@@ -159,7 +159,7 @@ struct sbufdesc {
159159
/* please, don't take the sizeof() this member and use it for
160160
something important */
161161

162-
charsb_relname[NAMEDATALEN+1+/* name of reln */
162+
charsb_relname[NAMEDATALEN+/* name of reln */
163163
PADDED_SBUFDESC_SIZE-sizeof(structsbufdesc_unpadded)];
164164
};
165165

‎src/man/sql.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" This is -*-nroff-*-
22
.\" XXX standard disclaimer belongs here....
3-
.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.3 1996/12/11 00:28:11 momjian Exp $
3+
.\" $Header: /cvsroot/pgsql/src/man/Attic/sql.l,v 1.4 1997/08/03 02:38:47 momjian Exp $
44
.TH INTRODUCTION SQL 11/5/95 PostgreSQL PostgreSQL
55
.SH "Section 4\(em SQL Commands (COMMANDS)"
66
.SH "General Information"
@@ -19,9 +19,9 @@ of the line e.g:
1919
.fi
2020
.SH "Names"
2121
.IR Names
22-
in SQL are sequences ofnot more than NAMEDATALEN alphanumeric characters,
22+
in SQL are sequences ofless than NAMEDATALEN alphanumeric characters,
2323
starting with an alphabetic character. By default, NAMEDATALEN is set
24-
to16, but at the time the system is built, NAMEDATALEN can be changed
24+
to32, but at the time the system is built, NAMEDATALEN can be changed
2525
by changing the #ifdef in src/backend/include/postgres.h. Underscore
2626
(\*(lq_\*(rq) is considered an alphabetic character.
2727
.SH "Keywords"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp