From 42afd745d418e7b0165eb982ae630ebe3ac8f7f8 Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Fri, 21 Jul 1995 02:39:36 +0000 Subject: [PATCH] * rc_dfl.c (rc_store): rename from store() to avoid conflict with dbm function of same name (and different prototype.) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6319 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/rcache/ChangeLog | 5 +++++ src/lib/krb5/rcache/rc_dfl.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index e9aae54e4..bc40a0c5f 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 20 22:34:47 1995 Mark Eichin + + * rc_dfl.c (rc_store): rename from store() to avoid conflict with + dbm function of same name (and different prototype.) + Wed July 5 15:52:31 1995 James Mattly * rc_io.c added HAVE_MACSOCK_H, change open to THREEPARAMOPEN diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index 32999245b..99eb9d30c 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -37,7 +37,7 @@ struct dfl_data data stored in this cache type, namely "dfl" struct authlist multilinked list of reps -static int store(context, krb5_rcache id,krb5_donot_replay *rep) +static int rc_store(context, krb5_rcache id,krb5_donot_replay *rep) store rep in cache id; return CMP_REPLAY if replay, else CMP_MALLOC/CMP_HOHUM */ @@ -124,7 +124,7 @@ struct authlist /* of course, list is backwards from file */ /* hash could be forwards since we have to search on match, but naaaah */ -static int store(context, id, rep) +static int rc_store(context, id, rep) krb5_context context; krb5_rcache id; krb5_donot_replay *rep; @@ -424,7 +424,7 @@ krb5_rcache id; if (alive(context, rep,t->lifespan) != CMP_EXPIRED) { - if (store(context, id, rep) == CMP_MALLOC) { + if (rc_store(context, id, rep) == CMP_MALLOC) { retval = KRB5_RC_MALLOC; goto io_fail; } } @@ -489,7 +489,7 @@ krb5_donot_replay *rep; unsigned long ret; struct dfl_data *t = (struct dfl_data *)id->data; - switch(store(context, id,rep)) { + switch(rc_store(context, id,rep)) { case CMP_MALLOC: return KRB5_RC_MALLOC; case CMP_REPLAY: -- 2.26.2