Skip to content

Commit d0c5a7e

Browse files
committed
ext/mysqlnd: add casts to work around -Wassign-enum
1 parent b102df9 commit d0c5a7e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/mysqlnd/mysqlnd_ps.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s)
919919
/* Reset Long Data */
920920
for (i = 0; i < stmt->param_count; i++) {
921921
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);
923923
}
924924
}
925925
}
@@ -1148,7 +1148,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA
11481148
/* Prevent from freeing */
11491149
/* Don't update is_ref, or we will leak during conversion */
11501150
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;
11521152
}
11531153
stmt->send_types_to_server = 1;
11541154
} 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
12041204
zval_ptr_dtor(&stmt->param_bind[param_no].zv);
12051205
if (type == MYSQL_TYPE_LONG_BLOB) {
12061206
/* 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);
12081208
}
12091209
ZVAL_COPY_VALUE(&stmt->param_bind[param_no].zv, zv);
12101210
stmt->param_bind[param_no].type = type;

ext/mysqlnd/mysqlnd_ps_codec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ mysqlnd_stmt_execute_store_param_values(MYSQLND_STMT_DATA * stmt, zval * copies,
768768
break;
769769
case MYSQL_TYPE_LONG_BLOB:
770770
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);
772772
} else {
773773
/* send_long_data() not called, send empty string */
774774
*p = php_mysqlnd_net_store_length(*p, 0);

0 commit comments

Comments
 (0)