By using full function calling conversion (*func) we avoid problem

when close(fd) is overridden using a macro.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18076 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-12 17:32:10 +00:00
parent ce1b1b08af
commit 44c73244c3

View File

@@ -423,7 +423,7 @@ krb5_cc_initialize(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal primary_principal) krb5_principal primary_principal)
{ {
return id->ops->init(context, id, primary_principal); return (*id->ops->init)(context, id, primary_principal);
} }
@@ -438,7 +438,7 @@ krb5_cc_destroy(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
ret = id->ops->destroy(context, id); ret = (*id->ops->destroy)(context, id);
krb5_cc_close (context, id); krb5_cc_close (context, id);
return ret; return ret;
} }
@@ -453,7 +453,7 @@ krb5_cc_close(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
krb5_error_code ret; krb5_error_code ret;
ret = id->ops->close(context, id); ret = (*id->ops->close)(context, id);
free(id); free(id);
return ret; return ret;
} }
@@ -468,7 +468,7 @@ krb5_cc_store_cred(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_creds *creds) krb5_creds *creds)
{ {
return id->ops->store(context, id, creds); return (*id->ops->store)(context, id, creds);
} }
/* /*
@@ -488,8 +488,8 @@ krb5_cc_retrieve_cred(krb5_context context,
krb5_cc_cursor cursor; krb5_cc_cursor cursor;
if (id->ops->retrieve != NULL) { if (id->ops->retrieve != NULL) {
return id->ops->retrieve(context, id, whichfields, return (*id->ops->retrieve*)(context, id, whichfields,
mcreds, creds); mcreds, creds);
} }
krb5_cc_start_seq_get(context, id, &cursor); krb5_cc_start_seq_get(context, id, &cursor);
@@ -514,7 +514,7 @@ krb5_cc_get_principal(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal *principal) krb5_principal *principal)
{ {
return id->ops->get_princ(context, id, principal); return (*id->ops->get_princ)(context, id, principal);
} }
/* /*
@@ -528,7 +528,7 @@ krb5_cc_start_seq_get (krb5_context context,
const krb5_ccache id, const krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return id->ops->get_first(context, id, cursor); return (*id->ops->get_first)(context, id, cursor);
} }
/* /*
@@ -543,7 +543,7 @@ krb5_cc_next_cred (krb5_context context,
krb5_cc_cursor *cursor, krb5_cc_cursor *cursor,
krb5_creds *creds) krb5_creds *creds)
{ {
return id->ops->get_next(context, id, cursor, creds); return (*id->ops->get_next)(context, id, cursor, creds);
} }
/* like krb5_cc_next_cred, but allow for selective retrieval */ /* like krb5_cc_next_cred, but allow for selective retrieval */
@@ -576,7 +576,7 @@ krb5_cc_end_seq_get (krb5_context context,
const krb5_ccache id, const krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return id->ops->end_get(context, id, cursor); return (*id->ops->end_get)(context, id, cursor);
} }
/* /*
@@ -607,7 +607,7 @@ krb5_cc_set_flags(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_flags flags) krb5_flags flags)
{ {
return id->ops->set_flags(context, id, flags); return (*id->ops->set_flags)(context, id, flags);
} }
/* /*
@@ -672,7 +672,7 @@ krb5_cc_get_version(krb5_context context,
const krb5_ccache id) const krb5_ccache id)
{ {
if(id->ops->get_version) if(id->ops->get_version)
return id->ops->get_version(context, id); return (*id->ops->get_version)(context, id);
else else
return 0; return 0;
} }