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

Commitf3af136

Browse files
committed
Rename strNcpy to StrNCpy, and change third parameter.
1 parent8b53f6e commitf3af136

File tree

31 files changed

+87
-83
lines changed

31 files changed

+87
-83
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.26 1997/09/18 20:19:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.27 1997/10/25 01:08:45 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -489,7 +489,7 @@ BuildDescForRelation(List *schema, char *relname)
489489
}
490490
else
491491
{
492-
strNcpy(typename,entry->typename->name,NAMEDATALEN-1);
492+
StrNCpy(typename,entry->typename->name,NAMEDATALEN);
493493
attdim=0;
494494
}
495495

‎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.20 1997/09/12 04:07:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.21 1997/10/25 01:08:49 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -488,7 +488,7 @@ Async_Listen(char *relname, int pid)
488488
* unlisten prior to dying.
489489
*/
490490
relnamei=malloc(NAMEDATALEN);/* persists to process exit */
491-
strNcpy(relnamei,relname,NAMEDATALEN-1);
491+
StrNCpy(relnamei,relname,NAMEDATALEN);
492492
on_exitpg(Async_UnlistenOnExit, (caddr_t)relnamei);
493493
}
494494

‎src/backend/commands/creatinh.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/Attic/creatinh.c,v 1.17 1997/09/08 21:42:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.18 1997/10/25 01:08:51 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -65,7 +65,7 @@ DefineRelation(CreateStmt *stmt)
6565
if (strlen(stmt->relname) >=NAMEDATALEN)
6666
elog(WARN,"the relation name %s is >= %d characters long",stmt->relname,
6767
NAMEDATALEN);
68-
strNcpy(relname,stmt->relname,NAMEDATALEN-1);/* make full length for
68+
StrNCpy(relname,stmt->relname,NAMEDATALEN);/* make full length for
6969
* copy */
7070

7171
/* ----------------

‎src/backend/commands/recipe.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/Attic/recipe.c,v 1.9 1997/09/08 21:42:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.10 1997/10/25 01:08:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1344,7 +1344,7 @@ replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo)
13441344
if ((strlen(rte->refname)<4)||
13451345
(strcmp(rte->relname,rte->refname)!=0))
13461346
continue;
1347-
strNcpy(prefix,rte->refname,4);
1347+
StrNCpy(prefix,rte->refname,5);
13481348
if (strcmp(prefix,"tee_")==0)
13491349
{
13501350
/* okay, we found a tee node entry in the range table */

