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

Fix compilation warnings in plugins

Browse Source 
* update cracklib_password_check to match the new prototype
* cannot use __attribute__((format)) for my_snprintf, because
  we support format extensions that the compiler doesn't know about.
This commit is contained in:
Sergei Golubchik 2017-08-11 13:26:54 +02:00
parent d5a6bae7c0
commit a6e215f221
9 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqlcheck.c
View File

@ -19,8 +19,6 @@
/* By Jani Tolonen, 2001-04-20, MySQL Development Team */ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */
#define CHECK_VERSION "2.7.4-MariaDB" #define CHECK_VERSION "2.7.4-MariaDB"
/* Avoid warnings from %'s format */
#define USING_MARIADB_SNPRINTF_EXTENSIONS
#include "client_priv.h" #include "client_priv.h"
#include <m_ctype.h> #include <m_ctype.h>

9
include/mysql/plugin_audit.h.pp
View File

@ -167,9 +167,9 @@ int my_random_bytes(unsigned char* buf, int num);
unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length); unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length);
unsigned int my_aes_ctx_size(enum my_aes_mode mode); unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void(*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...);
void(*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...);
void(*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap);
} *my_print_error_service; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_error(unsigned int nr, unsigned long MyFlags, ...);
extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...);
@ -178,8 +178,7 @@ extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...) size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
;
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
extern struct progress_report_service_st { extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage); void (*thd_progress_init_func)(void* thd, unsigned int max_stage);

9
include/mysql/plugin_auth.h.pp
View File

@ -167,9 +167,9 @@ int my_random_bytes(unsigned char* buf, int num);
unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length); unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length);
unsigned int my_aes_ctx_size(enum my_aes_mode mode); unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void(*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...);
void(*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...);
void(*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap);
} *my_print_error_service; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_error(unsigned int nr, unsigned long MyFlags, ...);
extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...);
@ -178,8 +178,7 @@ extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...) size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
;
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
extern struct progress_report_service_st { extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage); void (*thd_progress_init_func)(void* thd, unsigned int max_stage);

9
include/mysql/plugin_encryption.h.pp
View File

@ -167,9 +167,9 @@ int my_random_bytes(unsigned char* buf, int num);
unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length); unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length);
unsigned int my_aes_ctx_size(enum my_aes_mode mode); unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void(*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...);
void(*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...);
void(*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap);
} *my_print_error_service; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_error(unsigned int nr, unsigned long MyFlags, ...);
extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...);
@ -178,8 +178,7 @@ extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...) size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
;
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
extern struct progress_report_service_st { extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage); void (*thd_progress_init_func)(void* thd, unsigned int max_stage);

9
include/mysql/plugin_ftparser.h.pp
View File

@ -167,9 +167,9 @@ int my_random_bytes(unsigned char* buf, int num);
unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length); unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length);
unsigned int my_aes_ctx_size(enum my_aes_mode mode); unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void(*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...);
void(*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...);
void(*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap);
} *my_print_error_service; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_error(unsigned int nr, unsigned long MyFlags, ...);
extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...);
@ -178,8 +178,7 @@ extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...) size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
;
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
extern struct progress_report_service_st { extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage); void (*thd_progress_init_func)(void* thd, unsigned int max_stage);

9
include/mysql/plugin_password_validation.h.pp
View File

@ -167,9 +167,9 @@ int my_random_bytes(unsigned char* buf, int num);
unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length); unsigned int my_aes_get_size(enum my_aes_mode mode, unsigned int source_length);
unsigned int my_aes_ctx_size(enum my_aes_mode mode); unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void(*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...);
void(*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...);
void(*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap);
} *my_print_error_service; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_error(unsigned int nr, unsigned long MyFlags, ...);
extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...);
@ -178,8 +178,7 @@ extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...) size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
;
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
extern struct progress_report_service_st { extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage); void (*thd_progress_init_func)(void* thd, unsigned int max_stage);

15
include/mysql/service_my_snprintf.h
View File

@ -92,22 +92,9 @@ extern struct my_snprintf_service_st {
#else #else
#ifndef ATTRIBUTE_FORMAT size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
#define ATTRIBUTE_FORMAT_DEFINED
#define ATTRIBUTE_FORMAT(A,B,C)
#endif
#if defined(MYSQL_ABI_CHECK) || defined(USING_MARIADB_SNPRINTF_EXTENSIONS)
#undef ATTRIBUTE_FORMAT
#define ATTRIBUTE_FORMAT(A,B,C)
#endif
size_t my_snprintf(char* to, size_t n, const char* fmt, ...)
ATTRIBUTE_FORMAT(printf, 3, 4);
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
#ifdef ATTRIBUTE_FORMAT_DEFINED
#undef ATTRIBUTE_FORMAT_DEFINED
#undef ATTRIBUTE_FORMAT
#endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

2
plugin/cracklib_password_check/cracklib_password_check.c
View File

@ -23,7 +23,7 @@
static char *dictionary; static char *dictionary;
static int crackme(MYSQL_LEX_STRING *username, MYSQL_LEX_STRING *password) static int crackme(MYSQL_CONST_LEX_STRING *username, MYSQL_CONST_LEX_STRING *password)
{ {
char *user= alloca(username->length + 1); char *user= alloca(username->length + 1);
char *host; char *host;

2
sql/field.cc
View File

@ -51,7 +51,7 @@
*****************************************************************************/ *****************************************************************************/
static const char *zero_timestamp="0000-00-00 00:00:00.000000"; static const char *zero_timestamp="0000-00-00 00:00:00.000000";
LEX_CSTRING temp_lex_str= {"temp", 4}; LEX_CSTRING temp_lex_str= {STRING_WITH_LEN("temp")};
uchar Field_null::null[1]={1}; uchar Field_null::null[1]={1};
const char field_separator=','; const char field_separator=',';