From ada24b27e68c3a29b7c56147d8aedff0ebdba897 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 16 May 2001 07:25:59 +0000 Subject: [PATCH] Modified oid_ent_to_oid so that if proto is general, then class is ignored (only oid value is compared). --- util/oid.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/util/oid.c b/util/oid.c index e5567a5..a37d65a 100644 --- a/util/oid.c +++ b/util/oid.c @@ -1,9 +1,13 @@ /* - * Copyright (c) 1995-2000, Index Data + * Copyright (c) 1995-2001, Index Data * See the file LICENSE for details. * * $Log: oid.c,v $ - * Revision 1.44 2000-10-02 13:58:50 adam + * Revision 1.45 2001-05-16 07:25:59 adam + * Modified oid_ent_to_oid so that if proto is general, then class + * is ignored (only oid value is compared). + * + * Revision 1.44 2000/10/02 13:58:50 adam * Added some OID's. * * Revision 1.43 2000/03/14 09:21:08 ian @@ -639,9 +643,9 @@ int *oid_ent_to_oid(struct oident *ent, int *ret) for (ol = oident_table; ol; ol = ol->next) { struct oident *p = &ol->oident; - if ((ent->proto == p->proto || p->proto == PROTO_GENERAL) && - (ent->oclass == p->oclass || p->oclass == CLASS_GENERAL) && - ent->value == p->value) + if (ent->value == p->value && + (p->proto == PROTO_GENERAL || (ent->proto == p->proto && + (ent->oclass == p->oclass || ent->oclass == CLASS_GENERAL)))) { if (p->proto == PROTO_Z3950) oid_oidcpy(ret, z3950_prefix); -- 1.7.10.4