‎src/backend/executor/execMain.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.27 1997/10/12 07:09:02 vadim Exp $
29+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.28 1997/10/25 01:09:01 momjian Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -330,9 +330,9 @@ ExecCheckPerms(CmdType operation,
330330
if (!HeapTupleIsValid(htp))
331331
elog(WARN,"ExecCheckPerms: bogus RT relid: %d",
332332
relid);
333-
strNcpy(rname.data,
333+
StrNCpy(rname.data,
334334
((Form_pg_class)GETSTRUCT(htp))->relname.data,
335-
NAMEDATALEN-1);
335+
NAMEDATALEN);
336336
if (i==resultRelation)
337337
{/* this is the result relation */
338338
qvars=pull_varnos(parseTree->qual);

‎src/backend/executor/execUtils.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/executor/execUtils.c,v 1.19 1997/09/18 20:20:35 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.20 1997/10/25 01:09:10 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -514,7 +514,7 @@ ExecSetTypeInfo(int index,
514514
att->attrelid=0;/* dummy value */
515515

516516
if (attName!= (char*)NULL)
517-
strNcpy(att->attname.data,attName,NAMEDATALEN-1);
517+
StrNCpy(att->attname.data,attName,NAMEDATALEN);
518518
else
519519
MemSet(att->attname.data,0,NAMEDATALEN);
520520

‎src/backend/libpq/be-fsstubs.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/libpq/be-fsstubs.c,v 1.15 1997/09/08 21:43:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.16 1997/10/25 01:09:16 momjian Exp $
1111
*
1212
* NOTES
1313
* This should be moved to a more appropriate place. It is here
@@ -269,7 +269,7 @@ lo_import(text *filename)
269269
/*
270270
* open the file to be read in
271271
*/
272-
strNcpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
272+
StrNCpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ+1);
273273
fd=open(fnamebuf,O_RDONLY,0666);
274274
if (fd<0)
275275
{/* error */
@@ -343,7 +343,7 @@ lo_export(Oid lobjId, text *filename)
343343
* open the file to be written to
344344
*/
345345
oumask=umask((mode_t)0);
346-
strNcpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
346+
StrNCpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ+1);
347347
fd=open(fnamebuf,O_CREAT |O_WRONLY,0666);
348348
umask(oumask);
349349
if (fd<0)

‎src/backend/libpq/be-pqexec.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/libpq/Attic/be-pqexec.c,v 1.7 1997/09/08 21:43:43 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.8 1997/10/25 01:09:18 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -241,7 +241,7 @@ strmake(char *str, int len)
241241
len=strlen(str);
242242

243243
newstr= (char*)palloc((unsigned)len+1);
244-
strNcpy(newstr,str,len);
244+
StrNCpy(newstr,str,len+1);
245245
newstr[len]= (char)0;
246246
returnnewstr;
247247
}

‎src/backend/libpq/password.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ verify_password(char *user, char *password, Port *port,
9090
if (test_pw[strlen(test_pw)-1]=='\n')
9191
test_pw[strlen(test_pw)-1]='\0';
9292

93-
strNcpy(salt,test_pw,2);
93+
StrNCpy(salt,test_pw,3);
9494

9595
if (strcmp(user,test_user)==0)
9696
{

‎src/backend/libpq/portal.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/libpq/Attic/portal.c,v 1.9 1997/09/08 21:43:47 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.10 1997/10/25 01:09:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -154,7 +154,7 @@ PQpnames(char **pnames, int rule_p)
154154
{
155155
if (!rule_p||portals[i]->portal->rule_p)
156156
{
157-
strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength);
157+
strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength+1);
158158
++cur_pname;
159159
}
160160
}
@@ -730,7 +730,7 @@ PQappendNotify(char *relname, int pid)
730730
pqNotifyList=DLNewList();
731731

732732
p= (PQNotifyList*)pbuf_alloc(sizeof(PQNotifyList));
733-
strNcpy(p->relname,relname,NAMEDATALEN-1);
733+
StrNCpy(p->relname,relname,NAMEDATALEN);
734734
p->be_pid=pid;
735735
p->valid=1;
736736
DLAddTail(pqNotifyList,DLNewElem(p));

‎src/backend/libpq/portalbuf.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/libpq/Attic/portalbuf.c,v 1.7 1997/09/08 21:43:48 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.8 1997/10/25 01:09:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -384,7 +384,7 @@ void
384384
pbuf_setportalinfo(PortalEntry*entry,char*pname)
385385
{
386386
if (entry)
387-
strNcpy(entry->name,pname,PortalNameLength-1);
387+
StrNCpy(entry->name,pname,PortalNameLength);
388388
}
389389

390390
/* --------------------------------

‎src/backend/nodes/print.c

Lines changed: 4 additions & 4 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.9 1997/09/08 21:44:10 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.10 1997/10/25 01:09:28 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHORDATEMAJOR EVENT
@@ -391,14 +391,14 @@ print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label)
391391
RangeTblEntry*rte;
392392

393393
rte=rt_fetch(((Scan*)p)->scanrelid,parsetree->rtable);
394-
strNcpy(extraInfo,rte->relname,NAMEDATALEN-1);
394+
StrNCpy(extraInfo,rte->relname,NAMEDATALEN);
395395
}
396396
elseif (IsA(p,IndexScan))
397397
{
398-
strNcpy(extraInfo,
398+
StrNCpy(extraInfo,
399399
((RangeTblEntry*) (nth(((IndexScan*)p)->scan.scanrelid-1,
400400
parsetree->rtable)))->relname,
401-
NAMEDATALEN-1);
401+
NAMEDATALEN);
402402
}
403403
else
404404
extraInfo[0]='\0';

‎src/backend/nodes/readfuncs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.9 1997/09/08 21:44:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.10 1997/10/25 01:09:30 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -92,7 +92,7 @@ _readQuery()
9292
NotifyStmt*n=makeNode(NotifyStmt);
9393

9494
n->relname=palloc(length+1);
95-
strNcpy(n->relname,token,length);
95+
StrNCpy(n->relname,token,length+1);
9696
local_node->utilityStmt= (Node*)n;
9797
}
9898

@@ -111,7 +111,7 @@ _readQuery()
111111
else
112112
{
113113
local_node->uniqueFlag=palloc(length+1);
114-
strNcpy(local_node->uniqueFlag,token,length);
114+
StrNCpy(local_node->uniqueFlag,token,length+1);
115115
}
116116

117117
token=lsptok(NULL,&length);/* skip :targetlist */
@@ -1067,7 +1067,7 @@ _readAggreg()
10671067
token=lsptok(NULL,&length);/* eat :aggname */
10681068
token=lsptok(NULL,&length);/* get aggname */
10691069
local_node->aggname= (char*)palloc(length+1);
1070-
strNcpy(local_node->aggname,token,length);
1070+
StrNCpy(local_node->aggname,token,length+1);
10711071

10721072
token=lsptok(NULL,&length);/* eat :basetype */
10731073
token=lsptok(NULL,&length);/* get basetype */

‎src/backend/parser/analyze.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/parser/analyze.c,v 1.46 1997/10/16 06:58:38 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.47 1997/10/25 01:09:35 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1150,7 +1150,7 @@ makeTargetNames(ParseState *pstate, List *cols)
11501150
Ident*id=makeNode(Ident);
11511151

11521152
id->name=palloc(NAMEDATALEN);
1153-
strNcpy(id->name,attr[i]->attname.data,NAMEDATALEN-1);
1153+
StrNCpy(id->name,attr[i]->attname.data,NAMEDATALEN);
11541154
id->indirection=NIL;
11551155
id->isRel= false;
11561156
if (tl==NIL)

‎src/backend/parser/gram.y

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/parser/gram.y,v 1.56 1997/10/09 05:43:59 thomas Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.57 1997/10/25 01:09:41 momjian Exp $
1414
*
1515
* HISTORY
1616
* AUTHORDATEMAJOR EVENT
@@ -3117,7 +3117,7 @@ opt_id: Id{ $$ = $1; }
31173117
relation_name:SpecialRuleRelation
31183118
{
31193119
$$ = $1;
3120-
strNcpy(saved_relname, $1, NAMEDATALEN-1);
3120+
StrNCpy(saved_relname, $1, NAMEDATALEN);
31213121
}
31223122
| ColId
31233123
{
@@ -3129,7 +3129,7 @@ relation_name:SpecialRuleRelation
31293129
elog(WARN,"%s cannot be accessed by users",$1);
31303130
else
31313131
$$ = $1;
3132-
strNcpy(saved_relname, $1, NAMEDATALEN-1);
3132+
StrNCpy(saved_relname, $1, NAMEDATALEN);
31333133
}
31343134
;
31353135

‎src/backend/port/aix/dlfcn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ readExports(ModulePtr mp)
537537
* first SYMNMLEN chars and make sure we have a zero byte at
538538
* the end.
539539
*/
540-
strNcpy(tmpsym,ls->l_name,SYMNMLEN);
540+
StrNCpy(tmpsym,ls->l_name,SYMNMLEN+1);
541541
symname=tmpsym;
542542
}
543543
ep->name=strdup(symname);

