Skip to content

Commit f3af136

Browse files
bmomjianbmomjian
committed
Rename strNcpy to StrNCpy, and change third parameter.
1 parent 8b53f6e commit f3af136

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
return newstr;
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));

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy