From e17d60d5fb7735647e8b12320876ff5bb549b4b7 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Wed, 8 Jun 2005 21:27:34 +0000
Subject: [PATCH] Fix couple gcc 4 warnings, reformat comment.

---
 crypto/dso/dso_dlfcn.c |  4 ++--
 fips/rand/fips_rngvs.c | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index 1f32245ee..d7d40ce32 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -232,7 +232,7 @@ static void *dlfcn_bind_var(DSO *dso, const char *symname)
 static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
 	{
 	void *ptr;
-	DSO_FUNC_TYPE sym;
+	DSO_FUNC_TYPE sym, *tsym = &sym;
 
 	if((dso == NULL) || (symname == NULL))
 		{
@@ -250,7 +250,7 @@ static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
 		DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE);
 		return(NULL);
 		}
-	*(void**)(&sym) = dlsym(ptr, symname);
+	*(void**)(tsym) = dlsym(ptr, symname);
 	if(sym == NULL)
 		{
 		DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE);
diff --git a/fips/rand/fips_rngvs.c b/fips/rand/fips_rngvs.c
index 2e7053368..a50bfe4bc 100644
--- a/fips/rand/fips_rngvs.c
+++ b/fips/rand/fips_rngvs.c
@@ -1,11 +1,12 @@
 /*
- * Crude test driver for processing the VST and MCT testvector files generated by the CMVP
- * RNGVS product.
+ * Crude test driver for processing the VST and MCT testvector files
+ * generated by the CMVP RNGVS product.
  *
- * Note the input files are assumed to have a _very_ specific format as described in the
- * NIST document "The Random Number Generator Validation System (RNGVS)", May 25, 2004.
+ * Note the input files are assumed to have a _very_ specific format
+ * as described in the NIST document "The Random Number Generator
+ * Validation System (RNGVS)", May 25, 2004.
  *
-*/
+ */
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_FIPS
@@ -13,7 +14,7 @@
 int main()
 {
     printf("No FIPS RNG support\n");
-    exit(0);
+    return 0;
 }
 #else