mark all block comments that need format preserving so that

indent will not alter them when reformatting comments

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>

18 files changed, 33 insertions, 18 deletions

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 42f37d7819..f07d8b665e 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -69,7 +69,8 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -in arg	- input file - default stdin
  * -i		- indent the details by depth
  * -offset	- where in the file to start
diff --git a/apps/ca.c b/apps/ca.c
index baa6a906a5..6e8fa273db 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2829,7 +2829,8 @@ char *make_revocation_str(int rev_type, char *rev_arg)
 	return str;
 	}
 
-/* Convert revocation field to X509_REVOKED entry 
+/*-
+ * Convert revocation field to X509_REVOKED entry 
  * return code:
  * 0 error
  * 1 OK
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 42c6886b83..ce78e76e80 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -75,7 +75,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG	crl2pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/dh.c b/apps/dh.c
index dee9c01fce..26107b8580 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -74,7 +74,8 @@
 #undef PROG
 #define PROG	dh_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 1127d10c1c..7982222abc 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -132,7 +132,8 @@
 
 #define DEFBITS	2048
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/dsa.c b/apps/dsa.c
index 5222487ab9..03599be49d 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -74,7 +74,8 @@
 #undef PROG
 #define PROG	dsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg	- input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index fcbd794947..a922335c31 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -75,7 +75,8 @@
 #undef PROG
 #define PROG	dsaparam_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/ec.c b/apps/ec.c
index 896eabc13f..ec560aabed 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -70,7 +70,8 @@
 #undef PROG
 #define PROG	ec_main
 
-/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg    - input format - default PEM (one of DER, NET or PEM)
  * -outform arg   - output format - default PEM
  * -in arg        - input file - default stdin
  * -out arg       - output file - default stdout
diff --git a/apps/ecparam.c b/apps/ecparam.c
index de4e46f5a8..4f6a654919 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -87,7 +87,8 @@
 #undef PROG
 #define PROG	ecparam_main
 
-/* -inform arg      - input format - default PEM (DER or PEM)
+/*-
+ * -inform arg      - input format - default PEM (DER or PEM)
  * -outform arg     - output format - default PEM
  * -in  arg         - input file  - default stdin
  * -out arg         - output file - default stdout
diff --git a/apps/openssl.c b/apps/openssl.c
index 5372459456..7453e6528c 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -238,7 +238,8 @@ int main(int Argc, char *ARGV[])
 	long errline;
 
 #if defined( OPENSSL_SYS_VMS) && (__INITIAL_POINTER_SIZE == 64)
-	/* 2011-03-22 SMS.
+	/*- 
+	 * 2011-03-22 SMS.
 	 * If we have 32-bit pointers everywhere, then we're safe, and
 	 * we bypass this mess, as on non-VMS systems.  (See ARGV,
 	 * above.)
diff --git a/apps/passwd.c b/apps/passwd.c
index 9ca25dd1da..8e65ed7cbb 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -43,7 +43,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	char *passwd, BIO *out, int quiet, int table, int reverse,
 	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
 
-/* -crypt        - standard Unix password algorithm (default)
+/*-
+ * -crypt        - standard Unix password algorithm (default)
  * -1            - MD5-based password algorithm
  * -apr1         - MD5-based password algorithm, Apache variant
  * -salt string  - salt
diff --git a/apps/rand.c b/apps/rand.c
index 790e79592c..dc931596fd 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -66,7 +66,8 @@
 #undef PROG
 #define PROG rand_main
 
-/* -out file         - write to file
+/*-
+ * -out file         - write to file
  * -rand file:file   - PRNG seed files
  * -base64           - base64 encode output
  * -hex              - hex encode output
diff --git a/apps/req.c b/apps/req.c
index a69915f2f4..cc1b631b03 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -99,7 +99,8 @@
 #undef PROG
 #define PROG	req_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/rsa.c b/apps/rsa.c
index a17708fe9c..4443d7408a 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -74,7 +74,8 @@
 #undef PROG
 #define PROG	rsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg	- input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 7edef15c40..f44050db40 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -532,7 +532,7 @@ redoit:
 		return(0);
 		}
 
-/*
+/*-
 	ling.l_onoff=1;
 	ling.l_linger=0;
 	i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling));
diff --git a/apps/spkac.c b/apps/spkac.c
index 0e01ea9947..149db1784b 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -73,7 +73,8 @@
 #undef PROG
 #define PROG	spkac_main
 
-/* -in arg	- input file - default stdin
+/*-
+ * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
  */
 
diff --git a/apps/ts.c b/apps/ts.c
index ae7604cc69..ace13bdddb 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -1130,7 +1130,7 @@ static X509_STORE *create_cert_store(char *ca_path, char *ca_file)
 
 static int MS_CALLBACK verify_cb(int ok, X509_STORE_CTX *ctx)
 	{
-	/*
+	/*-
 	char buf[256];
 
 	if (!ok)
diff --git a/apps/vms_decc_init.c b/apps/vms_decc_init.c
index f512c8f1bc..1130ae4412 100755
--- a/apps/vms_decc_init.c
+++ b/apps/vms_decc_init.c
@@ -5,7 +5,7 @@
 
 #ifdef USE_DECC_INIT
 
-/*
+/*-
  * 2010-04-26 SMS.
  *
  *----------------------------------------------------------------------