From 3261e100ea2fed86d45a15930af074098f072c26 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 20 Mar 2004 07:02:22 +0000 Subject: [PATCH] Use wrbuf_xmlputs_n instead of wrbuf_write_cdata to avoid clash with Zebra symbol. Towards 2.0.18. --- CHANGELOG | 7 +++++++ configure.in | 4 ++-- debian/changelog | 6 ++++++ include/yaz/wrbuf.h | 4 ++-- include/yaz/yaz-version.h | 6 +++--- src/wrbuf.c | 10 +++++----- win/yaz.nsi | 4 ++-- win/yaz.rc | 8 ++++---- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a4f91d3..5b26678 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ Possible compatibility problems with earlier versions marked with '*'. +--- 2.0.18 2004/03/20 + +Use wrbuf_xmlputs_n instead of wrbuf_write_cdata to avoid clash with +Zebra symbol. + +Ensure zlib.dll is packed with Windows install. + --- 2.0.17 2004/03/17 Fix encoding of xsd:string to use text instead of CDATA. diff --git a/configure.in b/configure.in index c703a2a..5c009cb 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2004 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.133 2004-03-17 18:47:41 adam Exp $ +dnl $Id: configure.in,v 1.134 2004-03-20 07:02:22 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 2.0.17) +AM_INIT_AUTOMAKE(yaz, 2.0.18) AM_MAINTAINER_MODE dnl AC_SUBST(READLINE_LIBS) diff --git a/debian/changelog b/debian/changelog index 7a43f9a..c770571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (2.0.18-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Sat, 20 Mar 2004 08:00:23 +0100 + yaz (2.0.17-1) unstable; urgency=low * Upstream. diff --git a/include/yaz/wrbuf.h b/include/yaz/wrbuf.h index d98674a..05937a3 100644 --- a/include/yaz/wrbuf.h +++ b/include/yaz/wrbuf.h @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: wrbuf.h,v 1.11 2004-03-15 21:39:06 adam Exp $ + * $Id: wrbuf.h,v 1.12 2004-03-20 07:02:22 adam Exp $ * */ @@ -47,7 +47,7 @@ YAZ_EXPORT void wrbuf_free(WRBUF b, int free_buf); YAZ_EXPORT void wrbuf_rewind(WRBUF b); YAZ_EXPORT int wrbuf_grow(WRBUF b, int minsize); YAZ_EXPORT int wrbuf_write(WRBUF b, const char *buf, int size); -YAZ_EXPORT int wrbuf_write_cdata(WRBUF b, const char *cp, int size); +YAZ_EXPORT int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size); YAZ_EXPORT int wrbuf_puts(WRBUF b, const char *buf); YAZ_EXPORT int wrbuf_xmlputs(WRBUF b, const char *cp); YAZ_EXPORT void wrbuf_printf(WRBUF b, const char *fmt, ...); diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index 6ef5c3e..a491faf 100644 --- a/include/yaz/yaz-version.h +++ b/include/yaz/yaz-version.h @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-version.h,v 1.42 2004-03-17 18:47:41 adam Exp $ + * $Id: yaz-version.h,v 1.43 2004-03-20 07:02:22 adam Exp $ */ /* @@ -12,8 +12,8 @@ #include -#define YAZ_VERSION "2.0.17" -#define YAZ_VERSIONL 0x020011 +#define YAZ_VERSION "2.0.18" +#define YAZ_VERSIONL 0x020012 #define YAZ_DATE 1 diff --git a/src/wrbuf.c b/src/wrbuf.c index bb87507..0b92aea 100644 --- a/src/wrbuf.c +++ b/src/wrbuf.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: wrbuf.c,v 1.3 2004-03-15 21:39:06 adam Exp $ + * $Id: wrbuf.c,v 1.4 2004-03-20 07:02:23 adam Exp $ */ /* @@ -82,10 +82,10 @@ int wrbuf_puts(WRBUF b, const char *buf) int wrbuf_xmlputs(WRBUF b, const char *cp) { - return wrbuf_write_cdata(b, cp, strlen(cp)); + return wrbuf_xmlputs_n(b, cp, strlen(cp)); } -int wrbuf_write_cdata(WRBUF b, const char *cp, int size) +int wrbuf_xmlputs_n(WRBUF b, const char *cp, int size) { while (--size >= 0) { @@ -158,7 +158,7 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, break; } if (cdata) - wrbuf_write_cdata(b, outbuf, outp - outbuf); + wrbuf_xmlputs_n(b, outbuf, outp - outbuf); else wrbuf_write(b, outbuf, outp - outbuf); } @@ -166,7 +166,7 @@ static int wrbuf_iconv_write_x(WRBUF b, yaz_iconv_t cd, const char *buf, else { if (cdata) - wrbuf_write_cdata(b, buf, size); + wrbuf_xmlputs_n(b, buf, size); else wrbuf_write(b, buf, size); } diff --git a/win/yaz.nsi b/win/yaz.nsi index cb1bc52..37b9810 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -1,6 +1,6 @@ -; $Id: yaz.nsi,v 1.42 2004-03-17 18:47:42 adam Exp $ +; $Id: yaz.nsi,v 1.43 2004-03-20 07:02:23 adam Exp $ -!define VERSION "2.0.17" +!define VERSION "2.0.18" Name "YAZ" Caption "Index Data YAZ ${VERSION} Setup" diff --git a/win/yaz.rc b/win/yaz.rc index 291cd58..4800241 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,17,2 - PRODUCTVERSION 2,0,17,2 + FILEVERSION 2,0,18,1 + PRODUCTVERSION 2,0,18,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ BEGIN VALUE "Comments", "Z39.50 C Library\0" VALUE "CompanyName", "Index Data\0" VALUE "FileDescription", "YAZ Toolkit\0" - VALUE "FileVersion", "2, 0, 17, 2\0" + VALUE "FileVersion", "2, 0, 18, 1\0" VALUE "InternalName", "YAZ\0" VALUE "LegalCopyright", "Copyright © 1995-2004 Index Data\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "yaz.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Index Data YAZ Toolkit\0" - VALUE "ProductVersion", "2, 0, 17, 2\0" + VALUE "ProductVersion", "2, 0, 18, 1\0" VALUE "SpecialBuild", "\0" END END -- 1.7.10.4