From 8170d48cb0b650f3d8ec35e3ad1e5fe0046eeecc Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 18 Aug 2006 06:30:05 +0000 Subject: [PATCH] Move yaz_srw_get_core_v_1_1 to other source. Define it always regardless of Libxml2 being available or not. --- src/srw.c | 12 +----------- src/srwutil.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/srw.c b/src/srw.c index 138f8a6..0618cbd 100644 --- a/src/srw.c +++ b/src/srw.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: srw.c,v 1.47 2006-08-16 22:47:10 adam Exp $ + * $Id: srw.c,v 1.48 2006-08-18 06:30:05 adam Exp $ */ /** * \file srw.c @@ -522,16 +522,6 @@ static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms, return 0; } -Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o) -{ - Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p)); - p->srw_version = odr_strdup(o, "1.1"); - p->username = 0; - p->password = 0; - p->extra_args = 0; - return p; -} - int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, void *client_data, const char *ns) { diff --git a/src/srwutil.c b/src/srwutil.c index 624efaa..7be74bf 100644 --- a/src/srwutil.c +++ b/src/srwutil.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: srwutil.c,v 1.46 2006-08-16 22:47:10 adam Exp $ + * $Id: srwutil.c,v 1.47 2006-08-18 06:30:05 adam Exp $ */ /** * \file srwutil.c @@ -753,6 +753,16 @@ Z_SRW_extra_record *yaz_srw_get_extra_record(ODR o) return res; } +Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o) +{ + Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p)); + p->srw_version = odr_strdup(o, "1.1"); + p->username = 0; + p->password = 0; + p->extra_args = 0; + return p; +} + Z_SRW_PDU *yaz_srw_get(ODR o, int which) { Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(o); -- 1.7.10.4