Commit d0c5a7e

committed

ext/mysqlnd: add casts to work around -Wassign-enum

1 parent b102df9 commit d0c5a7eCopy full SHA for d0c5a7e

File tree

2 files changed

-4

lines changed

ext/mysqlnd
- mysqlnd_ps.c
- mysqlnd_ps_codec.c

2 files changed

-4

lines changed

`‎ext/mysqlnd/mysqlnd_ps.c‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s)`
`919`	`919`	`/* Reset Long Data */`
`920`	`920`	`for (i = 0; i < stmt->param_count; i++) {`
`921`	`921`	`if (stmt->param_bind[i].flags & MYSQLND_PARAM_BIND_BLOB_USED) {`
`922`		`- stmt->param_bind[i].flags &= ~MYSQLND_PARAM_BIND_BLOB_USED;`
	`922`	`+ stmt->param_bind[i].flags = (enum_param_bind_flags)(stmt->param_bind[i].flags&~MYSQLND_PARAM_BIND_BLOB_USED);`
`923`	`923`	`}`
`924`	`924`	`}`
`925`	`925`	`}`
`@@ -1148,7 +1148,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA`
`1148`	`1148`	`/* Prevent from freeing */`
`1149`	`1149`	`/* Don't update is_ref, or we will leak during conversion */`
`1150`	`1150`	`Z_TRY_ADDREF(stmt->param_bind[i].zv);`
`1151`		`- stmt->param_bind[i].flags = 0;`
	`1151`	`+ stmt->param_bind[i].flags = (enum_param_bind_flags)0;`
`1152`	`1152`	`}`
`1153`	`1153`	`stmt->send_types_to_server = 1;`
`1154`	`1154`	`} else if (param_bind && param_bind != stmt->param_bind) {`
`@@ -1204,7 +1204,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne`
`1204`	`1204`	`zval_ptr_dtor(&stmt->param_bind[param_no].zv);`
`1205`	`1205`	`if (type == MYSQL_TYPE_LONG_BLOB) {`
`1206`	`1206`	`/* The client will use stmt_send_long_data */`
`1207`		`- stmt->param_bind[param_no].flags &= ~MYSQLND_PARAM_BIND_BLOB_USED;`
	`1207`	`+ stmt->param_bind[param_no].flags = (enum_param_bind_flags)(stmt->param_bind[param_no].flags&~MYSQLND_PARAM_BIND_BLOB_USED);`
`1208`	`1208`	`}`
`1209`	`1209`	`ZVAL_COPY_VALUE(&stmt->param_bind[param_no].zv, zv);`
`1210`	`1210`	`stmt->param_bind[param_no].type = type;`

`‎ext/mysqlnd/mysqlnd_ps_codec.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ mysqlnd_stmt_execute_store_param_values(MYSQLND_STMT_DATA * stmt, zval * copies,`
`768`	`768`	`break;`
`769`	`769`	`case MYSQL_TYPE_LONG_BLOB:`
`770`	`770`	`if (stmt->param_bind[i].flags & MYSQLND_PARAM_BIND_BLOB_USED) {`
`771`		`- stmt->param_bind[i].flags &= ~MYSQLND_PARAM_BIND_BLOB_USED;`
	`771`	`+ stmt->param_bind[i].flags = (enum_param_bind_flags)(stmt->param_bind[i].flags&~MYSQLND_PARAM_BIND_BLOB_USED);`
`772`	`772`	`} else {`
`773`	`773`	`/* send_long_data() not called, send empty string */`
`774`	`774`	`p = php_mysqlnd_net_store_length(p, 0);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d0c5a7e

File tree

2 files changed

2 files changed

`‎ext/mysqlnd/mysqlnd_ps.c‎`

`‎ext/mysqlnd/mysqlnd_ps_codec.c‎`

0 commit comments