oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fix calling conventions

Browse Source 
When a function is assigned to a function pointer that is declared
with a particular calling convention, then the assigned function
must be declared with that calling convention as well.  Otherwise,
kaboom!!!

The following functions are fixed by this change:

kuser/kx509.c
  validate1()
  add1_2chain()

lib/base/log.c
  log_syslog()
  close_syslog()
  log_file()
  close_file()

lib/gssapi/mech/context.c
  gss_set_log_function()

lib/krb5/kx509.c
  certs_export_func()

Change-Id: Ib68abf739e3385e98136fa4e4f5a0240e9fce033
This commit is contained in:
Jeffrey Altman
2020-05-25 14:02:52 -04:00
committed by Nicolas Williams
parent e3dbc89f8f
commit afc9ebe08b
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kuser/kx509.c
View File

@@ -44,7 +44,7 @@ struct validate_store {
int grace; int grace;
}; };
static int static int KRB5_CALLCONV
validate1(hx509_context hx509ctx, void *d, hx509_cert cert) validate1(hx509_context hx509ctx, void *d, hx509_cert cert)
{ {
struct validate_store *v = d; struct validate_store *v = d;
@@ -111,7 +111,7 @@ validate(krb5_context context,
hx509_context_free(&hx509ctx); hx509_context_free(&hx509ctx);
} }
static krb5_error_code static krb5_error_code KRB5_CALLCONV
add1_2chain(hx509_context hx509ctx, void *d, hx509_cert cert) add1_2chain(hx509_context hx509ctx, void *d, hx509_cert cert)
{ {
heim_octet_string os; heim_octet_string os;

8
lib/base/log.c
View File

@@ -159,7 +159,7 @@ struct _heimdal_syslog_data{
int priority; int priority;
}; };
static void static void HEIM_CALLCONV
log_syslog(heim_context context, const char *timestr, log_syslog(heim_context context, const char *timestr,
const char *msg, void *data) const char *msg, void *data)
{ {
@@ -167,7 +167,7 @@ log_syslog(heim_context context, const char *timestr,
syslog(s->priority, "%s", msg); syslog(s->priority, "%s", msg);
} }
static void static void HEIM_CALLCONV
close_syslog(void *data) close_syslog(void *data)
{ {
free(data); free(data);
@@ -209,7 +209,7 @@ struct file_data {
int freefilename; int freefilename;
}; };
static void static void HEIM_CALLCONV
log_file(heim_context context, const char *timestr, const char *msg, void *data) log_file(heim_context context, const char *timestr, const char *msg, void *data)
{ {
struct timeval tv; struct timeval tv;
@@ -274,7 +274,7 @@ out:
} }
} }
static void static void HEIM_CALLCONV
close_file(void *data) close_file(void *data)
{ {
struct file_data *f = data; struct file_data *f = data;

2
lib/gssapi/mech/context.c
View File

@@ -231,7 +231,7 @@ gss_mg_set_error_string(gss_OID mech,
static void *log_ctx = NULL; static void *log_ctx = NULL;
static void (*log_func)(void *ctx, int level, const char *fmt, va_list) = NULL; static void (*log_func)(void *ctx, int level, const char *fmt, va_list) = NULL;
void void GSSAPI_LIB_CALL
gss_set_log_function(void *ctx, void (*func)(void * ctx, int level, const char *fmt, va_list)) gss_set_log_function(void *ctx, void (*func)(void * ctx, int level, const char *fmt, va_list))
{ {
if (log_func == NULL) { if (log_func == NULL) {

2
lib/krb5/kx509.c
View File

@@ -519,7 +519,7 @@ store_kx509_disabled(krb5_context context, const char *realm, krb5_ccache cc)
krb5_cc_set_config(context, cc, NULL, "kx509_service_status", &data); krb5_cc_set_config(context, cc, NULL, "kx509_service_status", &data);
} }
static int static int KRB5_CALLCONV
certs_export_func(hx509_context context, void *d, hx509_cert c) certs_export_func(hx509_context context, void *d, hx509_cert c)
{ {
heim_octet_string os; heim_octet_string os;