com php-src: integrated %pd into ext/spl: ext/spl/spl_array .c ext/spl/spl_directory.c ext/spl/spl_dllist.c ext/spl/spl_iterators.c
ext/spl/spl_observer.c
| From: | Anatol Belski | Date: | Thu, 05 Dec 2013 12:28:22 +0000 |
| Subject: | com php-src: integrated %pd into ext/spl: ext/spl/spl_array .c ext/spl/spl_directory.c ext/spl/spl_dllist.c ext/spl/spl_iterators.c ext/spl/spl_observer.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74257@lists.php.net to get a copy of this message | ||
Commit: e8815370891e94de8a88af9e656a82eed968c084
Author: Anatol Belski <ab@php.net> Thu, 5 Dec 2013 13:28:22 +0100
Parents: 122805100a45b396d2849aa61c222851beca5a3e
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e8815370891e94de8a88af9e656a82eed968c084
Log:
integrated %pd into ext/spl
Changed paths:
M ext/spl/spl_array.c
M ext/spl/spl_directory.c
M ext/spl/spl_dllist.c
M ext/spl/spl_iterators.c
M ext/spl/spl_observer.c
Diff:
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index a9280c5..ca91250 100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -339,7 +339,7 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object,
}
return retval;
case IS_RESOURCE:
- zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)",
Z_LVAL_P(offset), Z_LVAL_P(offset));
+ zend_error(E_STRICT, "Resource ID#%pd used as offset, casting to integer (%pd)",
Z_LVAL_P(offset), Z_LVAL_P(offset));
case IS_DOUBLE:
case IS_BOOL:
case IS_LONG:
@@ -351,13 +351,13 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval
*object,
if (zend_hash_index_find(ht, index, (void **) &retval) == FAILURE) {
switch (type) {
case BP_VAR_R:
- zend_error(E_NOTICE, "Undefined offset: %ld", index);
+ zend_error(E_NOTICE, "Undefined offset: %pd", index);
case BP_VAR_UNSET:
case BP_VAR_IS:
retval = &EG(uninitialized_zval_ptr);
break;
case BP_VAR_RW:
- zend_error(E_NOTICE, "Undefined offset: %ld", index);
+ zend_error(E_NOTICE, "Undefined offset: %pd", index);
case BP_VAR_W: {
zval *value;
ALLOC_INIT_ZVAL(value);
@@ -574,7 +574,7 @@ static void spl_array_unset_dimension_ex(int check_inherited, zval *object, zval
return;
}
if (zend_hash_index_del(ht, index) == FAILURE) {
- zend_error(E_NOTICE,"Undefined offset: %ld", Z_LVAL_P(offset));
+ zend_error(E_NOTICE,"Undefined offset: %pd", Z_LVAL_P(offset));
}
break;
default:
@@ -1361,7 +1361,7 @@ SPL_METHOD(Array, seek)
return; /* ok */
}
}
- zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Seek position %ld is out
of range", opos);
+ zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Seek position %pd is out
of range", opos);
} /* }}} */
int static spl_array_object_count_elements_helper(spl_array_object *intern, php_int_t *count
TSRMLS_DC) /* {{{ */
@@ -1808,7 +1808,7 @@ SPL_METHOD(Array, unserialize)
outexcept:
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
- zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset "
ZEND_INT_FMT " of " ZEND_UINT_FMT " bytes", (php_int_t)((char*)p - buf),
buf_len);
+ zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset %pd of
%pu bytes", (php_int_t)((char*)p - buf), buf_len);
return;
} /* }}} */
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 019ec44..7e83d44 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2356,7 +2356,7 @@ SPL_METHOD(SplTempFileObject, __construct)
intern->file_name = "php://memory";
intern->file_name_len = 12;
} else if (ZEND_NUM_ARGS()) {
- intern->file_name_len = slprintf(tmp_fname, sizeof(tmp_fname),
"php://temp/maxmemory:%ld", max_memory);
+ intern->file_name_len = slprintf(tmp_fname, sizeof(tmp_fname),
"php://temp/maxmemory:%pd", max_memory);
intern->file_name = tmp_fname;
} else {
intern->file_name = "php://temp";
@@ -2885,7 +2885,7 @@ SPL_METHOD(SplFileObject, seek)
return;
}
if (line_pos < 0) {
- zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Can't seek file %s to
negative line %ld", intern->file_name, line_pos);
+ zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Can't seek file %s to
negative line %pd", intern->file_name, line_pos);
RETURN_FALSE;
}
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index 0681aba..70bd091 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -1229,7 +1229,7 @@ SPL_METHOD(SplDoublyLinkedList, unserialize)
error:
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
- zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset "
ZEND_INT_FMT " of " ZEND_UINT_FMT " bytes", (php_int_t)((char*)p - buf),
buf_len);
+ zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset %pd of
%pu bytes", (php_int_t)((char*)p - buf), buf_len);
return;
} /* }}} */
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 2a975ae...29efd1a 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1485,7 +1485,7 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS,
z
return NULL;
}
if (mode < 0 || mode >= REGIT_MODE_MAX) {
- zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "Illegal mode
%ld", mode);
+ zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "Illegal mode
%pd", mode);
zend_restore_error_handling(&error_handling TSRMLS_CC);
return NULL;
}
@@ -2105,7 +2105,7 @@ SPL_METHOD(RegexIterator, setMode)
}
if (mode < 0 || mode >= REGIT_MODE_MAX) {
- zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "Illegal mode
%ld", mode);
+ zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "Illegal mode
%pd", mode);
return;/* NULL */
}
@@ -2425,11 +2425,11 @@ static inline void spl_limit_it_seek(spl_dual_it_object *intern, php_int_t
pos T
spl_dual_it_free(intern TSRMLS_CC);
if (pos < intern->u.limit.offset) {
- zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which
is below the offset %ld", pos, intern->u.limit.offset);
+ zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %pd which
is below the offset %pd", pos, intern->u.limit.offset);
return;
}
if (pos >= intern->u.limit.offset + intern->u.limit.count &&
intern->u.limit.count != -1) {
- zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %ld which
is behind offset %ld plus count %ld", pos, intern->u.limit.offset,
intern->u.limit.count);
+ zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Cannot seek to %pd which
is behind offset %pd plus count %pd", pos, intern->u.limit.offset,
intern->u.limit.count);
return;
}
if (pos != intern->current.pos && instanceof_function(intern->inner.ce,
spl_ce_SeekableIterator TSRMLS_CC)) {
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 89f40af..a8392c8 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -924,7 +924,7 @@ outexcept:
zval_ptr_dtor(&pcount);
}
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
- zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset "
ZEND_INT_FMT " of " ZEND_UINT_FMT " bytes", (php_int_t)((char*)p - buf),
buf_len);
+ zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset %pd of
%pu bytes", (php_int_t)((char*)p - buf), buf_len);
return;
} /* }}} */