From: Ben Laurie <ben@openssl.org>
Date: Sat, 27 Dec 2008 02:36:24 +0000 (+0000)
Subject: Remove dead code. (Coverity ID 2)
X-Git-Tag: OpenSSL_0_9_8k^2~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dde5b979d2a3d69767e86c8abfffda82538c32a0;p=oweals%2Fopenssl.git

Remove dead code. (Coverity ID 2)
---

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 75ac66707d..8a15b794ab 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -399,13 +399,6 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 		DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
 		return(NULL);
 		}
-	if(filespec1 == NULL)
-		filespec1 = dso->filename;
-	if(filespec1 == NULL)
-		{
-		DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
-		return(NULL);
-		}
 	if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
 		{
 		if(dso->merger != NULL)