summaryrefslogtreecommitdiffstats
path: root/crypto/dso/dso_lib.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-07-16 08:02:31 +0000
committerRichard Levitte <levitte@openssl.org>2002-07-16 08:02:31 +0000
commitb23f50e67eecb7a381e5ed90b11eb438af596316 (patch)
treea4611c597239160615acb459fd1594a8953d4748 /crypto/dso/dso_lib.c
parent7fe03ed3a3260cc29ca748b2b150dab5c71844ce (diff)
Some older code (never committed) wasn't converted to the new format.
Corrected.
Diffstat (limited to 'crypto/dso/dso_lib.c')
-rw-r--r--crypto/dso/dso_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index e7ddfd5ecf..1045d1dd19 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -394,7 +394,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
{
char *result = NULL;
- if(dso == NULL || dir == NULL)
+ if(dso == NULL || filespec1 == NULL)
{
DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
return(NULL);
@@ -403,7 +403,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
filespec1 = dso->filename;
if(filespec1 == NULL)
{
- DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILENAME);
+ DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
return(NULL);
}
if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)