1212 *
1313 *
1414 * 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 $
1616 *
1717 *-------------------------------------------------------------------------
1818 */
@@ -101,8 +101,7 @@ char *char16in(char *s)
101101if (s == NULL )
102102return (NULL );
103103result = (char * )palloc (16 );
104- memset (result ,0 ,16 );
105- (void )strncpy (result ,s ,16 );
104+ strncpy (result ,s ,16 );
106105return (result );
107106}
108107
@@ -113,12 +112,11 @@ char *char16out(char *s)
113112{
114113char * result = (char * )palloc (17 );
115114
116- memset (result ,0 ,17 );
117115if (s == NULL ) {
118116result [0 ]= '-' ;
119- } else {
120- strncpy ( result , s , 16 );
121- }
117+ result [ 1 ] = '\0' ;
118+ } else
119+ strNcpy ( result , s , 16 );
122120return (result );
123121}
124122
@@ -207,17 +205,15 @@ uint16 char2in(char *s)
207205if (s == NULL )
208206return (0 );
209207
210- memset ((char * )& res ,0 ,sizeof (res ));
211- (void )strncpy ((char * )& res ,s ,2 );
208+ strncpy ((char * )& res ,s ,2 );
212209return (res );
213210}
214211
215212char * char2out (uint16 s )
216213{
217214char * result = (char * )palloc (3 );
218215
219- memset (result ,0 ,3 );
220- (void )strncpy (result , (char * )& s ,2 );
216+ strNcpy (result , (char * )& s ,2 );
221217
222218return (result );
223219}