diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-12-18 18:19:54 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-02-01 23:32:19 +0100 |
| commit | eb6af20d2e8e3219876a1eb290dc6f1d5d25b436 (patch) | |
| tree | 1a6d7ec46692431d39dc12c142d186a08eff4985 /crypto/dso | |
| parent | 8087969c5b702c14ff1a1044085374070df01a86 (diff) | |
dso/dso_win32.c: fix compiler warning.
(cherry picked from commit 0a2d5003df1a9ecf801ac3b4a5cb7dda85449315)
Diffstat (limited to 'crypto/dso')
| -rw-r--r-- | crypto/dso/dso_win32.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 6fb6c54181..1cab3142c6 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -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)); |