From a6fdb006dd7e6a2bda36af3809c60ed2b2662f2c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 30 Sep 1997 11:48:12 +0000 Subject: [PATCH 1/1] Fixed bug introduced by previous commit. --- server/seshigh.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/server/seshigh.c b/server/seshigh.c index 31ef866..57389f2 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.68 1997-09-29 13:18:59 adam + * Revision 1.69 1997-09-30 11:48:12 adam + * Fixed bug introduced by previous commit. + * + * Revision 1.68 1997/09/29 13:18:59 adam * Added function, oid_ent_to_oid, to replace the function * oid_getoidbyent, which is not thread safe. * @@ -790,7 +793,8 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) #else rec->u.nonSurrogateDiagnostic = dr; #endif - dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); dr->condition = err; dr->which = Z_DiagForm_v2AddInfo; dr->addinfo = addinfo ? addinfo : ""; @@ -821,7 +825,8 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, rec->u.surrogateDiagnostic = drec; drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; - dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); dr->condition = err; dr->which = Z_DiagForm_v2AddInfo; dr->addinfo = addinfo ? addinfo : ""; @@ -853,7 +858,8 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = rec; - rec->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + rec->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); rec->condition = err; rec->which = Z_DiagForm_v2AddInfo; rec->addinfo = addinfo ? addinfo : ""; @@ -968,7 +974,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, recform.oclass = CLASS_RECSYN; recform.value = fres->format; thisext->direct_reference = odr_oiddup(a->encode, - oid_ent_to_oid(&recform, oid)); + oid_ent_to_oid(&recform, oid)); thisext->indirect_reference = 0; thisext->descriptor = 0; if (fres->len < 0) /* Structured data */ -- 1.7.10.4