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

CONC-329: change pvio_*_blocking to return int to accomidate SOCKET_ERROR(-1)

Browse Source 
POWER and other architectures that define char(as my_bool) to be unsigned (as the C
standard leaves this undefined). This resulted in error branches being
unreachabe as indicated by the below compile warnings.

plugins/pvio/pvio_socket.c:763:42: warning: comparison of constant -1 with expression of type 'my_bool' (aka 'char') is always
      false [-Wtautological-constant-out-of-range-compare]
    if (pvio_socket_blocking(pvio, 1, 0) == SOCKET_ERROR)
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~
plugins/pvio/pvio_socket.c:875:46: warning: comparison of constant -1 with expression of type 'my_bool' (aka 'char') is always
      false [-Wtautological-constant-out-of-range-compare]
        if (pvio_socket_blocking(pvio, 0, 0) == SOCKET_ERROR)
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~
plugins/pvio/pvio_socket.c:907:42: warning: comparison of constant -1 with expression of type 'my_bool' (aka 'char') is always
      false [-Wtautological-constant-out-of-range-compare]
    if (pvio_socket_blocking(pvio, 1, 0) == SOCKET_ERROR)

ma_hext2int: signed char - prevent compiler errors when char is unsigned.

libmariadb/ma_tls.c:169:31: warning: comparison of constant -1 with expression of type 'char' is always false
      [-Wtautological-constant-out-of-range-compare]
    if ((d1 = ma_hex2int(*p)) == - 1 ||
        ~~~~~~~~~~~~~~~~~~~~~ ^  ~~~
libmariadb/ma_tls.c:170:35: warning: comparison of constant -1 with expression of type 'char' is always false
      [-Wtautological-constant-out-of-range-compare]
        (d2 = ma_hex2int(*(p+1))) == -1 ||
        ~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~

To fix this all the pvio_*_blocking functions have been changed to use
int as a return value.

Other my_bool/char differences fixed:

mariadb_dyncol_val_str: fix prototype to use char - like implemented function.

unittest: bind.is_null is my_bool* so we use a my_bool.
This commit is contained in:
Daniel Black
2018-07-18 09:28:05 +10:00
parent d3e06bc161
commit b19f6a475b
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unittest/libmariadb/ps.c
View File

@@ -2209,7 +2209,7 @@ static int test_bind_negative(MYSQL *mysql)
my_bind[0].buffer_type= MYSQL_TYPE_LONG;
my_bind[0].buffer= (void *)&my_val;
my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null;
my_bind[0].is_null= &my_null;
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
@@ -2400,12 +2400,12 @@ static int test_union_param(MYSQL *mysql)
my_bind[0].buffer= (char*) &my_val;
my_bind[0].buffer_length= 4;
my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null;
my_bind[0].is_null= &my_null;
my_bind[1].buffer_type= MYSQL_TYPE_STRING;
my_bind[1].buffer= (char*) &my_val;
my_bind[1].buffer_length= 4;
my_bind[1].length= &my_length;
my_bind[1].is_null= (char*)&my_null;
my_bind[1].is_null= &my_null;
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
@@ -3313,7 +3313,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8");
my_bind[0].buffer_type= MYSQL_TYPE_LONG;
my_bind[0].buffer= (void *)&my_val;
my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null;
my_bind[0].is_null= &my_null;
my_val= 1;
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);