X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fprt-ext.c;h=f17099482cfb6a65a3930511c1b5bcb868057e31;hp=fc760f751207ecb22c2f1e970a2bc791caf2e04d;hb=fcdccb3e9a757d41e1bdf6c18c2b3bdb2314ca3f;hpb=558573d39acf41097935abebe06ba731d208e291 diff --git a/src/prt-ext.c b/src/prt-ext.c index fc760f7..f170994 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -1,12 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ - /** * \file prt-ext.c * \brief Implements handling of various Z39.50 Externals */ +#if HAVE_CONFIG_H +#include +#endif #include @@ -144,7 +146,7 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userInfo1, (Odr_fun)z_OtherInformation, 0}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userFacets, - (Odr_fun)z_FacetList, 0}, + (Odr_fun)z_FacetList, "FacetList" }, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_charSetandLanguageNegotiation, (Odr_fun)z_CharSetandLanguageNegotiation, 0}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_acfPrompt1, @@ -259,18 +261,12 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - thisext->direct_reference = odr_oiddup(o, oid); if (len < 0) /* Structured data */ @@ -341,18 +337,12 @@ Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; - char oid_str_buf[OID_STR_MAX]; - const char *oid_str; - oid_class oclass; if (!oid) return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); - thisext->direct_reference = odr_oiddup(o, oid); thisext->which = Z_External_single;