X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fyaz-iconv.h;h=4ce4e8334fff66b5455d0c419c55e3e6cb8a1bc3;hp=20d8a9e1977d9f0122fe2fce6f5436f5e8766d0c;hb=04a6feeefe28e7f2f9f4701560b3344545a681c6;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431

diff --git a/include/yaz/yaz-iconv.h b/include/yaz/yaz-iconv.h
index 20d8a9e..4ce4e83 100644
--- a/include/yaz/yaz-iconv.h
+++ b/include/yaz/yaz-iconv.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data.
+ * Copyright (C) 1995-2013 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:
@@ -65,30 +65,12 @@ YAZ_EXPORT int yaz_iconv_close (yaz_iconv_t cd);
 /** \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 (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);
-
-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,
+YAZ_EXPORT unsigned long yaz_read_UTF8_char(const unsigned char *inp,
                                             size_t inbytesleft,
                                             size_t *no_read,
                                             int *error);
 
-/** \brief encodes UTF-8 sequence 
+/** \brief encodes UTF-8 sequence
     \param x the UNICODE value
     \param outbuf output buffer pointer, updated if conversion is successful
     \param outbytesleft length of buffer, updated if conversino is successful
@@ -100,12 +82,29 @@ YAZ_EXPORT size_t yaz_write_UTF8_char(unsigned long x,
                                       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