-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 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:
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: yaz-iconv.h,v 1.14 2007-01-03 08:42:14 adam Exp $ */
/**
* \file yaz-iconv.h
/** \brief tests whether conversion is handled by YAZ' iconv or system iconv */
YAZ_EXPORT int yaz_iconv_isbuiltin(yaz_iconv_t cd);
-/** \brief match strings - independent of case and '-'
- \param s1 first string
- \param s2 second string
- \retval 0 strings are similar
- \retval !=0 strings are different
-*/
-YAZ_EXPORT int yaz_matchstr(const char *s1, const char *s2);
-
-YAZ_EXPORT int yaz_strcmp_del(const char *a, const char *b, const char *b_del);
-
-/** \brief decodes UTF-8 sequence
- \param inp input buffer with UTF-8 bytes
- \param inbytesleft length of input buffer
- \param no_read holds number of bytes read if conversion is successful
- \param error pointer to error code if error occurs
- \retval 0 if error
- \retval >0 if conversion is successful
-*/
YAZ_EXPORT unsigned long yaz_read_UTF8_char(unsigned char *inp,
size_t inbytesleft,
size_t *no_read,
char **outbuf, size_t *outbytesleft,
int *error);
+/* ctype.h macros ASCII based. That do not depend on LANG, nor require
+ unsigned int as argument */
+#define yaz_isdigit(x) ((x) >= '0' && (x) <= '9')
+#define yaz_isspace(x) strchr(" \f\r\n\t\v", x)
+#define yaz_toupper(x) ((x) + ('A' - 'a'))
+#define yaz_isupper(x) ((x) >= 'A' && (x) <= 'Z')
+#define yaz_tolower(x) ((x) + ('a' - 'A'))
+#define yaz_islower(x) ((x) >= 'a' && (x) <= 'z')
+
+/** \brief check whether string apppers to be UTF-8 encoded
+ \param cstr string to check
+ \retval 1 OK (appears to be UTF-8)
+ \retval 0 definitely not UTF-8
+*/
+YAZ_EXPORT int yaz_utf8_check(const char *cstr);
+
YAZ_END_CDECL
#endif
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab