summaryrefslogtreecommitdiffstats
path: root/crypto/threads
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-05 00:34:00 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:50 +0000
commite19d4a99b8f25456dfab7086af57f3f208cdfed6 (patch)
treecd7931e89476c762982afdc5585aa942ad0a4f0b /crypto/threads
parent6977c7e2baf291278aee7632f1a68581b7c4d1f9 (diff)
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/threads')
-rw-r--r--crypto/threads/mttest.c7
-rw-r--r--crypto/threads/th-lock.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c
index eba7aa8a6e..59cb3f34a4 100644
--- a/crypto/threads/mttest.c
+++ b/crypto/threads/mttest.c
@@ -865,7 +865,7 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
(type&CRYPTO_READ)?"r":"w",file,line);
#endif
- /*
+ /*-
if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(),
@@ -873,7 +873,8 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
*/
if (mode & CRYPTO_LOCK)
{
- /* if (mode & CRYPTO_READ)
+ /*-
+ if (mode & CRYPTO_READ)
rw_rdlock(&(lock_cs[type]));
else
rw_wrlock(&(lock_cs[type])); */
@@ -1069,7 +1070,7 @@ void pthreads_locking_callback(int mode, int type, char *file,
(mode&CRYPTO_LOCK)?"l":"u",
(type&CRYPTO_READ)?"r":"w",file,line);
#endif
-/*
+/*-
if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(),
diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 14aae5f912..8daa98c1e5 100644
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -97,7 +97,8 @@ static unsigned long irix_thread_id(void );
static unsigned long solaris_thread_id(void );
static unsigned long pthreads_thread_id(void );
-/* usage:
+/*-
+ * usage:
* CRYPTO_thread_setup();
* application code
* CRYPTO_thread_cleanup();