X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=7f135a25f93fb7102d7441d71a88cf4eae46ebb1;hp=f4a6edb46e2a86925fd5ad85104208616a30d5c1;hb=d53e0ff85ad63de947da013a0d25a434d12eed40;hpb=d588f1d530f53c4d38a4a5f954545b06b2751968 diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index f4a6edb..7f135a2 100644 --- 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.27 2007-05-08 12:04:50 adam Exp $ */ #include @@ -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