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

Fixed compiler warnings

Browse Source
This commit is contained in:
Georg Richter
2017-07-04 13:56:38 +02:00
parent 65368bc95c
commit ea8a31e63a
13 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/libmariadb/basic-t.c
View File

@@ -185,7 +185,7 @@ static int test_conc70(MYSQL *my)
}
row= mysql_fetch_row(res);
diag("Length: %ld", strlen(row[0]));
diag("Length: %ld", (long)strlen(row[0]));
FAIL_IF(strlen(row[0]) != 1024 * 1024 * 20, "Wrong length");
mysql_free_result(res);
@@ -243,7 +243,7 @@ static int test_conc68(MYSQL *my)
}
row= mysql_fetch_row(res);
diag("Length: %ld", strlen(row[0]));
diag("Length: %ld", (long)strlen(row[0]));
FAIL_IF(strlen(row[0]) != 1024 * 1024 * 20, "Wrong length");
mysql_free_result(res);

2
unittest/libmariadb/charset.c
View File

@@ -712,7 +712,7 @@ static int test_utf16_utf32_noboms(MYSQL *mysql __attribute__((unused)))
rc= mariadb_convert_string((char *)in_string[UTF8], &in_len, csinfo[UTF8], buffer, &out_len, csinfo[i], &error);
FAIL_IF(rc == (size_t)-1, "Conversion failed");
diag("rc=%lu oct_len: %lu", rc, in_oct_len[i]);
diag("rc=%lu oct_len: %lu", (unsigned long)rc, (unsigned long)in_oct_len[i]);
FAIL_IF(rc != in_oct_len[i], "Incorrect number of written bytes");
if (memcmp(buffer, in_string[i], rc) != 0)

8
unittest/libmariadb/misc.c
View File

@@ -1109,16 +1109,16 @@ static int test_get_info(MYSQL *mysql)
rc= mariadb_get_infov(mysql, MARIADB_MAX_ALLOWED_PACKET, &sval);
FAIL_IF(rc, "mysql_get_info failed");
diag("max_allowed_packet: %lu", sval);
diag("max_allowed_packet: %lu", (unsigned long)sval);
rc= mariadb_get_infov(mysql, MARIADB_NET_BUFFER_LENGTH, &sval);
FAIL_IF(rc, "mysql_get_info failed");
diag("net_buffer_length: %lu", sval);
diag("net_buffer_length: %lu", (unsigned long)sval);
rc= mariadb_get_infov(mysql, MARIADB_CLIENT_VERSION_ID, &sval);
FAIL_IF(rc, "mysql_get_info failed");
diag("client_version_id: %lu", sval);
diag("client_version_id: %lu", (unsigned long)sval);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval);
FAIL_IF(rc, "mysql_get_info failed");
diag("server_version_id: %lu", sval);
diag("server_version_id: %lu", (unsigned long)sval);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_MARIADB_CHARSET_INFO, &cs);
FAIL_IF(rc, "mysql_get_info failed");
diag("charset name: %s", cs.csname);

2
unittest/libmariadb/ps.c
View File

@@ -1496,7 +1496,7 @@ static int test_long_data_str1(MYSQL *mysql)
result= mysql_stmt_result_metadata(stmt);
field= mysql_fetch_fields(result);
diag("max_length: %lu max_blob_length: %lu", field->max_length, max_blob_length);
diag("max_length: %lu max_blob_length: %lu", (unsigned long)field->max_length, (unsigned long)max_blob_length);
FAIL_UNLESS(field->max_length == max_blob_length, "field->max_length != max_blob_length");
/* Fetch results into a data buffer that is smaller than data */

2
unittest/libmariadb/ps_bugs.c
View File

@@ -497,7 +497,7 @@ static int test_bug11183(MYSQL *mysql)
FAIL_IF(!rc, "Error expected");
mysql_stmt_reset(stmt);
FAIL_IF(!mysql_stmt_errno(stmt) == 0, "stmt->error != 0");
FAIL_IF(mysql_stmt_errno(stmt) != 0, "stmt->error != 0");
rc= mysql_query(mysql, "create table t1 (a int)");
check_mysql_rc(rc, mysql);