projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make update
[openssl.git]
/
crypto
/
dso
/
dso_win32.c
diff --git
a/crypto/dso/dso_win32.c
b/crypto/dso/dso_win32.c
index eea0b07c3c6bb23b8e84ab3e69caf3ded94a0584..6fb6c54181c1cabb3663810aea3a47f6ccdf4a0f 100644
(file)
--- a/
crypto/dso/dso_win32.c
+++ b/
crypto/dso/dso_win32.c
@@
-188,7
+188,7
@@
static int win32_load(DSO *dso)
goto err;
}
*p = h;
goto err;
}
*p = h;
- if(!sk_
push(dso->meth_data, (char *)
p))
+ if(!sk_
void_push(dso->meth_data,
p))
{
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
goto err;
{
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
goto err;
@@
-215,9
+215,9
@@
static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
return(0);
}
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
return(0);
}
- if(sk_num(dso->meth_data) < 1)
+ if(sk_
void_
num(dso->meth_data) < 1)
return(1);
return(1);
- p =
(HINSTANCE *)sk
_pop(dso->meth_data);
+ p =
sk_void
_pop(dso->meth_data);
if(p == NULL)
{
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
if(p == NULL)
{
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
@@
-228,7
+228,7
@@
static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
/* We should push the value back onto the stack in
* case of a retry. */
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
/* We should push the value back onto the stack in
* case of a retry. */
- sk_
push(dso->meth_data, (char *)
p);
+ sk_
void_push(dso->meth_data,
p);
return(0);
}
/* Cleanup */
return(0);
}
/* Cleanup */
@@
-248,12
+248,12
@@
static void *win32_bind_var(DSO *dso, const char *symname)
DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
return(NULL);
}
DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
return(NULL);
}
- if(sk_num(dso->meth_data) < 1)
+ if(sk_
void_
num(dso->meth_data) < 1)
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR);
return(NULL);
}
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR);
return(NULL);
}
- ptr =
(HINSTANCE *)sk_value(dso->meth_data, sk
_num(dso->meth_data) - 1);
+ ptr =
sk_void_value(dso->meth_data, sk_void
_num(dso->meth_data) - 1);
if(ptr == NULL)
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE);
if(ptr == NULL)
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE);
@@
-279,12
+279,12
@@
static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname)
DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
return(NULL);
}
DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
return(NULL);
}
- if(sk_num(dso->meth_data) < 1)
+ if(sk_
void_
num(dso->meth_data) < 1)
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR);
return(NULL);
}
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR);
return(NULL);
}
- ptr =
(HINSTANCE *)sk_value(dso->meth_data, sk
_num(dso->meth_data) - 1);
+ ptr =
sk_void_value(dso->meth_data, sk_void
_num(dso->meth_data) - 1);
if(ptr == NULL)
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);
if(ptr == NULL)
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);
@@
-355,10
+355,11
@@
static struct file_st *win32_splitter(DSO *dso, const char *filename,
DSOerr(DSO_F_WIN32_SPLITTER,
DSO_R_INCORRECT_FILE_SYNTAX);
/*goto err;*/
DSOerr(DSO_F_WIN32_SPLITTER,
DSO_R_INCORRECT_FILE_SYNTAX);
/*goto err;*/
+ OPENSSL_free(result);
return(NULL);
}
result->device = start;
return(NULL);
}
result->device = start;
- result->devicelen =
filename - start
;
+ result->devicelen =
(int)(filename - start)
;
position = IN_FILE;
start = ++filename;
result->dir = start;
position = IN_FILE;
start = ++filename;
result->dir = start;
@@
-367,7
+368,7
@@
static struct file_st *win32_splitter(DSO *dso, const char *filename,
case '/':
if(position == IN_NODE)
{
case '/':
if(position == IN_NODE)
{
- result->nodelen =
filename - start
;
+ result->nodelen =
(int)(filename - start)
;
position = IN_FILE;
start = ++filename;
result->dir = start;
position = IN_FILE;
start = ++filename;
result->dir = start;
@@
-377,20
+378,20
@@
static struct file_st *win32_splitter(DSO *dso, const char *filename,
position = IN_FILE;
filename++;
result->dir = start;
position = IN_FILE;
filename++;
result->dir = start;
- result->dirlen =
filename - start
;
+ result->dirlen =
(int)(filename - start)
;
start = filename;
}
else
{
filename++;
start = filename;
}
else
{
filename++;
- result->dirlen +=
filename - start
;
+ result->dirlen +=
(int)(filename - start)
;
start = filename;
}
break;
case '\0':
if(position == IN_NODE)
{
start = filename;
}
break;
case '\0':
if(position == IN_NODE)
{
- result->nodelen =
filename - start
;
+ result->nodelen =
(int)(filename - start)
;
}
else
{
}
else
{
@@
-404,13
+405,13
@@
static struct file_st *win32_splitter(DSO *dso, const char *filename,
result->dirlen = 0;
}
result->dirlen +=
result->dirlen = 0;
}
result->dirlen +=
-
filename - start
;
+
(int)(filename - start)
;
}
else
{
result->file = start;
result->filelen =
}
else
{
result->file = start;
result->filelen =
-
filename - start
;
+
(int)(filename - start)
;
}
}
}
}
}
}
@@
-504,7
+505,7
@@
static char *win32_joiner(DSO *dso, const struct file_st *file_split)
+ file_split->predirlen
- (start - file_split->predir);
strncpy(&result[offset], start,
+ file_split->predirlen
- (start - file_split->predir);
strncpy(&result[offset], start,
- end - start); offset +=
end - start
;
+ end - start); offset +=
(int)(end - start)
;
result[offset] = '\\'; offset++;
start = end + 1;
}
result[offset] = '\\'; offset++;
start = end + 1;
}
@@
-525,7
+526,7
@@
static char *win32_joiner(DSO *dso, const struct file_st *file_split)
+ file_split->dirlen
- (start - file_split->dir);
strncpy(&result[offset], start,
+ file_split->dirlen
- (start - file_split->dir);
strncpy(&result[offset], start,
- end - start); offset +=
end - start
;
+ end - start); offset +=
(int)(end - start)
;
result[offset] = '\\'; offset++;
start = end + 1;
}
result[offset] = '\\'; offset++;
start = end + 1;
}
@@
-621,6
+622,8
@@
static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2
merged = win32_joiner(dso, filespec1_split);
}
merged = win32_joiner(dso, filespec1_split);
}
+ OPENSSL_free(filespec1_split);
+ OPENSSL_free(filespec2_split);
return(merged);
}
return(merged);
}