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

Fixed compilation errors introduced by 629ec646303..

Browse Source
This commit is contained in:
Georg Richter
2016-10-18 10:53:31 +02:00
parent 532ad45c62
commit 468cda3cfb
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmariadb/secure/gnutls.c
View File

@@ -1261,12 +1261,12 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
return 0; return 0;
} }
size_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length) ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
{ {
return gnutls_record_recv((gnutls_session_t )ctls->ssl, (void *)buffer, length); return gnutls_record_recv((gnutls_session_t )ctls->ssl, (void *)buffer, length);
} }
size_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)
{ {
return gnutls_record_send((gnutls_session_t )ctls->ssl, (void *)buffer, length); return gnutls_record_send((gnutls_session_t )ctls->ssl, (void *)buffer, length);
} }

7
libmariadb/secure/openssl.c
View File

@@ -604,12 +604,12 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
return 0; return 0;
} }
size_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length) ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
{ {
return SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length); return SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length);
} }
size_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)
{ {
return SSL_write((SSL *)ctls->ssl, (void *)buffer, (int)length); return SSL_write((SSL *)ctls->ssl, (void *)buffer, (int)length);
} }
@@ -618,11 +618,12 @@ my_bool ma_tls_close(MARIADB_TLS *ctls)
{ {
int i, rc; int i, rc;
SSL *ssl; SSL *ssl;
SSL_CTX *ctx= NULL;
if (!ctls || !ctls->ssl) if (!ctls || !ctls->ssl)
return 1; return 1;
ssl= (SSL *)ctls->ssl; ssl= (SSL *)ctls->ssl;
SSL_CTX *ctx= SSL_get_SSL_CTX(ssl); ctx= SSL_get_SSL_CTX(ssl);
if (ctx) if (ctx)
SSL_CTX_free(ctx); SSL_CTX_free(ctx);

2
unittest/libmariadb/bulk1.c
View File

@@ -158,7 +158,7 @@ static int bulk2(MYSQL *mysql)
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size); rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
rc= mysql_stmt_bind_param(stmt, &bind); rc= mysql_stmt_bind_param(stmt, bind);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt); rc= mysql_stmt_execute(stmt);