1 files changed, 87 insertions, 84 deletions

diff --git a/lib/libcrypto/bio/b_dump.c b/lib/libcrypto/bio/b_dump.c
index 492ee09275e..bea94969a2f 100644
--- a/lib/libcrypto/bio/b_dump.c
+++ b/lib/libcrypto/bio/b_dump.c
@@ -66,122 +66,125 @@
 
 #define TRUNCATE
 #define DUMP_WIDTH	16
-#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH-((i-(i>6?6:i)+3)/4))
+#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
 
-int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-	void *u, const char *s, int len)
-	{
+int
+BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const char *s, int len)
+{
 	return BIO_dump_indent_cb(cb, u, s, len, 0);
-	}
+}
 
-int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
-	void *u, const char *s, int len, int indent)
-	{
-	int ret=0;
-	char buf[288+1],tmp[20],str[128+1];
-	int i,j,rows,trc;
+int
+BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const char *s, int len, int indent)
+{
+	int ret = 0;
+	char buf[288 + 1], tmp[20], str[128 + 1];
+	int i, j, rows, trc;
 	unsigned char ch;
 	int dump_width;
 
-	trc=0;
+	trc = 0;
 
 #ifdef TRUNCATE
-	for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--)
+	for (; (len > 0) && ((s[len - 1] == ' ') || (s[len - 1] == '\0')); len--)
 		trc++;
 #endif
 
 	if (indent < 0)
 		indent = 0;
-	if (indent)
-		{
-		if (indent > 128) indent=128;
-		memset(str,' ',indent);
-		}
-	str[indent]='\0';
+	if (indent) {
+		if (indent > 128)
+			indent = 128;
+		memset(str, ' ', indent);
+	}
+	str[indent] = '\0';
 
-	dump_width=DUMP_WIDTH_LESS_INDENT(indent);
-	rows=(len/dump_width);
-	if ((rows*dump_width)<len)
+	dump_width = DUMP_WIDTH_LESS_INDENT(indent);
+	rows = (len / dump_width);
+	if ((rows * dump_width) < len)
 		rows++;
-	for(i=0;i<rows;i++)
-		{
-		buf[0]='\0';	/* start with empty string */
-		BUF_strlcpy(buf,str,sizeof buf);
-		(void) 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)
-				{
-				BUF_strlcat(buf,"   ",sizeof buf);
-				}
-			else
-				{
-				ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
-				(void) snprintf(tmp,sizeof tmp,"%02x%c",ch,
-					j==7?'-':' ');
-				BUF_strlcat(buf,tmp,sizeof buf);
-				}
+	for (i = 0; i < rows; i++) {
+		buf[0] = '\0';	/* start with empty string */
+		BUF_strlcpy(buf, str, sizeof buf);
+		(void) 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) {
+				BUF_strlcat(buf, "   ", sizeof buf);
+			} else {
+				ch = ((unsigned char)*(s + i*dump_width + j)) & 0xff;
+				(void) snprintf(tmp, sizeof tmp, "%02x%c", ch,
+				    j == 7 ? '-' : ' ');
+				BUF_strlcat(buf, tmp, sizeof buf);
 			}
-		BUF_strlcat(buf,"  ",sizeof buf);
-		for(j=0;j<dump_width;j++)
-			{
-			if (((i*dump_width)+j)>=len)
+		}
+		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;
+			ch = ((unsigned char)*(s + i * dump_width + j)) & 0xff;
 #ifndef CHARSET_EBCDIC
-			(void) snprintf(tmp,sizeof tmp,"%c",
-				((ch>=' ')&&(ch<='~'))?ch:'.');
+			(void) snprintf(tmp, sizeof tmp, "%c",
+			    ((ch >= ' ') && (ch <= '~')) ? ch : '.');
 #else
-			(void) snprintf(tmp,sizeof tmp,"%c",
-				((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
-				? os_toebcdic[ch]
-				: '.');
+			(void) snprintf(tmp, sizeof tmp, "%c",
+			    ((ch >= os_toascii[' ']) && (ch <= os_toascii['~']))
+			    ? os_toebcdic[ch] : '.');
 #endif
-			BUF_strlcat(buf,tmp,sizeof buf);
-			}
-		BUF_strlcat(buf,"\n",sizeof buf);
+			BUF_strlcat(buf, tmp, 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
 		 */
-		ret+=cb((void *)buf,strlen(buf),u);
-		}
+		ret += cb((void *)buf, strlen(buf), u);
+	}
 #ifdef TRUNCATE
-	if (trc > 0)
-		{
-		(void) snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
-			len+trc);
-		ret+=cb((void *)buf,strlen(buf),u);
-		}
-#endif
-	return(ret);
+	if (trc > 0) {
+		(void) snprintf(buf, sizeof buf, "%s%04x - <SPACES/NULS>\n",
+		    str, len + trc);
+		ret += cb((void *)buf, strlen(buf), u);
 	}
+#endif
+	return (ret);
+}
 
 #ifndef OPENSSL_NO_FP_API
-static int write_fp(const void *data, size_t len, void *fp)
-	{
+static int
+write_fp(const void *data, size_t len, void *fp)
+{
 	return UP_fwrite(data, len, 1, fp);
-	}
-int BIO_dump_fp(FILE *fp, const char *s, int len)
-	{
+}
+
+int
+BIO_dump_fp(FILE *fp, const char *s, int len)
+{
 	return BIO_dump_cb(write_fp, fp, s, len);
-	}
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
-	{
+}
+
+int
+BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
+{
 	return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
-	}
+}
 #endif
 
-static int write_bio(const void *data, size_t len, void *bp)
-	{
+static int
+write_bio(const void *data, size_t len, void *bp)
+{
 	return BIO_write((BIO *)bp, (const char *)data, len);
-	}
-int BIO_dump(BIO *bp, const char *s, int len)
-	{
+}
+
+int
+BIO_dump(BIO *bp, const char *s, int len)
+{
 	return BIO_dump_cb(write_bio, bp, s, len);
-	}
-int BIO_dump_indent(BIO *bp, const char *s, int len, int indent)
-	{
-	return BIO_dump_indent_cb(write_bio, bp, s, len, indent);
-	}
+}
 
+int
+BIO_dump_indent(BIO *bp, const char *s, int len, int indent)
+{
+	return BIO_dump_indent_cb(write_bio, bp, s, len, indent);
+}