Missing casts

mkoppanen · mkoppanen · commit 5bde0d1c5eb7 · 2013-11-13T02:10:18.000+08:00
diff --git a/php_memcached.c b/php_memcached.c
@@ -1260,8 +1260,8 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
+		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);
 		}
 	}
 
@@ -1469,8 +1469,8 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
+		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);
 		}
 		MEMC_VAL_SET_USER_FLAGS(flags, ((uint32_t) udf_flags));
 	}
@@ -1612,8 +1612,8 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 	 * We use 8 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
-		if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);
+		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);
 		}
 		MEMC_VAL_SET_USER_FLAGS(flags, ((uint32_t) udf_flags));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1260,8 +1260,8 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke`
`1260`	`1260`	`* We use 8 upper bits to store user defined flags.`
`1261`	`1261`	`*/`
`1262`	`1262`	`if (udf_flags > 0) {`
`1263`		`- if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
`1264`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);`
	`1263`	`+ if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
	`1264`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);`
`1265`	`1265`	`}`
`1266`	`1266`	`}`
`1267`	`1267`
`@@ -1469,8 +1469,8 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool`
`1469`	`1469`	`* We use 8 upper bits to store user defined flags.`
`1470`	`1470`	`*/`
`1471`	`1471`	`if (udf_flags > 0) {`
`1472`		`- if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
`1473`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);`
	`1472`	`+ if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
	`1473`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);`
`1474`	`1474`	`}`
`1475`	`1475`	`MEMC_VAL_SET_USER_FLAGS(flags, ((uint32_t) udf_flags));`
`1476`	`1476`	`}`
`@@ -1612,8 +1612,8 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)`
`1612`	`1612`	`* We use 8 upper bits to store user defined flags.`
`1613`	`1613`	`*/`
`1614`	`1614`	`if (udf_flags > 0) {`
`1615`		`- if (udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
`1616`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %d", MEMC_VAL_USER_FLAGS_MAX);`
	`1615`	`+ if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {`
	`1616`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "udf_flags will be limited to %u", MEMC_VAL_USER_FLAGS_MAX);`
`1617`	`1617`	`}`
`1618`	`1618`	`MEMC_VAL_SET_USER_FLAGS(flags, ((uint32_t) udf_flags));`
`1619`	`1619`	`}`