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

Commitedb5872

Browse files
committed
Fix pgproc names over 15 chars in output. Add strNcpy() function. remove some (void) casts that are unnecessary.
1 parent4b851b1 commitedb5872

File tree

44 files changed

+163
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+163
-192
lines changed

‎src/backend/commands/_deadcode/version.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/commands/_deadcode/Attic/version.c,v 1.3 1996/11/06 08:21:42 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.4 1997/08/12 20:15:13 momjian Exp $
1414
*
1515
* NOTES
1616
* At the point the version is defined, 2 physical relations are created
@@ -106,12 +106,12 @@ DefineVersion(char *name, char *fromRelname, char *date)
106106
if (date==NULL) {
107107
/* no time ranges */
108108
bname=fromRelname;
109-
(void)strcpy(saved_basename, (char*)bname);
109+
strcpy(saved_basename, (char*)bname);
110110
*saved_snapshot= (char)NULL;
111111
}else {
112112
/* version is a snapshot */
113113
bname=fromRelname;
114-
(void)strcpy(saved_basename, (char*)bname);
114+
strcpy(saved_basename, (char*)bname);
115115
sprintf(saved_snapshot,"['%s']",date);
116116
}
117117

‎src/backend/commands/async.c

Lines changed: 2 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/commands/async.c,v 1.14 1997/08/03 02:34:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.15 1997/08/12 20:15:08 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -456,8 +456,7 @@ Async_Listen(char *relname, int pid)
456456
* to unlisten prior to dying.
457457
*/
458458
relnamei=malloc(NAMEDATALEN);/* persists to process exit */
459-
strncpy(relnamei,relname,NAMEDATALEN);
460-
relnamei[NAMEDATALEN-1]='\0';
459+
strNcpy(relnamei,relname,NAMEDATALEN-1);
461460
on_exitpg(Async_UnlistenOnExit, (caddr_t)relnamei);
462461
}
463462

‎src/backend/commands/creatinh.c

Lines changed: 2 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/commands/Attic/creatinh.c,v 1.8 1997/08/03 02:34:53 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.9 1997/08/12 20:15:10 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -61,8 +61,7 @@ DefineRelation(CreateStmt *stmt)
6161
if (strlen(stmt->relname) >=NAMEDATALEN)
6262
elog(WARN,"the relation name %s is >= %d characters long",stmt->relname,
6363
NAMEDATALEN);
64-
strncpy(relname,stmt->relname,NAMEDATALEN);/* make full length for copy */
65-
relname[NAMEDATALEN-1]='\0';
64+
strNcpy(relname,stmt->relname,NAMEDATALEN-1);/* make full length for copy */
6665

6766
/* ----------------
6867
* Handle parameters

‎src/backend/commands/recipe.c

Lines changed: 2 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/commands/Attic/recipe.c,v 1.5 1996/11/06 08:21:37 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.6 1997/08/12 20:15:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1149,8 +1149,7 @@ replaceTeeScans(Plan* plan, Query* parsetree, TeeInfo *teeInfo)
11491149
if ((strlen(rte->refname)<4)||
11501150
(strcmp (rte->relname,rte->refname)!=0))
11511151
continue;
1152-
strncpy(prefix,rte->refname,4);
1153-
prefix[4]='\0';
1152+
strNcpy(prefix,rte->refname,4);
11541153
if (strcmp(prefix,"tee_")==0) {
11551154
/* okay, we found a tee node entry in the range table */
11561155

‎src/backend/commands/rename.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/commands/Attic/rename.c,v 1.4 1996/11/10 02:59:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.5 1997/08/12 20:15:12 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -235,8 +235,8 @@ renamerel(char oldrelname[], char newrelname[])
235235
}
236236

237237
/* rename the directory first, so if this fails the rename's not done */
238-
(void)strcpy(oldpath,relpath(oldrelname));
239-
(void)strcpy(newpath,relpath(newrelname));
238+
strcpy(oldpath,relpath(oldrelname));
239+
strcpy(newpath,relpath(newrelname));
240240
if (rename(oldpath,newpath)<0)
241241
elog(WARN,"renamerel: unable to rename file: %m");
242242

‎src/backend/lib/stringinfo.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/lib/stringinfo.c,v 1.2 1996/11/06 08:27:16 scrappy Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/lib/stringinfo.c,v 1.3 1997/08/12 20:15:15 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -111,6 +111,6 @@ appendStringInfo(StringInfo str, char *buffer)
111111
* NOTE: this is a text string (i.e. printable characters)
112112
* so 'strcat' will do the job (no need to use 'bcopy' et all...)
113113
*/
114-
(void)strcat(str->data,buffer);
114+
strcat(str->data,buffer);
115115
str->len+=buflen;
116116
}

