From 4327aae816f6c147782b5a011c7f899558629c27 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulf=20M=C3=B6ller?= <ulf@openssl.org>
Date: Tue, 6 Feb 2001 02:57:35 +0000
Subject: [PATCH] format strings

---
 MacOS/GetHTTPS.src/GetHTTPS.cpp | 4 ++--
 apps/ca.c                       | 2 +-
 apps/ciphers.c                  | 2 +-
 apps/crl.c                      | 2 +-
 apps/sess_id.c                  | 2 +-
 apps/x509.c                     | 2 +-
 crypto/rc4/rc4.c                | 2 +-
 demos/tunala/tunala.c           | 7 +++----
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/MacOS/GetHTTPS.src/GetHTTPS.cpp b/MacOS/GetHTTPS.src/GetHTTPS.cpp
index d62dc50473..3a5e3f0186 100644
--- a/MacOS/GetHTTPS.src/GetHTTPS.cpp
+++ b/MacOS/GetHTTPS.src/GetHTTPS.cpp
@@ -167,7 +167,7 @@ void main(void)
 		
 		tempString[bytesRead] = '\0';
 		
-		printf(tempString);
+		printf("%s", tempString);
 	}
 	
 	printf("\n\n\n");
@@ -201,7 +201,7 @@ EXITPOINT:
 	{
 		printf("An error occurred:\n");
 		
-		printf(GetErrorMessage());
+		printf("%s",GetErrorMessage());
 	}
 	
 	
diff --git a/apps/ca.c b/apps/ca.c
index 9c7bac39f0..567ef4777c 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -479,7 +479,7 @@ bad:
 	if (badops)
 		{
 		for (pp=ca_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,*pp);
+			BIO_printf(bio_err,"%s",*pp);
 		goto err;
 		}
 
diff --git a/apps/ciphers.c b/apps/ciphers.c
index b6e2f966d8..6be76716a8 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -150,7 +150,7 @@ int MAIN(int argc, char **argv)
 	if (badops)
 		{
 		for (pp=ciphers_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,*pp);
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
diff --git a/apps/crl.c b/apps/crl.c
index 3b5725f23f..666a8576fb 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -214,7 +214,7 @@ int MAIN(int argc, char **argv)
 		{
 bad:
 		for (pp=crl_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,*pp);
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
diff --git a/apps/sess_id.c b/apps/sess_id.c
index 60cc3f1e49..eb40aa6353 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -156,7 +156,7 @@ int MAIN(int argc, char **argv)
 		{
 bad:
 		for (pp=sess_id_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,*pp);
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
diff --git a/apps/x509.c b/apps/x509.c
index 9422e1d15c..af3843b1f8 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -435,7 +435,7 @@ int MAIN(int argc, char **argv)
 		{
 bad:
 		for (pp=x509_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,*pp);
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
diff --git a/crypto/rc4/rc4.c b/crypto/rc4/rc4.c
index 709b7aff35..bfb0a3c1f9 100644
--- a/crypto/rc4/rc4.c
+++ b/crypto/rc4/rc4.c
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
 		{
 bad:
 		for (pp=usage; (*pp != NULL); pp++)
-			fprintf(stderr,*pp);
+			fprintf(stderr,"%s",*pp);
 		exit(1);
 		}
 
diff --git a/demos/tunala/tunala.c b/demos/tunala/tunala.c
index 75d312ec92..9c3ff5978b 100644
--- a/demos/tunala/tunala.c
+++ b/demos/tunala/tunala.c
@@ -186,14 +186,13 @@ static int usage(const char *errstr, int isunknownarg)
 
 static int err_str0(const char *str0)
 {
-	fprintf(stderr, str0);
-	fprintf(stderr, "\n");
+	fprintf(stderr, "%s\n", str0);
 	return 1;
 }
 
-static int err_str1(const char *str0, const char *str1)
+static int err_str1(const char *fmt, const char *str1)
 {
-	fprintf(stderr, str0, str1);
+	fprintf(stderr, fmt, str1);
 	fprintf(stderr, "\n");
 	return 1;
 }
-- 
2.34.1