}
/* Free a memory ccache */
}
/* Free a memory ccache */
-static int free_mccache(void *ptr) {
- struct ccache_container *ccc = ptr;
+static int free_mccache(struct ccache_container *ccc)
+{
krb5_cc_destroy(ccc->smb_krb5_context->krb5_context, ccc->ccache);
return 0;
}
/* Free a disk-based ccache */
krb5_cc_destroy(ccc->smb_krb5_context->krb5_context, ccc->ccache);
return 0;
}
/* Free a disk-based ccache */
-static int free_dccache(void *ptr) {
- struct ccache_container *ccc = ptr;
+static int free_dccache(struct ccache_container *ccc) {
krb5_cc_close(ccc->smb_krb5_context->krb5_context, ccc->ccache);
return 0;
krb5_cc_close(ccc->smb_krb5_context->krb5_context, ccc->ccache);
return 0;
-static int free_gssapi_creds(void *ptr) {
+static int free_gssapi_creds(struct gssapi_creds_container *gcc)
+{
OM_uint32 min_stat, maj_stat;
OM_uint32 min_stat, maj_stat;
- struct gssapi_creds_container *gcc = ptr;
- maj_stat = gss_release_cred(&min_stat,
- &gcc->creds);
+ maj_stat = gss_release_cred(&min_stat, &gcc->creds);
-static int gensec_gssapi_destory(void *ptr)
+static int gensec_gssapi_destory(struct gensec_gssapi_state *gensec_gssapi_state)
- struct gensec_gssapi_state *gensec_gssapi_state = ptr;
OM_uint32 maj_stat, min_stat;
if (gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
OM_uint32 maj_stat, min_stat;
if (gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
-static int gensec_krb5_destroy(void *ptr)
+static int gensec_krb5_destroy(struct gensec_krb5_state *gensec_krb5_state)
- struct gensec_krb5_state *gensec_krb5_state = ptr;
-
if (!gensec_krb5_state->smb_krb5_context) {
/* We can't clean anything else up unless we started up this far */
return 0;
if (!gensec_krb5_state->smb_krb5_context) {
/* We can't clean anything else up unless we started up this far */
return 0;
krb5_principal principal;
};
krb5_principal principal;
};
-static int free_principal(void *ptr) {
- struct principal_container *pc = ptr;
+static int free_principal(struct principal_container *pc)
+{
/* current heimdal - 0.6.3, which we need anyway, fixes segfaults here */
krb5_free_principal(pc->smb_krb5_context->krb5_context, pc->principal);
/* current heimdal - 0.6.3, which we need anyway, fixes segfaults here */
krb5_free_principal(pc->smb_krb5_context->krb5_context, pc->principal);
-static int free_keytab(void *ptr) {
- struct keytab_container *ktc = ptr;
+static int free_keytab(struct keytab_container *ktc)
+{
krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
return 0;
krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
return 0;
krb5_enctype *enctypes;
};
krb5_enctype *enctypes;
};
-static int free_enctypes(void *ptr) {
- struct enctypes_container *etc = ptr;
+static int free_enctypes(struct enctypes_container *etc)
+{
free_kerberos_etypes(etc->smb_krb5_context->krb5_context, etc->enctypes);
return 0;
}
free_kerberos_etypes(etc->smb_krb5_context->krb5_context, etc->enctypes);
return 0;
}
-static int smb_krb5_context_destroy_1(void *ptr)
+static int smb_krb5_context_destroy_1(struct smb_krb5_context *ctx)
- struct smb_krb5_context *ctx = ptr;
krb5_free_context(ctx->krb5_context);
return 0;
}
krb5_free_context(ctx->krb5_context);
return 0;
}
-static int smb_krb5_context_destroy_2(void *ptr)
+static int smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
- struct smb_krb5_context *ctx = ptr;
-
/* Otherwise krb5_free_context will try and close what we have already free()ed */
krb5_set_warn_dest(ctx->krb5_context, NULL);
krb5_closelog(ctx->krb5_context, ctx->logf);
/* Otherwise krb5_free_context will try and close what we have already free()ed */
krb5_set_warn_dest(ctx->krb5_context, NULL);
krb5_closelog(ctx->krb5_context, ctx->logf);
- smb_krb5_context_destroy_1(ptr);
+ smb_krb5_context_destroy_1(ctx);
*/
static struct event_context *gtk_event_context_global;
*/
static struct event_context *gtk_event_context_global;
-static int gtk_event_context_destructor(void *ptr)
+static int gtk_event_context_destructor(struct event_context *ev)
{
gtk_event_context_global = NULL;
return 0;
{
gtk_event_context_global = NULL;
return 0;
/*
destroy an fd_event
*/
/*
destroy an fd_event
*/
-static int gtk_event_fd_destructor(void *ptr)
+static int gtk_event_fd_destructor(struct fd_event *fde)
- struct fd_event *fde = talloc_get_type(ptr, struct fd_event);
struct gtk_fd_event *gtk_fd = talloc_get_type(fde->additional_data,
struct gtk_fd_event);
struct gtk_fd_event *gtk_fd = talloc_get_type(fde->additional_data,
struct gtk_fd_event);
/*
destroy a timed event
*/
/*
destroy a timed event
*/
-static int gtk_event_timed_destructor(void *ptr)
+static int gtk_event_timed_destructor(struct timed_event *te)
- struct timed_event *te = talloc_get_type(ptr, struct timed_event);
struct gtk_timed_event *gtk_te = talloc_get_type(te->additional_data,
struct gtk_timed_event);
struct gtk_timed_event *gtk_te = talloc_get_type(te->additional_data,
struct gtk_timed_event);
-static int gtk_event_timed_deny_destructor(void *ptr)
+static int gtk_event_timed_deny_destructor(struct timed_event *te)
-static int hdb_ldb_destrutor(void *ptr)
+static int hdb_ldb_destrutor(struct hdb_ldb_private *private)
- struct hdb_ldb_private *private = ptr;
hdb_entry_ex *entry_ex = private->entry_ex;
free_hdb_entry(&entry_ex->entry);
return 0;
hdb_entry_ex *entry_ex = private->entry_ex;
free_hdb_entry(&entry_ex->entry);
return 0;
/* destroy the last connection to a tdb */
/* destroy the last connection to a tdb */
-static int tdb_wrap_destructor(void *ctx)
+static int tdb_wrap_destructor(struct tdb_wrap *w)
- struct tdb_wrap *w = ctx;
tdb_close(w->tdb);
DLIST_REMOVE(tdb_list, w);
return 0;
tdb_close(w->tdb);
DLIST_REMOVE(tdb_list, w);
return 0;