cleanup of patch

bmomjian · bmomjian · commit 0f6a961e299b · 1997-08-12T20:39:16.000Z
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.6 1997/08/12 20:15:55 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.7 1997/08/12 20:39:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -101,8 +101,7 @@ char *char16in(char *s)
     if (s == NULL)
 	return(NULL);
     result = (char *) palloc(16);
-    memset(result, 0, 16);
-    (void) strncpy(result, s, 16);
+    strncpy(result, s, 16);
     return(result);
 }
 
@@ -113,12 +112,11 @@ char *char16out(char *s)
 {
     char	*result = (char *) palloc(17);
     
-    memset(result, 0, 17);
     if (s == NULL) {
 	result[0] = '-';
-    } else {
-	strncpy(result, s, 16);
-    }
+	result[1] = '\0';
+    } else
+	strNcpy(result, s, 16);
     return(result);
 }
 
@@ -207,17 +205,15 @@ uint16 char2in(char *s)
     if (s == NULL)
 	return(0);
     
-    memset((char *) &res, 0, sizeof(res));
-    (void) strncpy((char *) &res, s, 2);
+    strncpy((char *) &res, s, 2);
     return(res);
 }
 
 char *char2out(uint16 s)
 {
     char	*result = (char *) palloc(3);
     
-    memset(result, 0, 3);
-    (void) strncpy(result, (char *) &s, 2);
+    strNcpy(result, (char *) &s, 2);
     
     return(result);
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.6 1997/08/12 20:15:55 momjian Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.7 1997/08/12 20:39:16 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -101,8 +101,7 @@ char char16in(char s)`
`101`	`101`	`if (s == NULL)`
`102`	`102`	`return(NULL);`
`103`	`103`	`result = (char *) palloc(16);`
`104`		`- memset(result, 0, 16);`
`105`		`- (void) strncpy(result, s, 16);`
	`104`	`+ strncpy(result, s, 16);`
`106`	`105`	`return(result);`
`107`	`106`	`}`
`108`	`107`
`@@ -113,12 +112,11 @@ char char16out(char s)`
`113`	`112`	`{`
`114`	`113`	`char result = (char ) palloc(17);`
`115`	`114`
`116`		`- memset(result, 0, 17);`
`117`	`115`	`if (s == NULL) {`
`118`	`116`	`result[0] = '-';`
`119`		`- } else {`
`120`		`- strncpy(result, s, 16);`
`121`		`- }`
	`117`	`+ result[1] = '\0';`
	`118`	`+ } else`
	`119`	`+ strNcpy(result, s, 16);`
`122`	`120`	`return(result);`
`123`	`121`	`}`
`124`	`122`
`@@ -207,17 +205,15 @@ uint16 char2in(char *s)`
`207`	`205`	`if (s == NULL)`
`208`	`206`	`return(0);`
`209`	`207`
`210`		`- memset((char *) &res, 0, sizeof(res));`
`211`		`- (void) strncpy((char *) &res, s, 2);`
	`208`	`+ strncpy((char *) &res, s, 2);`
`212`	`209`	`return(res);`
`213`	`210`	`}`
`214`	`211`
`215`	`212`	`char *char2out(uint16 s)`
`216`	`213`	`{`
`217`	`214`	`char result = (char ) palloc(3);`
`218`	`215`
`219`		`- memset(result, 0, 3);`
`220`		`- (void) strncpy(result, (char *) &s, 2);`
	`216`	`+ strNcpy(result, (char *) &s, 2);`
`221`	`217`
`222`	`218`	`return(result);`
`223`	`219`	`}`