X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=43e22f92d71cc2e890703c23525a35d063754706;hb=bed85d2160500f57db63f4ab9d5533e0225cce15;hp=f4a6edb46e2a86925fd5ad85104208616a30d5c1;hpb=d588f1d530f53c4d38a4a5f954545b06b2751968;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index f4a6edb..43e22f9 100644
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 2000-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-server.cpp,v 1.27 2007-05-08 12:04:50 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
 #include <yazpp/z-server.h>
 #include <yaz/oid_db.h>
@@ -130,7 +131,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 +155,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 +195,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