dso/dso_win32.c: fix compiler warning.
authorAndy Polyakov <appro@openssl.org>
Tue, 18 Dec 2012 18:19:54 +0000 (18:19 +0000)
committerAndy Polyakov <appro@openssl.org>
Tue, 18 Dec 2012 18:19:54 +0000 (18:19 +0000)
crypto/dso/dso_win32.c

index 6fb6c54..1cab314 100644 (file)
@@ -689,7 +689,6 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
        CREATETOOLHELP32SNAPSHOT create_snap;
        CLOSETOOLHELP32SNAPSHOT  close_snap;
        MODULE32 module_first, module_next;
-       int len;
  
        if (addr == NULL)
                {
@@ -752,21 +751,25 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
                        return WideCharToMultiByte(CP_ACP,0,me32.szExePath,-1,
                                                        path,sz,NULL,NULL);
 # else
-                       len = (int)wcslen(me32.szExePath);
+                       {
+                       int i,len = (int)wcslen(me32.szExePath);
                        if (sz <= 0) return len+1;
                        if (len >= sz) len=sz-1;
                        for(i=0;i<len;i++)
                                path[i] = (char)me32.szExePath[i];
                        path[len++] = 0;
                        return len;
+                       }
 # endif
 #else
-                       len = (int)strlen(me32.szExePath);
+                       {
+                       int len = (int)strlen(me32.szExePath);
                        if (sz <= 0) return len+1;
                        if (len >= sz) len=sz-1;
                        memcpy(path,me32.szExePath,len);
                        path[len++] = 0;
                        return len;
+                       }
 #endif
                        } 
                } while((*module_next)(hModuleSnap, &me32));