Version 2.0.58

[idzebra-moved-to-github.git] / util / attrfind.c

diff --git a/util/attrfind.c b/util/attrfind.c
index b7f26ab..55a8a76 100644 (file)
--- a/util/attrfind.c
+++ b/util/attrfind.c
@@ -1,25 +1,25 @@
-/* $Id: attrfind.c,v 1.2 2007-01-15 15:10:26 adam Exp $
-   Copyright (C) 2005-2007
-   Index Data ApS
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
-   This file is part of the Zebra server.
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-   Zebra is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2, or (at your option) any later
-   version.
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-   Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-   You should have received a copy of the GNU General Public License
-   along with Zebra; see the file LICENSE.zebra.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 
 #include <attrfind.h>
@@ -42,7 +42,7 @@ void attr_init_AttrList(AttrType *src, Z_AttributeList *list, int type)
     src->minor = 0;
 }
 
-int attr_find_ex(AttrType *src, oid_value *attributeSetP, 
+int attr_find_ex(AttrType *src, const Odr_oid **attribute_set_oid,
                 const char **string_value)
 {
     int num_attributes;
@@ -55,43 +55,33 @@ int attr_find_ex(AttrType *src, oid_value *attributeSetP,
         element = src->attributeList[src->major];
         if (src->type == *element->attributeType)
         {
-            switch (element->which) 
+            switch (element->which)
             {
             case Z_AttributeValue_numeric:
                 ++(src->major);
-                if (element->attributeSet && attributeSetP)
-                {
-                    oident *attrset;
-
-                    attrset = oid_getentbyoid(element->attributeSet);
-                    *attributeSetP = attrset->value;
-                }
+                if (element->attributeSet && attribute_set_oid)
+                    *attribute_set_oid = element->attributeSet;
                 return *element->value.numeric;
                 break;
             case Z_AttributeValue_complex:
                 if (src->minor >= element->value.complex->num_list)
                     break;
-                if (element->attributeSet && attributeSetP)
-                {
-                    oident *attrset;
-                    
-                    attrset = oid_getentbyoid(element->attributeSet);
-                    *attributeSetP = attrset->value;
-                }
-                if (element->value.complex->list[src->minor]->which ==  
+                if (element->attributeSet && attribute_set_oid)
+                    *attribute_set_oid = element->attributeSet;
+                if (element->value.complex->list[src->minor]->which ==
                     Z_StringOrNumeric_numeric)
                 {
                     ++(src->minor);
                     return
                         *element->value.complex->list[src->minor-1]->u.numeric;
                 }
-                else if (element->value.complex->list[src->minor]->which ==  
+                else if (element->value.complex->list[src->minor]->which ==
                          Z_StringOrNumeric_string)
                 {
                     if (!string_value)
                         break;
                     ++(src->minor);
-                    *string_value = 
+                    *string_value =
                         element->value.complex->list[src->minor-1]->u.string;
                     return -2;
                 }
@@ -106,15 +96,16 @@ int attr_find_ex(AttrType *src, oid_value *attributeSetP,
     return -1;
 }
 
-int attr_find(AttrType *src, oid_value *attributeSetP)
+int attr_find(AttrType *src, const Odr_oid **attribute_set_id)
 {
-    return attr_find_ex(src, attributeSetP, 0);
+    return attr_find_ex(src, attribute_set_id, 0);
 }
 
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab