Fixed compile warnings

zxcvdavid · zxcvdavid · commit 3f3e34040ae1 · 2015-03-09T21:25:43.000+08:00
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c
@@ -99,7 +99,7 @@ PHPDBG_API char* phpdbg_param_tostring(const phpdbg_param_t *param, char **point
 		break;
 
 		case ADDR_PARAM:
-			asprintf(pointer, "%#llx", param->addr);
+			asprintf(pointer, ZEND_ULONG_FMT, param->addr);
 		break;
 
 		case NUMERIC_PARAM:
@@ -329,7 +329,7 @@ PHPDBG_API void phpdbg_param_debug(const phpdbg_param_t *param, const char *msg)
 			break;
 
 			case ADDR_PARAM:
-				fprintf(stderr, "%s ADDR_PARAM(%llu)\n", msg, param->addr);
+				fprintf(stderr, "%s ADDR_PARAM(" ZEND_ULONG_FMT ")\n", msg, param->addr);
 			break;
 
 			case NUMERIC_FILE_PARAM:
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
@@ -60,7 +60,7 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t
 					zend_hash_index_update_mem(vars, (zend_ulong) ops->vars - op->var, &id, sizeof(zend_ulong));
 				}
 			}
-			asprintf(&decode, "@%llu", id);
+			asprintf(&decode, "@" ZEND_ULONG_FMT, id);
 		} break;
 
 		case IS_CONST:
@@ -91,7 +91,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
 
 	case ZEND_JMPZNZ:
 			decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars);
-			asprintf(&decode[2], "J%u or J%llu", op->op2.opline_num, op->extended_value);
+			asprintf(&decode[2], "J%u or J%" PRIu32, op->op2.opline_num, op->extended_value);
 		goto result;
 
 	case ZEND_JMPZ:
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
@@ -332,7 +332,7 @@ static void phpdbg_delete_ht_watchpoints_recursive(phpdbg_watchpoint_t *watch) {
 		if (strkey) {
 			str_len = asprintf(&str, "%.*s%s%s%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", phpdbg_get_property_key(strkey->val), (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
 		} else {
-			str_len = asprintf(&str, "%.*s%s%lli%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
+			str_len = asprintf(&str, "%.*s%s" ZEND_LONG_FMT "%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");
 		}
 
 		if ((watchpoint = zend_hash_str_find_ptr(&PHPDBG_G(watchpoints), str, str_len))) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ static inline char phpdbg_decode_op(zend_op_array ops, znode_op *op, uint32_t`
`60`	`60`	`zend_hash_index_update_mem(vars, (zend_ulong) ops->vars - op->var, &id, sizeof(zend_ulong));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`- asprintf(&decode, "@%llu", id);`
	`63`	`+ asprintf(&decode, "@" ZEND_ULONG_FMT, id);`
`64`	`64`	`} break;`
`65`	`65`
`66`	`66`	`case IS_CONST:`
`@@ -91,7 +91,7 @@ char phpdbg_decode_opline(zend_op_array ops, zend_op op, HashTable vars) /*{`
`91`	`91`
`92`	`92`	`case ZEND_JMPZNZ:`
`93`	`93`	`decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars);`
`94`		`- asprintf(&decode[2], "J%u or J%llu", op->op2.opline_num, op->extended_value);`
	`94`	`+ asprintf(&decode[2], "J%u or J%" PRIu32, op->op2.opline_num, op->extended_value);`
`95`	`95`	`goto result;`
`96`	`96`
`97`	`97`	`case ZEND_JMPZ:`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ static void phpdbg_delete_ht_watchpoints_recursive(phpdbg_watchpoint_t *watch) {`
`332`	`332`	`if (strkey) {`
`333`	`333`	`str_len = asprintf(&str, "%.*s%s%s%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", phpdbg_get_property_key(strkey->val), (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");`
`334`	`334`	`} else {`
`335`		`- str_len = asprintf(&str, "%.*s%s%lli%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");`
	`335`	`+ str_len = asprintf(&str, "%.*s%s" ZEND_LONG_FMT "%s", (int) watch->str_len, watch->str, (watch->flags & PHPDBG_WATCH_ARRAY) ? "[" : "->", numkey, (watch->flags & PHPDBG_WATCH_ARRAY) ? "]" : "");`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`if ((watchpoint = zend_hash_str_find_ptr(&PHPDBG_G(watchpoints), str, str_len))) {`