For OIDs use Odr_oid type everywhere, i.e. do not assume Odr_oid=int.

[yaz-moved-to-github.git] / src / retrieval.c

diff --git a/src/retrieval.c b/src/retrieval.c
index 4ee7ad1..982afc9 100644 (file)
--- a/src/retrieval.c
+++ b/src/retrieval.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: retrieval.c,v 1.19 2007-04-12 20:47:28 adam Exp $
+ * $Id: retrieval.c,v 1.21 2007-05-08 08:22:36 adam Exp $
  */
 /**
  * \file retrieval.c
@@ -55,12 +55,12 @@ struct yaz_retrieval_elem {
     /** \brief schema name , short-hand such as "dc" */
     const char *name;
     /** \brief record syntax */
-    int *syntax;
+    Odr_oid *syntax;
 
     /** \brief backend name */
     const char *backend_name;
     /** \brief backend syntax */
-    int *backend_syntax;
+    Odr_oid *backend_syntax;
 
     /** \brief record conversion */
     yaz_record_conv_t record_conv;
@@ -73,7 +73,7 @@ static void yaz_retrieval_reset(yaz_retrieval_t p);
 
 yaz_retrieval_t yaz_retrieval_create()
 {
-    yaz_retrieval_t p = xmalloc(sizeof(*p));
+    yaz_retrieval_t p = (yaz_retrieval_t) xmalloc(sizeof(*p));
     p->odr = odr_createmem(ODR_ENCODE);
     p->nmem = odr_getmem(p->odr);
     p->wr_error = wrbuf_alloc();
@@ -113,7 +113,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
 {
 
     struct _xmlAttr *attr;
-    struct yaz_retrieval_elem *el = nmem_malloc(p->nmem, sizeof(*el));
+    struct yaz_retrieval_elem *el = (struct yaz_retrieval_elem *)
+        nmem_malloc(p->nmem, sizeof(*el));
 
     el->syntax = 0;
     el->identifier = 0;
@@ -274,11 +275,11 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr)
 }
 
 int yaz_retrieval_request(yaz_retrieval_t p,
-                          const char *schema, int *syntax,
-                          const char **match_schema, int **match_syntax,
+                          const char *schema, Odr_oid *syntax,
+                          const char **match_schema, Odr_oid **match_syntax,
                           yaz_record_conv_t *rc,
                           const char **backend_schema,
-                          int **backend_syntax)
+                          Odr_oid **backend_syntax)
 {
     struct yaz_retrieval_elem *el = p->list;
     int syntax_matches = 0;