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=9993c418a34fac912cbca0716182f98fb75def58;hb=04a6feeefe28e7f2f9f4701560b3344545a681c6;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c diff --git a/include/yaz/yaz-iconv.h b/include/yaz/yaz-iconv.h index 9993c41..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-2009 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,12 +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); -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 @@ -82,6 +82,22 @@ 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