‎src/backend/libpq/auth.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/auth.c,v 1.11 1997/03/25 00:54:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.12 1997/08/12 20:15:17 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -302,10 +302,10 @@ pg_krb5_recvauth(int sock,
302302
* easy, we construct our own name and parse it. See note on
303303
* canonicalization above.
304304
*/
305-
(void)strcpy(servbuf,PG_KRB_SRVNAM);
305+
strcpy(servbuf,PG_KRB_SRVNAM);
306306
*(hostp=servbuf+ (sizeof(PG_KRB_SRVNAM)-1))='/';
307307
if (gethostname(++hostp,MAXHOSTNAMELEN)<0)
308-
(void)strcpy(hostp,"localhost");
308+
strcpy(hostp,"localhost");
309309
if (hostp=strchr(hostp,'.'))
310310
*hostp='\0';
311311
if (code=krb5_parse_name(servbuf,&server)) {

‎src/backend/libpq/be-fsstubs.c

Lines changed: 3 additions & 5 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.10 1997/06/10 13:01:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.11 1997/08/12 20:15:18 momjian Exp $
1111
*
1212
* NOTES
1313
* This should be moved to a more appropriate place. It is here
@@ -257,8 +257,7 @@ lo_import(text *filename)
257257
/*
258258
* open the file to be read in
259259
*/
260-
strncpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
261-
fnamebuf[VARSIZE(filename)-VARHDRSZ]='\0';
260+
strNcpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
262261
fd=open(fnamebuf,O_RDONLY,0666);
263262
if (fd<0) {/* error */
264263
elog(WARN,"be_lo_import: can't open unix file\"%s\"\n",
@@ -325,8 +324,7 @@ lo_export(Oid lobjId, text *filename)
325324
* open the file to be written to
326325
*/
327326
oumask=umask((mode_t)0);
328-
strncpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
329-
fnamebuf[VARSIZE(filename)-VARHDRSZ]='\0';
327+
strNcpy(fnamebuf,VARDATA(filename),VARSIZE(filename)-VARHDRSZ);
330328
fd=open(fnamebuf,O_CREAT|O_WRONLY,0666);
331329
(void)umask(oumask);
332330
if (fd<0) {/* error */

‎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.2 1996/11/06 08:48:26 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.3 1997/08/12 20:15:19 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -223,7 +223,7 @@ strmake(char *str, int len)
223223
if (len <=0)len=strlen(str);
224224

225225
newstr= (char*)palloc((unsigned)len+1);
226-
(void)strncpy(newstr,str,len);
226+
strNcpy(newstr,str,len);
227227
newstr[len]= (char)0;
228228
returnnewstr;
229229
}

‎src/backend/libpq/password.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ verify_password(char *user, char *password, Port *port,
8080
/* kill the newline */
8181
test_pw[strlen(test_pw)-1]='\0';
8282

83-
strncpy(salt,test_pw,2);
84-
salt[2]='\0';
83+
strNcpy(salt,test_pw,2);
8584

8685
if(strcmp(user,test_user)==0) {
8786
/* we're outta here one way or the other. */

‎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.4 1996/11/06 08:48:28 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.5 1997/08/12 20:15:22 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -144,7 +144,7 @@ PQpnames(char **pnames, int rule_p)
144144
for (i=0;i<portals_array_size;++i) {
145145
if (portals[i]&&portals[i]->portal) {
146146
if (!rule_p||portals[i]->portal->rule_p) {
147-
(void)strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength);
147+
strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength);
148148
++cur_pname;
149149
}
150150
}
@@ -710,7 +710,7 @@ PQappendNotify(char *relname, int pid)
710710
pqNotifyList=DLNewList();
711711

712712
p= (PQNotifyList*)pbuf_alloc(sizeof(PQNotifyList));
713-
strncpy(p->relname,relname,NAMEDATALEN);
713+
strNcpy(p->relname,relname,NAMEDATALEN-1);
714714
p->be_pid=pid;
715715
p->valid=1;
716716
DLAddTail(pqNotifyList,DLNewElem(p));

‎src/backend/libpq/portalbuf.c

Lines changed: 2 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/portalbuf.c,v 1.3 1996/11/06 08:48:29 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.4 1997/08/12 20:15:23 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -377,8 +377,7 @@ void
377377
pbuf_setportalinfo(PortalEntry*entry,char*pname)
378378
{
379379
if (entry)
380-
strncpy(entry->name,pname,PortalNameLength-1);
381-
entry->name[PortalNameLength-1]='\0';
380+
strNcpy(entry->name,pname,PortalNameLength-1);
382381
}
383382

384383
/* --------------------------------

‎src/backend/libpq/pqcomm.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/libpq/pqcomm.c,v 1.17 1997/07/28 00:54:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.18 1997/08/12 20:15:24 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -113,7 +113,7 @@ pq_getc(FILE* fin)
113113
void
114114
pq_gettty(char*tp)
115115
{
116-
(void)strncpy(tp,ttyname(0),19);
116+
strncpy(tp,ttyname(0),19);
117117
}
118118

119119
/* --------------------------------
@@ -585,8 +585,8 @@ StreamServerPort(char *hostName, short portName, int *fdP)
585585
"FATAL: StreamServerPort: bind() failed: errno=%d\n",
586586
errno);
587587
pqdebug("%s",PQerrormsg);
588-
(void)strcat(PQerrormsg,"\tIs another postmaster already running on that port?\n");
589-
(void)strcat(PQerrormsg,"\tIf not, wait a few seconds and retry.\n");
588+
strcat(PQerrormsg,"\tIs another postmaster already running on that port?\n");
589+
strcat(PQerrormsg,"\tIf not, wait a few seconds and retry.\n");
590590
fputs(PQerrormsg,stderr);
591591
return(STATUS_ERROR);
592592
}

‎src/backend/nodes/print.c

Lines changed: 4 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/nodes/print.c,v 1.4 1997/08/03 02:35:13 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.5 1997/08/12 20:15:27 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHORDATEMAJOR EVENT
@@ -349,15 +349,13 @@ print_plan_recursive (Plan* p, Query *parsetree, int indentLevel, char* label)
349349
if (IsA(p,Scan)||IsA(p,SeqScan)) {
350350
RangeTblEntry*rte;
351351
rte=rt_fetch(((Scan*)p)->scanrelid,parsetree->rtable);
352-
strncpy(extraInfo,rte->relname,NAMEDATALEN);
353-
extraInfo[NAMEDATALEN-1]='\0';
352+
strNcpy(extraInfo,rte->relname,NAMEDATALEN-1);
354353
}else
355354
if (IsA(p,IndexScan)) {
356-
strncpy(extraInfo,
355+
strNcpy(extraInfo,
357356
((RangeTblEntry*)(nth(((IndexScan*)p)->scan.scanrelid-1,
358357
parsetree->rtable)))->relname,
359-
NAMEDATALEN);
360-
extraInfo[NAMEDATALEN-1]='\0';
358+
NAMEDATALEN-1);
361359
}else
362360
extraInfo[0]='\0';
363361
if (extraInfo[0]!='\0')

‎src/backend/nodes/readfuncs.c

Lines changed: 4 additions & 7 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.5 1997/05/1207:17:23 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.6 1997/08/1220:15:28 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -87,8 +87,7 @@ _readQuery()
8787
else {
8888
NotifyStmt*n=makeNode(NotifyStmt);
8989
n->relname=palloc(length+1);
90-
strncpy(n->relname,token,length);
91-
n->relname[length]='\0';
90+
strNcpy(n->relname,token,length);
9291
local_node->utilityStmt= (Node*)n;
9392
}
9493

@@ -106,8 +105,7 @@ _readQuery()
106105
local_node->uniqueFlag=NULL;
107106
else {
108107
local_node->uniqueFlag=palloc(length+1);
109-
strncpy(local_node->uniqueFlag,token,length);
110-
local_node->uniqueFlag[length]='\0';
108+
strNcpy(local_node->uniqueFlag,token,length);
111109
}
112110

113111
token=lsptok(NULL,&length);/* skip :targetlist */
@@ -1033,8 +1031,7 @@ _readAggreg()
10331031
token=lsptok(NULL,&length);/* eat :aggname */
10341032
token=lsptok(NULL,&length);/* get aggname */
10351033
local_node->aggname= (char*)palloc (length+1);
1036-
memset (local_node->aggname,0,length+1);
1037-
strncpy (local_node->aggname,token,length);
1034+
strNcpy (local_node->aggname,token,length);
10381035

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

‎src/backend/parser/analyze.c

Lines changed: 2 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.30 1997/08/03 02:35:28 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.31 1997/08/12 20:15:31 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1004,8 +1004,7 @@ makeTargetNames(ParseState *pstate, List *cols)
10041004
Ident*id=makeNode(Ident);
10051005

10061006
id->name=palloc(NAMEDATALEN);
1007-
strncpy(id->name,attr[i]->attname.data,NAMEDATALEN);
1008-
id->name[NAMEDATALEN-1]='\0';
1007+
strNcpy(id->name,attr[i]->attname.data,NAMEDATALEN-1);
10091008
id->indirection=NIL;
10101009
id->isRel= false;
10111010
if (tl==NIL)

‎src/backend/parser/catalog_utils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.19 1997/07/24 20:13:01 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.20 1997/08/12 20:15:32 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1488,7 +1488,7 @@ func_error(char *caller, char *funcname, int nargs, Oid *argtypes)
14881488
*ptr++=' ';
14891489
}
14901490
if (argtypes[i]!=0) {
1491-
(void)strcpy(ptr,tname(get_id_type(argtypes[i])));
1491+
strcpy(ptr,tname(get_id_type(argtypes[i])));
14921492
*(ptr+NAMEDATALEN)='\0';
14931493
}else
14941494
strcpy(ptr,"opaque");

0 commit comments

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