From ae309395bf5f5511c2eee751151a2962726f745a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 6 Nov 2008 14:14:21 +0100 Subject: [PATCH] Renamed match-str.h to matchstr.h. --- include/yaz/Makefile.am | 2 +- include/yaz/match-str.h | 81 ----------------------------------------------- include/yaz/matchstr.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++ include/yaz/proto.h | 2 +- include/yaz/yaz-util.h | 2 +- src/cqltransform.c | 2 +- src/http.c | 2 +- src/iconv-p.h | 2 +- src/matchstr.c | 2 +- src/srwutil.c | 2 +- ztest/gfs-example.c | 2 +- 11 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 include/yaz/match-str.h create mode 100644 include/yaz/matchstr.h diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am index 9792cdb..4251deb 100644 --- a/include/yaz/Makefile.am +++ b/include/yaz/Makefile.am @@ -19,5 +19,5 @@ pkginclude_HEADERS= backend.h ccl.h ccl_xml.h cql.h rpn2cql.h comstack.h \ z-grs.h z-mterm2.h z-opac.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h \ z-univ.h z-oclcui.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h \ zes-psched.h zes-admin.h zes-pset.h zes-update.h zes-update0.h \ - zoom.h z-charneg.h charneg.h soap.h srw.h zgdu.h match-str.h + zoom.h z-charneg.h charneg.h soap.h srw.h zgdu.h matchstr.h diff --git a/include/yaz/match-str.h b/include/yaz/match-str.h deleted file mode 100644 index b776907..0000000 --- a/include/yaz/match-str.h +++ /dev/null @@ -1,81 +0,0 @@ -/* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data. - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Index Data nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * \file match-str.h - * \brief Header for YAZ iconv interface - */ - -#ifndef YAZ_MATCH_STR_H -#define YAZ_MATCH_STR_H - -#include -#include - -YAZ_BEGIN_CDECL - -/** \brief match strings - independent of case and '-' - \param s1 first string - \param s2 second string (May include wildcard ? and .) - \retval 0 strings are similar - \retval !=0 strings are different -*/ -YAZ_EXPORT int yaz_matchstr(const char *s1, const char *s2); - -/** \brief match a and b with some delimitor for b - \param a first second - \param b second string - \param b_del delimitor for b - \retval 0 strings are similar - \retval !=0 strings are different -*/ -YAZ_EXPORT int yaz_strcmp_del(const char *a, const char *b, const char *b_del); - - -/** \brief compares two buffers of different size - \param a first buffer - \param b second buffer - \param len_a length of first buffer - \retval len_b length of second buffer - \retval 0 buffers are equal - \retval >0 a > b - \retval <0 a < b -*/ -int yaz_memcmp(const void *a, const void *b, size_t len_a, size_t len_b); - - -YAZ_END_CDECL - -#endif -/* - * Local variables: - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ - diff --git a/include/yaz/matchstr.h b/include/yaz/matchstr.h new file mode 100644 index 0000000..b776907 --- /dev/null +++ b/include/yaz/matchstr.h @@ -0,0 +1,81 @@ +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data. + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * \file match-str.h + * \brief Header for YAZ iconv interface + */ + +#ifndef YAZ_MATCH_STR_H +#define YAZ_MATCH_STR_H + +#include +#include + +YAZ_BEGIN_CDECL + +/** \brief match strings - independent of case and '-' + \param s1 first string + \param s2 second string (May include wildcard ? and .) + \retval 0 strings are similar + \retval !=0 strings are different +*/ +YAZ_EXPORT int yaz_matchstr(const char *s1, const char *s2); + +/** \brief match a and b with some delimitor for b + \param a first second + \param b second string + \param b_del delimitor for b + \retval 0 strings are similar + \retval !=0 strings are different +*/ +YAZ_EXPORT int yaz_strcmp_del(const char *a, const char *b, const char *b_del); + + +/** \brief compares two buffers of different size + \param a first buffer + \param b second buffer + \param len_a length of first buffer + \retval len_b length of second buffer + \retval 0 buffers are equal + \retval >0 a > b + \retval <0 a < b +*/ +int yaz_memcmp(const void *a, const void *b, size_t len_a, size_t len_b); + + +YAZ_END_CDECL + +#endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ + diff --git a/include/yaz/proto.h b/include/yaz/proto.h index 96a0cde..a40307f 100644 --- a/include/yaz/proto.h +++ b/include/yaz/proto.h @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/yaz/yaz-util.h b/include/yaz/yaz-util.h index baac768..0679e7a 100644 --- a/include/yaz/yaz-util.h +++ b/include/yaz/yaz-util.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include /** \mainpage YAZ \section intro_sec Introduction diff --git a/src/cqltransform.c b/src/cqltransform.c index ea41036..e38fe05 100644 --- a/src/cqltransform.c +++ b/src/cqltransform.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/http.c b/src/http.c index 3362438..a7c328a 100644 --- a/src/http.c +++ b/src/http.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #ifdef WIN32 diff --git a/src/iconv-p.h b/src/iconv-p.h index 2586b7b..d219e68 100644 --- a/src/iconv-p.h +++ b/src/iconv-p.h @@ -34,7 +34,7 @@ #include -#include +#include #include void yaz_iconv_set_errno(yaz_iconv_t cd, int no); diff --git a/src/matchstr.c b/src/matchstr.c index cd5af55..4c3bcf2 100644 --- a/src/matchstr.c +++ b/src/matchstr.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include int yaz_matchstr(const char *s1, const char *s2) { diff --git a/src/srwutil.c b/src/srwutil.c index 9ebd82d..25a85e1 100644 --- a/src/srwutil.c +++ b/src/srwutil.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include static int hex_digit (int ch) diff --git a/ztest/gfs-example.c b/ztest/gfs-example.c index 258c83f..9f174da 100644 --- a/ztest/gfs-example.c +++ b/ztest/gfs-example.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include static int my_search(void *handle, bend_search_rr *rr) -- 1.7.10.4