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

Author: MaxKellermann

ext/ffi/ffi.c

@@ -261,7 +261,7 @@ static zend_object *zend_ffi_cdata_new(zend_class_entry *class_type) /* {{{ */
 
 	cdata->type = NULL;
 	cdata->ptr = NULL;
-	cdata->flags = 0;
+	cdata->flags = (zend_ffi_flags)0;
 
 	return &cdata->std;
 }
@@ -1110,7 +1110,7 @@ static zval *zend_ffi_cdata_get(zend_object *obj, zend_string *member, int read_
 		return &EG(uninitialized_zval);
 	}
 
-	zend_ffi_cdata_to_zval(cdata, cdata->ptr, type, BP_VAR_R, rv, 0, 0, 0);
+	zend_ffi_cdata_to_zval(cdata, cdata->ptr, type, BP_VAR_R, rv, (zend_ffi_flags)0, 0, 0);
 	return rv;
 }
 /* }}} */
@@ -2833,7 +2833,7 @@ static ZEND_FUNCTION(ffi_trampoline) /* {{{ */
 	}
 
 	if (ZEND_FFI_TYPE(type->func.ret_type)->kind != ZEND_FFI_TYPE_VOID) {
-		zend_ffi_cdata_to_zval(NULL, ret, ZEND_FFI_TYPE(type->func.ret_type), BP_VAR_R, return_value, 0, 1, 0);
+		zend_ffi_cdata_to_zval(NULL, ret, ZEND_FFI_TYPE(type->func.ret_type), BP_VAR_R, return_value, (zend_ffi_flags)0, 1, 0);
 	} else {
 		ZVAL_NULL(return_value);
 	}
@@ -3736,7 +3736,6 @@ ZEND_METHOD(FFI, new) /* {{{ */
 	bool owned = 1;
 	bool persistent = 0;
 	bool is_const = 0;
-	zend_ffi_flags flags = ZEND_FFI_FLAG_OWNED;
 
 	ZEND_FFI_VALIDATE_API_RESTRICTION();
 	ZEND_PARSE_PARAMETERS_START(1, 3)
@@ -3746,9 +3745,7 @@ ZEND_METHOD(FFI, new) /* {{{ */
 		Z_PARAM_BOOL(persistent)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!owned) {
-		flags &= ~ZEND_FFI_FLAG_OWNED;
-	}
+	zend_ffi_flags flags = owned ? ZEND_FFI_FLAG_OWNED : 0;
 
 	if (persistent) {
 		flags |= ZEND_FFI_FLAG_PERSISTENT;
@@ -3871,7 +3868,7 @@ ZEND_METHOD(FFI, free) /* {{{ */
 	} else if (!(cdata->flags & ZEND_FFI_FLAG_OWNED)) {
 		pefree(cdata->ptr, cdata->flags & ZEND_FFI_FLAG_PERSISTENT);
 		cdata->ptr = NULL;
-		cdata->flags &= ~(ZEND_FFI_FLAG_OWNED|ZEND_FFI_FLAG_PERSISTENT);
+		cdata->flags = (zend_ffi_flags)(cdata->flags & ~(ZEND_FFI_FLAG_OWNED|ZEND_FFI_FLAG_PERSISTENT));
 		cdata->std.handlers = &zend_ffi_cdata_free_handlers;
 	} else {
 		zend_throw_error(zend_ffi_exception_ce, "free() non a C pointer");
@@ -4045,7 +4042,7 @@ ZEND_METHOD(FFI, cast) /* {{{ */
 	if (old_cdata->flags & ZEND_FFI_FLAG_OWNED) {
 		if (GC_REFCOUNT(&old_cdata->std) == 1 && Z_REFCOUNT_P(arg) == 1) {
 			/* transfer ownership */
-			old_cdata->flags &= ~ZEND_FFI_FLAG_OWNED;
+			old_cdata->flags = (zend_ffi_flags)(old_cdata->flags & ~ZEND_FFI_FLAG_OWNED);
 			cdata->flags |= ZEND_FFI_FLAG_OWNED;
 		} else {
 			//???zend_throw_error(zend_ffi_exception_ce, "Attempt to cast owned C pointer");
@@ -4282,7 +4279,7 @@ ZEND_METHOD(FFI, addr) /* {{{ */
 		}
 		if (cdata->flags & ZEND_FFI_FLAG_OWNED) {
 			/* transfer ownership */
-			cdata->flags &= ~ZEND_FFI_FLAG_OWNED;
+			cdata->flags = (zend_ffi_flags)(cdata->flags & ~ZEND_FFI_FLAG_OWNED);
 			new_cdata->flags |= ZEND_FFI_FLAG_OWNED;
 		}
 	}