From 40d673554117d24c9f46be721235d3e302c06e04 Mon Sep 17 00:00:00 2001
From: markus <>
Date: Thu, 8 Apr 2004 08:03:15 +0000
Subject: merge 0.9.7d

---
 src/lib/libcrypto/bio/b_dump.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/lib/libcrypto/bio/b_dump.c')

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index 983604fb49..f671e722fa 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -104,41 +104,41 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent)
 	for(i=0;i<rows;i++)
 		{
 		buf[0]='\0';	/* start with empty string */
-		strlcpy(buf,str,sizeof buf);
-		snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width);
-		strlcat(buf,tmp,sizeof buf);
+		BUF_strlcpy(buf,str,sizeof buf);
+		BIO_snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width);
+		BUF_strlcat(buf,tmp,sizeof buf);
 		for(j=0;j<dump_width;j++)
 			{
 			if (((i*dump_width)+j)>=len)
 				{
-				strlcat(buf,"   ",sizeof buf);
+				BUF_strlcat(buf,"   ",sizeof buf);
 				}
 			else
 				{
 				ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
-				snprintf(tmp,sizeof tmp,"%02x%c",ch,
+				BIO_snprintf(tmp,sizeof tmp,"%02x%c",ch,
 					 j==7?'-':' ');
-				strlcat(buf,tmp,sizeof buf);
+				BUF_strlcat(buf,tmp,sizeof buf);
 				}
 			}
-		strlcat(buf,"  ",sizeof buf);
+		BUF_strlcat(buf,"  ",sizeof buf);
 		for(j=0;j<dump_width;j++)
 			{
 			if (((i*dump_width)+j)>=len)
 				break;
 			ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
 #ifndef CHARSET_EBCDIC
-			snprintf(tmp,sizeof tmp,"%c",
+			BIO_snprintf(tmp,sizeof tmp,"%c",
 				 ((ch>=' ')&&(ch<='~'))?ch:'.');
 #else
-			snprintf(tmp,sizeof tmp,"%c",
+			BIO_snprintf(tmp,sizeof tmp,"%c",
 				 ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
 				 ? os_toebcdic[ch]
 				 : '.');
 #endif
-			strlcat(buf,tmp,sizeof buf);
+			BUF_strlcat(buf,tmp,sizeof buf);
 			}
-		strlcat(buf,"\n",sizeof buf);
+		BUF_strlcat(buf,"\n",sizeof buf);
 		/* if this is the last call then update the ddt_dump thing so that
 		 * we will move the selection point in the debug window 
 		 */
@@ -147,7 +147,7 @@ int BIO_dump_indent(BIO *bio, const char *s, int len, int indent)
 #ifdef TRUNCATE
 	if (trunc > 0)
 		{
-		snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
+		BIO_snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
 			 len+trunc);
 		ret+=BIO_write(bio,(char *)buf,strlen(buf));
 		}
-- 
cgit v1.2.3-55-g6feb