‎src/backend/postmaster/postmaster.c

Lines changed: 5 additions & 5 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.58 1997/09/18 20:21:08 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.59 1997/10/25 01:09:55 momjian Exp $
1414
*
1515
* NOTES
1616
*
@@ -717,7 +717,7 @@ ConnStartup(Port *port, int *status,
717717

718718
msgType= (MsgType)ntohl(port->buf.msgtype);
719719

720-
strNcpy(namebuf,sp.user,NAMEDATALEN-1);
720+
StrNCpy(namebuf,sp.user,NAMEDATALEN);
721721
if (!namebuf[0])
722722
{
723723
strncpy(errormsg,
@@ -1232,15 +1232,15 @@ DoExec(StartupInfo *packet, int portFd)
12321232
sprintf(portbuf,"-P%d",portFd);
12331233
av[ac++]=portbuf;
12341234

1235-
strNcpy(argbuf,packet->options,ARGV_SIZE);
1235+
StrNCpy(argbuf,packet->options,ARGV_SIZE);
12361236
strncat(argbuf,ExtraOptions,ARGV_SIZE);
12371237
argbuf[(2*ARGV_SIZE)]='\0';
12381238
split_opts(av,&ac,argbuf);
12391239

12401240
if (packet->database[0])
1241-
strNcpy(dbbuf,packet->database,ARGV_SIZE);
1241+
StrNCpy(dbbuf,packet->database,ARGV_SIZE);
12421242
else
1243-
strNcpy(dbbuf,packet->user,NAMEDATALEN-1);
1243+
StrNCpy(dbbuf,packet->user,NAMEDATALEN);
12441244
av[ac++]=dbbuf;
12451245

12461246
av[ac]= (char*)NULL;

‎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.22 1997/09/18 20:21:45 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.23 1997/10/25 01:10:04 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -172,7 +172,7 @@ mdunlink(Relation reln)
172172
* do this.
173173
*/
174174

175-
strNcpy(fname,RelationGetRelationName(reln)->data,NAMEDATALEN-1);
175+
StrNCpy(fname,RelationGetRelationName(reln)->data,NAMEDATALEN);
176176

177177
if (FileNameUnlink(fname)<0)
178178
return (SM_FAIL);

0 commit comments

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