summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-04-23 21:55:26 +0000
committertedu <>2014-04-23 21:55:26 +0000
commit3df792e5df6e12f7048cd499841d93bf69accd3e (patch)
treeff8c021dba5a3a15e5c4f08510dc608beb936da9 /src
parent40e1b308306633da3204f243350176f8b3d377af (diff)
downloadopenbsd-3df792e5df6e12f7048cd499841d93bf69accd3e.tar.gz
openbsd-3df792e5df6e12f7048cd499841d93bf69accd3e.tar.bz2
openbsd-3df792e5df6e12f7048cd499841d93bf69accd3e.zip
fix some variables
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/dso/dso_dlfcn.c3
-rw-r--r--src/lib/libssl/src/crypto/dso/dso_dlfcn.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 9731df136d..ea4e4935aa 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -245,7 +245,6 @@ static char *
245dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2) 245dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2)
246{ 246{
247 char *merged; 247 char *merged;
248 size_t len;
249 248
250 if (!filespec1 && !filespec2) { 249 if (!filespec1 && !filespec2) {
251 DSOerr(DSO_F_DLFCN_MERGER, 250 DSOerr(DSO_F_DLFCN_MERGER,
@@ -275,7 +274,7 @@ dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2)
275 the concatenation of filespec2 followed by a slash followed 274 the concatenation of filespec2 followed by a slash followed
276 by filespec1. */ 275 by filespec1. */
277 { 276 {
278 int spec2len, len; 277 size_t spec2len, len;
279 278
280 spec2len = strlen(filespec2); 279 spec2len = strlen(filespec2);
281 len = spec2len + (filespec1 ? strlen(filespec1) : 0); 280 len = spec2len + (filespec1 ? strlen(filespec1) : 0);
diff --git a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 9731df136d..ea4e4935aa 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -245,7 +245,6 @@ static char *
245dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2) 245dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2)
246{ 246{
247 char *merged; 247 char *merged;
248 size_t len;
249 248
250 if (!filespec1 && !filespec2) { 249 if (!filespec1 && !filespec2) {
251 DSOerr(DSO_F_DLFCN_MERGER, 250 DSOerr(DSO_F_DLFCN_MERGER,
@@ -275,7 +274,7 @@ dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2)
275 the concatenation of filespec2 followed by a slash followed 274 the concatenation of filespec2 followed by a slash followed
276 by filespec1. */ 275 by filespec1. */
277 { 276 {
278 int spec2len, len; 277 size_t spec2len, len;
279 278
280 spec2len = strlen(filespec2); 279 spec2len = strlen(filespec2);
281 len = spec2len + (filespec1 ? strlen(filespec1) : 0); 280 len = spec2len + (filespec1 ? strlen(filespec1) : 0);