another warning.

[openssl.git] / crypto / dso / dso_win32.c

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index edf5d75b0f6a7e78c9087ae457ededc9d605a03a..212a255b4b387a75a1afdbf05c4fad1985713290 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "cryptlib.h"
 #include <openssl/dso.h>
 
@@ -118,8 +119,8 @@ static int win32_load(DSO *dso, const char *filename)
        len = strlen(filename);
        if((dso->flags & DSO_FLAG_NAME_TRANSLATION) &&
                        (len + 4 < DSO_MAX_TRANSLATED_SIZE) &&
-                       (strstr(filename, "/") == NULL)
-                       (strstr(filename, "\\") == NULL)
+                       (strstr(filename, "/") == NULL) &&
+                       (strstr(filename, "\\") == NULL) &&
                        (strstr(filename, ":") == NULL))
                {
                sprintf(translated, "%s.dll", filename);
@@ -159,10 +160,7 @@ static int win32_unload(DSO *dso)
                return(0);
                }
        if(sk_num(dso->meth_data) < 1)
-               {
-               DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_STACK_ERROR);
-               return(0);
-               }
+               return(1);
        p = (HINSTANCE *)sk_pop(dso->meth_data);
        if(p == NULL)
                {
@@ -213,7 +211,7 @@ static int win32_bind(DSO *dso, const char *symname, void **symptr)
        return(1);
        }
 
-static int win32_ctrl(DSO *dso, int cmd, long larg, void *parg)
+static long win32_ctrl(DSO *dso, int cmd, long larg, void *parg)
         {
         if(dso == NULL)
                 {