X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fotherinfo.c;h=aac8c9e62cd4091e101642836e26de8282605add;hp=7aac192497f847849a3a7fdbb7c2f13074315c20;hb=4efb9de61a4284830d3dde10a992a42067879c84;hpb=7a4064cd15f6c6b34c1180e1bc51f0d0e90da320

diff --git a/src/otherinfo.c b/src/otherinfo.c
index 7aac192..aac8c9e 100644
--- a/src/otherinfo.c
+++ b/src/otherinfo.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: otherinfo.c,v 1.7 2007-04-12 13:52:57 adam Exp $
  */
 /**
  * \file otherinfo.c
@@ -73,7 +71,7 @@ void yaz_oi_APDU(Z_APDU *apdu, Z_OtherInformation ***oip)
 
 Z_OtherInformationUnit *yaz_oi_update (
     Z_OtherInformation **otherInformationP, ODR odr,
-    const int *oid, int categoryValue, int delete_flag)
+    const Odr_oid *oid, int categoryValue, int delete_flag)
 {
     int i;
     Z_OtherInformation *otherInformation;
@@ -138,12 +136,10 @@ Z_OtherInformationUnit *yaz_oi_update (
         {
             otherInformation->list[i]->category = (Z_InfoCategory*)
                 odr_malloc (odr, sizeof(Z_InfoCategory));
-            otherInformation->list[i]->category->categoryTypeId = (int*)
+            otherInformation->list[i]->category->categoryTypeId = (Odr_oid*)
                 odr_oiddup (odr, oid);
-            otherInformation->list[i]->category->categoryValue = (int*)
-                odr_malloc (odr, sizeof(int));
-            *otherInformation->list[i]->category->categoryValue =
-                categoryValue;
+            otherInformation->list[i]->category->categoryValue = 
+                odr_intdup(odr, categoryValue);
         }
         else
             otherInformation->list[i]->category = 0;
@@ -157,7 +153,7 @@ Z_OtherInformationUnit *yaz_oi_update (
 
 void yaz_oi_set_string_oid (
     Z_OtherInformation **otherInformation, ODR odr,
-    const int *oid, int categoryValue,
+    const Odr_oid *oid, int categoryValue,
     const char *str)
 {
     Z_OtherInformationUnit *oi =
@@ -170,7 +166,7 @@ void yaz_oi_set_string_oid (
 
 char *yaz_oi_get_string_oid (
     Z_OtherInformation **otherInformation,
-    const int *oid, int categoryValue, int delete_flag)
+    const Odr_oid *oid, int categoryValue, int delete_flag)
 {
     Z_OtherInformationUnit *oi;
     
@@ -184,6 +180,7 @@ char *yaz_oi_get_string_oid (
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab