1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warning - using "const" twice for CHARSET_INFO.

Browse Source 
CHARSET_INFO is already typedef'ed as "const" strúcture, thus "const CHARSET_INFO"  generates  multiple type modifier warning.
This commit is contained in:
Vladislav Vaintroub 2013-07-13 15:13:24 +02:00
parent 104b16bca0
commit 36519b8a83
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/m_ctype.h
View File

@ -620,9 +620,9 @@ my_bool my_charset_is_ascii_compatible(CHARSET_INFO *cs);
extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n, extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,
const char* fmt, va_list ap); const char* fmt, va_list ap);
uint32 my_convert(char *to, uint32 to_length, const CHARSET_INFO *to_cs, uint32 my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
const char *from, uint32 from_length, const char *from, uint32 from_length,
const CHARSET_INFO *from_cs, uint *errors); CHARSET_INFO *from_cs, uint *errors);
#define _MY_U 01 /* Upper case */ #define _MY_U 01 /* Upper case */
#define _MY_L 02 /* Lower case */ #define _MY_L 02 /* Lower case */

8
strings/ctype.c
View File

@ -447,9 +447,9 @@ my_charset_is_ascii_compatible(CHARSET_INFO *cs)
static uint32 static uint32
my_convert_internal(char *to, uint32 to_length, my_convert_internal(char *to, uint32 to_length,
const CHARSET_INFO *to_cs, CHARSET_INFO *to_cs,
const char *from, uint32 from_length, const char *from, uint32 from_length,
const CHARSET_INFO *from_cs, uint *errors) CHARSET_INFO *from_cs, uint *errors)
{ {
int cnvres; int cnvres;
my_wc_t wc; my_wc_t wc;
@ -517,9 +517,9 @@ outp:
*/ */
uint32 uint32
my_convert(char *to, uint32 to_length, const CHARSET_INFO *to_cs, my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
const char *from, uint32 from_length, const char *from, uint32 from_length,
const CHARSET_INFO *from_cs, uint *errors) CHARSET_INFO *from_cs, uint *errors)
{ {
uint32 length, length2; uint32 length, length2;
/* /*