generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure Compaq C doesn'r complain about dollars, and go around the

Browse Source 
incompatibility between function and data pointers.
This commit is contained in:
Richard Levitte 2000-09-17 14:42:46 +00:00
parent 282f92f7dd
commit 3aa477f6ec
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crypto/dso/dso_vms.c
View File

@ -60,6 +60,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef VMS #ifdef VMS
#pragma message disable DOLLARID
#include <lib$routines.h> #include <lib$routines.h>
#include <libfisdef.h> #include <libfisdef.h>
#include <stsdef.h> #include <stsdef.h>
@ -255,13 +256,13 @@ static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
0, flags); 0, flags);
} }
static void *vms_bind_sym(DSO *dso, const char *symname) void vms_bind_sym(DSO *dso, const char *symname, void **sym)
{ {
DSO_VMS_INTERNAL *ptr; DSO_VMS_INTERNAL *ptr;
void *sym = 0;
int status; int status;
int flags = LIB$M_FIS_MIXEDCASE; int flags = LIB$M_FIS_MIXEDCASE;
struct dsc$descriptor_s symname_dsc; struct dsc$descriptor_s symname_dsc;
*sym = NULL;
symname_dsc.dsc$w_length = strlen(symname); symname_dsc.dsc$w_length = strlen(symname);
symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T; symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
@ -271,24 +272,24 @@ static void *vms_bind_sym(DSO *dso, const char *symname)
if((dso == NULL) || (symname == NULL)) if((dso == NULL) || (symname == NULL))
{ {
DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
return(NULL); return;
} }
if(sk_num(dso->meth_data) < 1) if(sk_num(dso->meth_data) < 1)
{ {
DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR); DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR);
return(NULL); return;
} }
ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data, ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data,
sk_num(dso->meth_data) - 1); sk_num(dso->meth_data) - 1);
if(ptr == NULL) if(ptr == NULL)
{ {
DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE); DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE);
return(NULL); return;
} }
if(dso->flags & DSO_FLAG_UPCASE_SYMBOL) flags = 0; if(dso->flags & DSO_FLAG_UPCASE_SYMBOL) flags = 0;
status = do_find_symbol(ptr, &symname_dsc, &sym, flags); status = do_find_symbol(ptr, &symname_dsc, sym, flags);
if(!$VMS_STATUS_SUCCESS(status)) if(!$VMS_STATUS_SUCCESS(status))
{ {
@ -301,6 +302,8 @@ static void *vms_bind_sym(DSO *dso, const char *symname)
errstring_dsc.dsc$b_class = DSC$K_CLASS_S; errstring_dsc.dsc$b_class = DSC$K_CLASS_S;
errstring_dsc.dsc$a_pointer = errstring; errstring_dsc.dsc$a_pointer = errstring;
*sym = NULL;
status = sys$getmsg(status, &length, &errstring_dsc, 1, 0); status = sys$getmsg(status, &length, &errstring_dsc, 1, 0);
if (!$VMS_STATUS_SUCCESS(status)) if (!$VMS_STATUS_SUCCESS(status))
@ -322,19 +325,23 @@ static void *vms_bind_sym(DSO *dso, const char *symname)
" in ", ptr->filename, " in ", ptr->filename,
": ", errstring); ": ", errstring);
} }
return(NULL); return;
} }
return(sym); return;
} }
static void *vms_bind_var(DSO *dso, const char *symname) static void *vms_bind_var(DSO *dso, const char *symname)
{ {
return vms_bind_sym(dso, symname); void *sym = 0;
vms_bind_sym(dso, symname, &sym);
return sym;
} }
static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname) static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
{ {
return (DSO_FUNC_TYPE)vms_bind_sym(dso, symname); DSO_FUNC_TYPE sym = 0;
vms_bind_sym(dso, symname, &sym);
return sym;
} }
static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg) static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg)