Bump copyright year

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

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 5ad11c6..7f135a2 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 2000-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2010 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-server.cpp,v 1.26 2007-04-16 21:54:23 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -113,10 +111,10 @@ void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
  * database record.
  */
 void Z_ServerUtility::create_databaseRecord (
-    ODR odr, Z_NamePlusRecord *rec, const char *dbname, const int *format,
+    ODR odr, Z_NamePlusRecord *rec, const char *dbname, const Odr_oid *format,
     const void *buf, int len)
 {
-    int *oid = odr_oiddup(odr, format);
+    Odr_oid *oid = odr_oiddup(odr, format);
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
     rec->which = Z_NamePlusRecord_databaseRecord;
     rec->u.databaseRecord = z_ext_record_oid(odr, oid,
@@ -130,7 +128,7 @@ void Z_ServerUtility::create_surrogateDiagnostics(
     ODR odr, Z_NamePlusRecord *rec, const char *dbname,
     int error, char *const addinfo)
 {
-    int *err = (int *)odr_malloc (odr, sizeof(*err));
+    Odr_int *err = (Odr_int *)odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec));
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
         odr_malloc (odr, sizeof(*dr));
@@ -154,7 +152,7 @@ Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics (
 {
     Z_Records *rec = (Z_Records *)
         odr_malloc (odr, sizeof(*rec));
-    int *err = (int *)
+    Odr_int *err = (Odr_int *)
         odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)
         odr_malloc (odr, sizeof(*drec));
@@ -194,6 +192,7 @@ void Z_ServerUtility::create_diagnostics (
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab