mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +03:00
d13c54351d
Don't use static link by default (in compile-pentium) as some new systems doesn't have all static libraries available Change type for functions in plugin.h:str_mysql_ftparser_param() to const unsigned char and string lengths to size_t. One effect of the above change is that one needs to include mysql_global.h or define size_t before including plugin.h This fixes a case where mysql_client_test failed with newer gcc that enables strict-aliasing by default BUILD/compile-pentium: Don't use static link by default as some new systems doesn't have all static libraries available client/mysql_upgrade.c: Remove not used variable cmd-line-utils/readline/config_readline.h: Define some constants to get rid of compiler warnings on Linux cmd-line-utils/readline/display.c: Get rid of compiler warnings cmd-line-utils/readline/history.c: Got rid of compiler warnings: - Defining some strings as const - Added cast cmd-line-utils/readline/rlmbutil.h: Added cast to get rid of compiler warnings cmd-line-utils/readline/text.c: Remove not needed initialization to get rid of compiler warnings cmd-line-utils/readline/xmalloc.c: Changed types to 'const char* to get rid of compiler warnings configure.in: Ensure that we use MariaDB as suffix include/mysql/plugin.h: Changed types to 'const unsigned char* to get rid of compiler warnings (in other parts of the code) Change length for not \0 terminated string to size_t include/mysql/plugin.h.pp: Update related to plugin.h libmysql/libmysql.c: Fixed bug that caused core dump with newer gcc when strict aliasing is not turned off mysql-test/t/information_schema.test: Test is depending on innodb mysql-test/t/not_partition.test: Fixed wrong directory name (Not noticed before as we don't ususally run this test) mysys/lf_hash.c: Got rid of compiler warnings from -Wstrict-aliasing mysys/my_redel.c: Removed not used variable regex/engine.c: Changed types to 'const char* to get rid of compiler warnings regex/engine.ih: Changed types to 'const char* to get rid of compiler warnings sql/sp_head.cc: Got rid of compiler warning from -Wstrict-aliasing sql/sql_base.cc: Got rid of compiler warnings from -Wstrict-aliasing (The original code was probably wrong as nj_col->table_field was sql/sql_builtin.cc.in: plugin.h needs to have size_t defined sql/sql_parse.cc: Remove used variable sql/sql_select.cc: Got rid of compiler warnings from -Wstrict-aliasing sql/sql_show.cc: Added #ifdef to get rid of compiler warning when not using partition engine sql/table.cc: Got rid of compiler warning from -Wstrict-aliasing storage/maria/ha_maria.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/maria/lockman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/ma_check.c: Got rid of compiler warnings from -Wstrict-aliasing Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_check_standalone.h: Update to compatible _ma_killed_ptr() from ha_maria.cc storage/maria/ma_ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing Ensure that 'subkeys' is 32 bit storage/maria/ma_ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_sort.c: Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_state.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/maria_def.h: Redefine ma_killed_ptr() storage/maria/maria_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/trnman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_stopwords.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ha_myisam.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/myisam/mi_check.c: Use new killed_ptr() function storage/myisam/myisam_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/myisamchk.c: Update to compatible killed_ptr() from ha_myisam.cc storage/myisam/myisamdef.h: Redefine killed_ptr() storage/myisam/myisamlog.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/sort.c: Change to use new version of killed_ptr; Don't call it as often as before storage/xtradb/fil/fil0fil.c: Fixedc ompiler warning storage/xtradb/trx/trx0i_s.c: Include mysql_plugin.h later to ensure that size_t is defined
156 lines
5.1 KiB
C
156 lines
5.1 KiB
C
/* rlmbutil.h -- utility functions for multibyte characters. */
|
|
|
|
/* Copyright (C) 2001 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library, a library for
|
|
reading lines of text with interactive input and history editing.
|
|
|
|
The GNU Readline Library is free software; you can redistribute it
|
|
and/or modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2, or
|
|
(at your option) any later version.
|
|
|
|
The GNU Readline Library is distributed in the hope that it will be
|
|
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
|
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
The GNU General Public License is often shipped with GNU software, and
|
|
is generally kept in a file called COPYING or LICENSE. If you do not
|
|
have a copy of the license, write to the Free Software Foundation,
|
|
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
|
|
|
#if !defined (_RL_MBUTIL_H_)
|
|
#define _RL_MBUTIL_H_
|
|
|
|
#include "rlstdc.h"
|
|
|
|
/************************************************/
|
|
/* check multibyte capability for I18N code */
|
|
/************************************************/
|
|
|
|
/* For platforms which support the ISO C amendement 1 functionality we
|
|
support user defined character classes. */
|
|
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
|
|
#if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) && defined (HAVE_LOCALE_H)
|
|
# include <wchar.h>
|
|
# include <wctype.h>
|
|
# if defined (HAVE_ISWCTYPE) && \
|
|
defined (HAVE_ISWLOWER) && \
|
|
defined (HAVE_ISWUPPER) && \
|
|
defined (HAVE_MBSRTOWCS) && \
|
|
defined (HAVE_MBRTOWC) && \
|
|
defined (HAVE_MBRLEN) && \
|
|
defined (HAVE_TOWLOWER) && \
|
|
defined (HAVE_TOWUPPER) && \
|
|
defined (HAVE_WCHAR_T) && \
|
|
defined (HAVE_WCWIDTH)
|
|
/* system is supposed to support XPG5 */
|
|
# define HANDLE_MULTIBYTE 1
|
|
# endif
|
|
#endif
|
|
|
|
/* If we don't want multibyte chars even on a system that supports them, let
|
|
the configuring user turn multibyte support off. */
|
|
#if defined (NO_MULTIBYTE_SUPPORT)
|
|
# undef HANDLE_MULTIBYTE
|
|
#endif
|
|
|
|
/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */
|
|
#if HANDLE_MULTIBYTE && !defined (HAVE_MBSTATE_T)
|
|
# define wcsrtombs(dest, src, len, ps) (wcsrtombs) (dest, src, len, 0)
|
|
# define mbsrtowcs(dest, src, len, ps) (mbsrtowcs) (dest, src, len, 0)
|
|
# define wcrtomb(s, wc, ps) (wcrtomb) (s, wc, 0)
|
|
# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
|
|
# define mbrlen(s, n, ps) (mbrlen) (s, n, 0)
|
|
# define mbstate_t int
|
|
#endif
|
|
|
|
/* Make sure MB_LEN_MAX is at least 16 on systems that claim to be able to
|
|
handle multibyte chars (some systems define MB_LEN_MAX as 1) */
|
|
#ifdef HANDLE_MULTIBYTE
|
|
# include <limits.h>
|
|
# if defined(MB_LEN_MAX) && (MB_LEN_MAX < 16)
|
|
# undef MB_LEN_MAX
|
|
# endif
|
|
# if !defined (MB_LEN_MAX)
|
|
# define MB_LEN_MAX 16
|
|
# endif
|
|
#endif
|
|
|
|
/************************************************/
|
|
/* end of multibyte capability checks for I18N */
|
|
/************************************************/
|
|
|
|
/*
|
|
* Flags for _rl_find_prev_mbchar and _rl_find_next_mbchar:
|
|
*
|
|
* MB_FIND_ANY find any multibyte character
|
|
* MB_FIND_NONZERO find a non-zero-width multibyte character
|
|
*/
|
|
|
|
#define MB_FIND_ANY 0x00
|
|
#define MB_FIND_NONZERO 0x01
|
|
|
|
extern int _rl_find_prev_mbchar PARAMS((char *, int, int));
|
|
extern int _rl_find_next_mbchar PARAMS((char *, int, int, int));
|
|
|
|
#ifdef HANDLE_MULTIBYTE
|
|
|
|
extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *, int, mbstate_t *));
|
|
extern int _rl_get_char_len PARAMS((char *, mbstate_t *));
|
|
extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *));
|
|
|
|
extern int _rl_read_mbchar PARAMS((char *, int));
|
|
extern int _rl_read_mbstring PARAMS((int, char *, int));
|
|
|
|
extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
|
|
|
|
extern wchar_t _rl_char_value PARAMS((char *, int));
|
|
extern int _rl_walphabetic PARAMS((wchar_t));
|
|
|
|
#define _rl_to_wupper(wc) (iswlower (wc) ? (wchar_t) towupper (wc) : (wc))
|
|
#define _rl_to_wlower(wc) (iswupper (wc) ? (wchar_t) towlower (wc) : (wc))
|
|
|
|
#define MB_NEXTCHAR(b,s,c,f) \
|
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
|
? _rl_find_next_mbchar ((b), (s), (c), (f)) \
|
|
: ((s) + (c)))
|
|
#define MB_PREVCHAR(b,s,f) \
|
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
|
? _rl_find_prev_mbchar ((b), (s), (f)) \
|
|
: ((s) - 1))
|
|
|
|
#define MB_INVALIDCH(x) ((x) == (size_t)-1 || (x) == (size_t)-2)
|
|
#define MB_NULLWCH(x) ((x) == 0)
|
|
|
|
#else /* !HANDLE_MULTIBYTE */
|
|
|
|
#undef MB_LEN_MAX
|
|
#undef MB_CUR_MAX
|
|
|
|
#define MB_LEN_MAX 1
|
|
#define MB_CUR_MAX 1
|
|
|
|
#define _rl_find_prev_mbchar(b, i, f) (((i) == 0) ? (i) : ((i) - 1))
|
|
#define _rl_find_next_mbchar(b, i1, i2, f) ((i1) + (i2))
|
|
|
|
#define _rl_char_value(buf,ind) ((buf)[(ind)])
|
|
|
|
#define _rl_walphabetic(c) (rl_alphabetic (c))
|
|
|
|
#define _rl_to_wupper(c) (_rl_to_upper (c))
|
|
#define _rl_to_wlower(c) (_rl_to_lower (c))
|
|
|
|
#define MB_NEXTCHAR(b,s,c,f) ((s) + (c))
|
|
#define MB_PREVCHAR(b,s,f) ((s) - 1)
|
|
|
|
#define MB_INVALIDCH(x) (0)
|
|
#define MB_NULLWCH(x) (0)
|
|
|
|
#endif /* !HANDLE_MULTIBYTE */
|
|
|
|
extern int rl_byte_oriented;
|
|
|
|
#endif /* _RL_MBUTIL_H_ */
|