From 543b94637feaec72a89234dda41c1bb8a7d80a44 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 29 Jan 2022 00:01:12 -0500
Subject: [PATCH] more dealloc functions require HEIM_CALLCONV

Change-Id: I68168a387c088b45e2572d5c982d33dfe0aa38a8
---
 kdc/gss_preauth.c        | 4 ++--
 lib/base/array.c         | 2 +-
 lib/base/data.c          | 2 +-
 lib/base/db.c            | 4 ++--
 lib/base/dict.c          | 2 +-
 lib/base/error.c         | 2 +-
 lib/base/number.c        | 2 +-
 lib/base/plugin.c        | 2 +-
 lib/base/string.c        | 2 +-
 lib/krb5/init_creds_pw.c | 2 +-
 lib/krb5/pac.c           | 2 +-
 lib/krb5/send_to_kdc.c   | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kdc/gss_preauth.c b/kdc/gss_preauth.c
index db6cb3efc..d8a2a24fd 100644
--- a/kdc/gss_preauth.c
+++ b/kdc/gss_preauth.c
@@ -65,7 +65,7 @@ pa_gss_display_name(gss_name_t name,
                     gss_buffer_t namebuf,
                     gss_const_buffer_t *namebuf_p);
 
-static void
+static void HEIM_CALLCONV
 pa_gss_dealloc_client_params(void *ptr);
 
 /*
@@ -858,7 +858,7 @@ _kdc_gss_mk_composite_name_ad(astgs_request_t r,
     return ret;
 }
 
-static void
+static void HEIM_CALLCONV
 pa_gss_dealloc_client_params(void *ptr)
 {
     gss_client_params *gcp = ptr;
diff --git a/lib/base/array.c b/lib/base/array.c
index 1d18a7cc6..994fa7d38 100644
--- a/lib/base/array.c
+++ b/lib/base/array.c
@@ -46,7 +46,7 @@ struct heim_array_data {
     heim_object_t *allocated;
 };
 
-static void
+static void HEIM_CALLCONV
 array_dealloc(heim_object_t ptr)
 {
     heim_array_t array = ptr;
diff --git a/lib/base/data.c b/lib/base/data.c
index eb4c80ae8..cefdde0c1 100644
--- a/lib/base/data.c
+++ b/lib/base/data.c
@@ -34,7 +34,7 @@
 #include "baselocl.h"
 #include <string.h>
 
-static void
+static void HEIM_CALLCONV
 data_dealloc(void *ptr)
 {
     heim_data_t d = ptr;
diff --git a/lib/base/db.c b/lib/base/db.c
index 337552686..b206ff6d7 100644
--- a/lib/base/db.c
+++ b/lib/base/db.c
@@ -84,7 +84,7 @@ static int open_file(const char *, int , int, int *, heim_error_t *);
 static int read_json(const char *, heim_object_t *, heim_error_t *);
 static struct heim_db_type json_dbt;
 
-static void db_dealloc(void *ptr);
+static void HEIM_CALLCONV db_dealloc(void *ptr);
 
 struct heim_type_data db_object = {
     HEIM_TID_DB,
@@ -242,7 +242,7 @@ heim_db_register(const char *dbtype,
     return ret;
 }
 
-static void
+static void HEIM_CALLCONV
 db_dealloc(void *arg)
 {
     heim_db_t db = arg;
diff --git a/lib/base/dict.c b/lib/base/dict.c
index 063f4f05b..86be109ff 100644
--- a/lib/base/dict.c
+++ b/lib/base/dict.c
@@ -47,7 +47,7 @@ struct heim_dict_data {
     struct hashentry **tab;
 };
 
-static void
+static void HEIM_CALLCONV
 dict_dealloc(void *ptr)
 {
     heim_dict_t dict = ptr;
diff --git a/lib/base/error.c b/lib/base/error.c
index 9b4136b68..6ba3bea41 100644
--- a/lib/base/error.c
+++ b/lib/base/error.c
@@ -41,7 +41,7 @@ struct heim_error {
     struct heim_error *next;
 };
 
-static void
+static void HEIM_CALLCONV
 error_dealloc(void *ptr)
 {
     struct heim_error *p = ptr;
diff --git a/lib/base/number.c b/lib/base/number.c
index 5666d25ee..8833c8b15 100644
--- a/lib/base/number.c
+++ b/lib/base/number.c
@@ -35,7 +35,7 @@
 
 #include "baselocl.h"
 
-static void
+static void HEIM_CALLCONV
 number_dealloc(void *ptr)
 {
 }
diff --git a/lib/base/plugin.c b/lib/base/plugin.c
index 50352a749..631a3386c 100644
--- a/lib/base/plugin.c
+++ b/lib/base/plugin.c
@@ -156,7 +156,7 @@ struct heim_plugin {
     void *ctx;
 };
 
-static void
+static void HEIM_CALLCONV
 plugin_free(void *ptr)
 {
     struct heim_plugin *pl = ptr;
diff --git a/lib/base/string.c b/lib/base/string.c
index 21cc91b0f..f94244716 100644
--- a/lib/base/string.c
+++ b/lib/base/string.c
@@ -36,7 +36,7 @@
 #include "baselocl.h"
 #include <string.h>
 
-static void
+static void HEIM_CALLCONV
 string_dealloc(void *ptr)
 {
     heim_string_t s = ptr;
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index 3a9b82f69..a91abc927 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -2151,7 +2151,7 @@ pa_announce(krb5_context context,
 }
 
 
-static void
+static void HEIM_CALLCONV
 mech_dealloc(void *ctx)
 {
     struct pa_auth_mech *pa_mech = ctx;
diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c
index c73b65196..7df2ba5ee 100644
--- a/lib/krb5/pac.c
+++ b/lib/krb5/pac.c
@@ -101,7 +101,7 @@ struct krb5_pac_data {
 
 static const char zeros[PAC_ALIGNMENT];
 
-static void
+static void HEIM_CALLCONV
 pac_dealloc(void *ctx)
 {
     krb5_pac pac = (krb5_pac)ctx;
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index e52e6f249..086f2edcd 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -386,7 +386,7 @@ debug_host(krb5_context context, int level, struct host *host, const char *fmt,
 }
 
 
-static void
+static void HEIM_CALLCONV
 deallocate_host(void *ptr)
 {
     struct host *host = ptr;