Update to use Odr_int

[yazpp-moved-to-github.git] / src / yaz-z-server-sr.cpp

diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp
index 401b8e3..f77e749 100644 (file)
--- a/src/yaz-z-server-sr.cpp
+++ b/src/yaz-z-server-sr.cpp
@@ -1,13 +1,10 @@
-/*
- * Copyright (c) 2000-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2009 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-server-sr.cpp,v 1.11 2005-06-25 15:53:19 adam Exp $
- *
  */
 
 #include <yaz/log.h>
-#include <yaz++/z-server.h>
+#include <yazpp/z-server.h>
 
 using namespace yazpp_1;
 
@@ -15,8 +12,8 @@ Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
                                                  const char *resultSetName,
                                                  int start, int xnum,
                                                  Z_RecordComposition *comp,
-                                                 int *next, int *pres,
-                                                 int *format)
+                                                 Odr_int *next, Odr_int *pres,
+                                                 Odr_oid *format)
 {
     int recno, total_length = 0, toget = xnum, dumped_records = 0;
     Z_Records *records =
@@ -117,7 +114,7 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
     Z_RecordComposition comp, *compp = 0;
     int hits = *res->resultCount;
     
-    int *nulint = (int *)odr_malloc (odr_encode(), sizeof(*nulint));
+    Odr_int *nulint = (Odr_int *)odr_malloc (odr_encode(), sizeof(*nulint));
     *nulint = 0;
     
     comp.which = Z_RecordComp_simple;
@@ -139,7 +136,8 @@ void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
     
     if (toget && !res->records)
     {
-        res->presentStatus = (int *) odr_malloc (odr_encode(), sizeof(int));
+        res->presentStatus = (Odr_int *)
+            odr_malloc (odr_encode(), sizeof(Odr_int));
         *res->presentStatus = Z_PRES_SUCCESS;
         res->records =
             pack_records(s, req->resultSetName, 1, toget, compp, 
@@ -241,6 +239,7 @@ int Yaz_Facility_Retrieval::recv(Z_Server *s, Z_APDU *apdu_request)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab