Skip to content

Commit edb5872

Browse files
bmomjianbmomjian
committed
Fix pgproc names over 15 chars in output. Add strNcpy() function. remove some (void) casts that are unnecessary.
1 parent 4b851b1 commit edb5872

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
return newstr;
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. */

0 commit comments

Comments
 (0)