database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

more clang fixes

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-02-12 09:29:27 +00:00
parent aed8005e2e
commit db1a1a1d31
7 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/mysql.h
View File

@@ -582,7 +582,7 @@ int STDCALL mariadb_cancel(MYSQL *mysql);
void STDCALL mysql_debug(const char *debug); void STDCALL mysql_debug(const char *debug);
unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql); unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql);
unsigned long STDCALL mysql_net_field_length(unsigned char **packet); unsigned long STDCALL mysql_net_field_length(unsigned char **packet);
my_bool STDCALL mysql_embedded(); my_bool STDCALL mysql_embedded(void);
MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void); MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);
/* Async API */ /* Async API */
@@ -726,7 +726,7 @@ struct st_mariadb_api {
const char * (STDCALL *mysql_character_set_name)(MYSQL *mysql); const char * (STDCALL *mysql_character_set_name)(MYSQL *mysql);
void (STDCALL *mysql_get_character_set_info)(MYSQL *mysql, MY_CHARSET_INFO *cs); void (STDCALL *mysql_get_character_set_info)(MYSQL *mysql, MY_CHARSET_INFO *cs);
int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname); int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname);
my_bool (STDCALL *mariadb_get_infov)(MYSQL *mysql, enum mariadb_value value, void *arg, ...); my_bool (*mariadb_get_infov)(MYSQL *mysql, enum mariadb_value value, void *arg, ...);
my_bool (STDCALL *mariadb_get_info)(MYSQL *mysql, enum mariadb_value value, void *arg); my_bool (STDCALL *mariadb_get_info)(MYSQL *mysql, enum mariadb_value value, void *arg);
MYSQL * (STDCALL *mysql_init)(MYSQL *mysql); MYSQL * (STDCALL *mysql_init)(MYSQL *mysql);
int (STDCALL *mysql_ssl_set)(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher); int (STDCALL *mysql_ssl_set)(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher);
@@ -780,8 +780,8 @@ struct st_mariadb_api {
MARIADB_CHARSET_INFO * (STDCALL *mariadb_get_charset_by_name)(const char *csname); MARIADB_CHARSET_INFO * (STDCALL *mariadb_get_charset_by_name)(const char *csname);
MARIADB_CHARSET_INFO * (STDCALL *mariadb_get_charset_by_nr)(unsigned int csnr); MARIADB_CHARSET_INFO * (STDCALL *mariadb_get_charset_by_nr)(unsigned int csnr);
size_t (STDCALL *mariadb_convert_string)(const char *from, size_t *from_len, MARIADB_CHARSET_INFO *from_cs, char *to, size_t *to_len, MARIADB_CHARSET_INFO *to_cs, int *errorcode); size_t (STDCALL *mariadb_convert_string)(const char *from, size_t *from_len, MARIADB_CHARSET_INFO *from_cs, char *to, size_t *to_len, MARIADB_CHARSET_INFO *to_cs, int *errorcode);
int (STDCALL *mysql_optionsv)(MYSQL *mysql,enum mysql_option option, ...); int (*mysql_optionsv)(MYSQL *mysql,enum mysql_option option, ...);
int (STDCALL *mysql_get_optionv)(MYSQL *mysql, enum mysql_option option, void *arg, ...); int (*mysql_get_optionv)(MYSQL *mysql, enum mysql_option option, void *arg, ...);
int (STDCALL *mysql_get_option)(MYSQL *mysql, enum mysql_option option, void *arg); int (STDCALL *mysql_get_option)(MYSQL *mysql, enum mysql_option option, void *arg);
unsigned long (STDCALL *mysql_hex_string)(char *to, const char *from, unsigned long len); unsigned long (STDCALL *mysql_hex_string)(char *to, const char *from, unsigned long len);
my_socket (STDCALL *mysql_get_socket)(MYSQL *mysql); my_socket (STDCALL *mysql_get_socket)(MYSQL *mysql);

4
libmariadb/get_password.c
View File

@@ -61,7 +61,7 @@ static char *get_password(FILE *file, char *buffer, int length)
do do
{ {
#ifdef _WIN32 #ifdef _WIN32
if (!ReadConsole(Hdl, &inChar, 1, &CharsProcessed, NULL) || if (!ReadConsole(Hdl, &inChar, 1, (DWORD *)&CharsProcessed, NULL) ||
!CharsProcessed) !CharsProcessed)
break; break;
#else #else
@@ -118,8 +118,6 @@ char* get_tty_password(char *prompt, char *buffer, int length)
#ifdef _WIN32 #ifdef _WIN32
DWORD SaveState; DWORD SaveState;
HANDLE Hdl; HANDLE Hdl;
int Offset= 0;
DWORD CharsProcessed= 0;
if (prompt) if (prompt)
fprintf(stderr, "%s", prompt); fprintf(stderr, "%s", prompt);

6
libmariadb/mariadb_lib.c
View File

@@ -2617,7 +2617,7 @@ void ma_hash_free(void *p)
free(p); free(p);
} }
int STDCALL int
mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
{ {
va_list ap; va_list ap;
@@ -3010,7 +3010,7 @@ end:
return(1); return(1);
} }
int STDCALL int
mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...) mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
{ {
va_list ap; va_list ap;
@@ -3650,7 +3650,7 @@ MARIADB_CHARSET_INFO * STDCALL mariadb_get_charset_by_nr(unsigned int csnr)
return (MARIADB_CHARSET_INFO *)mysql_find_charset_nr(csnr); return (MARIADB_CHARSET_INFO *)mysql_find_charset_nr(csnr);
} }
my_bool STDCALL mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *arg, ...) my_bool mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *arg, ...)
{ {
va_list ap; va_list ap;

2
libmariadb/secure/ma_schannel.c
View File

@@ -306,7 +306,7 @@ end:
PCCRL_CONTEXT A pointer to a certification context structure PCCRL_CONTEXT A pointer to a certification context structure
*/ */
my_bool ma_schannel_load_private_key(MARIADB_PVIO *pvio, CERT_CONTEXT *ctx, char *key_file) my_bool ma_schannel_load_private_key(MARIADB_PVIO *pvio, const CERT_CONTEXT *ctx, char *key_file)
{ {
DWORD der_buffer_len= 0; DWORD der_buffer_len= 0;
LPBYTE der_buffer= NULL; LPBYTE der_buffer= NULL;

4
libmariadb/secure/ma_schannel.h
View File

@@ -48,7 +48,7 @@
struct st_schannel { struct st_schannel {
HCERTSTORE cert_store; HCERTSTORE cert_store;
CERT_CONTEXT *client_cert_ctx; const CERT_CONTEXT *client_cert_ctx;
CredHandle CredHdl; CredHandle CredHdl;
my_bool FreeCredHdl; my_bool FreeCredHdl;
PUCHAR IoBuffer; PUCHAR IoBuffer;
@@ -70,7 +70,7 @@ extern my_bool ca_Check, crl_Check;
CERT_CONTEXT *ma_schannel_create_cert_context(MARIADB_PVIO *pvio, const char *pem_file); CERT_CONTEXT *ma_schannel_create_cert_context(MARIADB_PVIO *pvio, const char *pem_file);
SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls); SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls);
SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRead, SecBuffer *pExtraData); SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRead, SecBuffer *pExtraData);
my_bool ma_schannel_load_private_key(MARIADB_PVIO *pvio, CERT_CONTEXT *ctx, char *key_file); my_bool ma_schannel_load_private_key(MARIADB_PVIO *pvio, const CERT_CONTEXT *ctx, char *key_file);
PCCRL_CONTEXT ma_schannel_create_crl_context(MARIADB_PVIO *pvio, const char *pem_file); PCCRL_CONTEXT ma_schannel_create_crl_context(MARIADB_PVIO *pvio, const char *pem_file);
my_bool ma_schannel_verify_certs(MARIADB_TLS *ctls); my_bool ma_schannel_verify_certs(MARIADB_TLS *ctls);
ssize_t ma_schannel_write_encrypt(MARIADB_PVIO *pvio, ssize_t ma_schannel_write_encrypt(MARIADB_PVIO *pvio,

9
libmariadb/secure/schannel.c
View File

@@ -271,7 +271,7 @@ static size_t set_cipher(char * cipher_str, DWORD protocol, ALG_ID *arr , size_t
for(i = 0; i < sizeof(cipher_map)/sizeof(cipher_map[0]) ; i++) for(i = 0; i < sizeof(cipher_map)/sizeof(cipher_map[0]) ; i++)
{ {
if(pos + 4 < arr_size && strcmp(cipher_map[i].openssl_name, token) == 0 || if((pos + 4 < arr_size && strcmp(cipher_map[i].openssl_name, token) == 0) ||
(cipher_map[i].protocol <= protocol)) (cipher_map[i].protocol <= protocol))
{ {
memcpy(arr + pos, cipher_map[i].algs, sizeof(ALG_ID)* 4); memcpy(arr + pos, cipher_map[i].algs, sizeof(ALG_ID)* 4);
@@ -293,7 +293,6 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
SC_CTX *sctx; SC_CTX *sctx;
SECURITY_STATUS sRet; SECURITY_STATUS sRet;
ALG_ID AlgId[MAX_ALG_ID]; ALG_ID AlgId[MAX_ALG_ID];
WORD validTokens = 0;
if (!ctls || !ctls->pvio) if (!ctls || !ctls->pvio)
return 1;; return 1;;
@@ -311,7 +310,7 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
/* Set cipher */ /* Set cipher */
if (mysql->options.ssl_cipher) if (mysql->options.ssl_cipher)
{ {
int i; size_t i;
DWORD protocol = 0; DWORD protocol = 0;
/* check if a protocol was specified as a cipher: /* check if a protocol was specified as a cipher:
@@ -399,7 +398,6 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length) ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
{ {
SC_CTX *sctx= (SC_CTX *)ctls->ssl;
MARIADB_PVIO *pvio= ctls->pvio; MARIADB_PVIO *pvio= ctls->pvio;
ssize_t rc, wlength= 0; ssize_t rc, wlength= 0;
ssize_t remain= length; ssize_t remain= length;
@@ -520,7 +518,7 @@ end:
static const char *cipher_name(const SecPkgContext_CipherInfo *CipherInfo) static const char *cipher_name(const SecPkgContext_CipherInfo *CipherInfo)
{ {
int i; size_t i;
for(i = 0; i < sizeof(cipher_map)/sizeof(cipher_map[0]) ; i++) for(i = 0; i < sizeof(cipher_map)/sizeof(cipher_map[0]) ; i++)
{ {
@@ -535,7 +533,6 @@ const char *ma_tls_get_cipher(MARIADB_TLS *ctls)
SecPkgContext_CipherInfo CipherInfo = { SECPKGCONTEXT_CIPHERINFO_V1 }; SecPkgContext_CipherInfo CipherInfo = { SECPKGCONTEXT_CIPHERINFO_V1 };
SECURITY_STATUS sRet; SECURITY_STATUS sRet;
SC_CTX *sctx; SC_CTX *sctx;
DWORD i= 0;
if (!ctls || !ctls->ssl) if (!ctls || !ctls->ssl)
return NULL; return NULL;

4
win-iconv/win_iconv.c
View File

@@ -1774,8 +1774,8 @@ iso2022jp_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int
return seterror(EILSEQ); return seterror(EILSEQ);
/* reset the mode for informal sequence */ /* reset the mode for informal sequence */
if (cv->mode != ISO2022_MODE(cs, shift)) if (cv->mode != (DWORD)ISO2022_MODE(cs, shift))
cv->mode = ISO2022_MODE(cs, shift); cv->mode = (DWORD)ISO2022_MODE(cs, shift);
return len; return len;
} }