Fix pgproc names over 15 chars in output. Add strNcpy() function. remove some (void) casts that are unnecessary.

5 files changed, 12 insertions, 15 deletions

diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index bfc657778df..c823f0d0dd9 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -10,7 +10,7 @@
  *  
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.3 1996/11/06 08:21:42 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.4 1997/08/12 20:15:13 momjian Exp $
  *
  * NOTES
  *    At the point the version is defined, 2 physical relations are created
@@ -106,12 +106,12 @@ DefineVersion(char *name, char *fromRelname, char *date)
     if (date == NULL) {
 	/* no time ranges */
 	bname = fromRelname;
-	(void) strcpy(saved_basename, (char *) bname);
+	strcpy(saved_basename, (char *) bname);
 	*saved_snapshot = (char)NULL;
     } else {
 	/* version is a snapshot */
 	bname = fromRelname;
-	(void) strcpy(saved_basename, (char *) bname);
+	strcpy(saved_basename, (char *) bname);
 	sprintf(saved_snapshot, "['%s']", date);
     }
     
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index b8627d1e47a..7d24261c644 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.14 1997/08/03 02:34:34 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.15 1997/08/12 20:15:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -456,8 +456,7 @@ Async_Listen(char *relname, int pid)
      * to unlisten prior to dying.
      */
     relnamei = malloc(NAMEDATALEN); /* persists to process exit */
-    strncpy(relnamei, relname, NAMEDATALEN);
-    relnamei[NAMEDATALEN-1] = '\0';
+    strNcpy(relnamei, relname, NAMEDATALEN-1);
     on_exitpg(Async_UnlistenOnExit, (caddr_t) relnamei);
 }
 
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 1a184615bf1..0934e4197a5 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.8 1997/08/03 02:34:53 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.9 1997/08/12 20:15:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,7 @@ DefineRelation(CreateStmt *stmt)
     if ( strlen(stmt->relname) >= NAMEDATALEN)
 	elog(WARN, "the relation name %s is >= %d characters long", stmt->relname,
 	     NAMEDATALEN);
-    strncpy(relname,stmt->relname,NAMEDATALEN);  /* make full length for copy */
-    relname[NAMEDATALEN-1] = '\0';
+    strNcpy(relname,stmt->relname,NAMEDATALEN-1);  /* make full length for copy */
 
     /* ----------------
      * 	Handle parameters
diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c
index ed94f0c18ec..e6aa009bd33 100644
--- a/src/backend/commands/recipe.c
+++ b/src/backend/commands/recipe.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.5 1996/11/06 08:21:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.6 1997/08/12 20:15:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1149,8 +1149,7 @@ replaceTeeScans(Plan* plan, Query* parsetree, TeeInfo *teeInfo)
 	if  ((strlen(rte->refname) < 4) ||
 	     (strcmp (rte->relname, rte->refname) != 0))
 	    continue;
-	strncpy(prefix,rte->refname,4);
-	prefix[4] = '\0';
+	strNcpy(prefix,rte->refname,4);
 	if (strcmp(prefix,"tee_") == 0) {
 	    /* okay, we found a tee node entry in the range table */
 
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 87f995a2d7d..c1016a91c91 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.4 1996/11/10 02:59:42 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.5 1997/08/12 20:15:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -235,8 +235,8 @@ renamerel(char oldrelname[], char newrelname[])
     }
     
     /* rename the directory first, so if this fails the rename's not done */
-    (void) strcpy(oldpath, relpath(oldrelname));
-    (void) strcpy(newpath, relpath(newrelname));
+    strcpy(oldpath, relpath(oldrelname));
+    strcpy(newpath, relpath(newrelname));
     if (rename(oldpath, newpath) < 0)
 	elog(WARN, "renamerel: unable to rename file: %m");