projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix [-Wformat=]
[m6w6/ext-pq]
/
src
/
php_pqres.c
diff --git
a/src/php_pqres.c
b/src/php_pqres.c
index e9de4631dc46ccf8d7c65aea2e38d9b90f5f25a8..e3986c529121650e200e3869273689ad1e8017b6 100644
(file)
--- a/
src/php_pqres.c
+++ b/
src/php_pqres.c
@@
-398,24
+398,24
@@
static zend_object_iterator_funcs php_pqres_iterator_funcs = {
#endif
};
#endif
};
-static inline ZEND_RESULT_CODE php_pqres_count_elements_ex(zend_object *object, long *count)
+static inline ZEND_RESULT_CODE php_pqres_count_elements_ex(zend_object *object,
zend_
long *count)
{
php_pqres_object_t *obj = PHP_PQ_OBJ(NULL, object);
if (!obj->intern) {
return FAILURE;
} else {
{
php_pqres_object_t *obj = PHP_PQ_OBJ(NULL, object);
if (!obj->intern) {
return FAILURE;
} else {
- *count = (long) PQntuples(obj->intern->res);
+ *count = (
zend_
long) PQntuples(obj->intern->res);
return SUCCESS;
}
}
#if PHP_VERSION_ID >= 80000
return SUCCESS;
}
}
#if PHP_VERSION_ID >= 80000
-static ZEND_RESULT_CODE php_pqres_count_elements(zend_object *object, long *count)
+static ZEND_RESULT_CODE php_pqres_count_elements(zend_object *object,
zend_
long *count)
{
return php_pqres_count_elements_ex(object, count);
}
#else
{
return php_pqres_count_elements_ex(object, count);
}
#else
-static ZEND_RESULT_CODE php_pqres_count_elements(zval *object, long *count)
+static ZEND_RESULT_CODE php_pqres_count_elements(zval *object,
zend_
long *count)
{
return php_pqres_count_elements_ex(Z_OBJ_P(object), count);
}
{
return php_pqres_count_elements_ex(Z_OBJ_P(object), count);
}
@@
-736,7
+736,7
@@
static ZEND_RESULT_CODE column_nn(php_pqres_object_t *obj, zval *zcol, php_pqres
}
if (!col->name) {
}
if (!col->name) {
- php_error_docref(NULL, E_WARNING, "Failed to find column at index
%ld"
, index);
+ php_error_docref(NULL, E_WARNING, "Failed to find column at index
" ZEND_LONG_FMT
, index);
return FAILURE;
}
if (col->num == -1) {
return FAILURE;
}
if (col->num == -1) {
@@
-791,7
+791,7
@@
static int apply_bound(zval *zbound, int argc, va_list argv, zend_hash_key *key)
ZEND_RESULT_CODE *rv = va_arg(argv, ZEND_RESULT_CODE *);
if (!(zvalue = zend_hash_index_find(Z_ARRVAL_P(zrow), key->h))) {
ZEND_RESULT_CODE *rv = va_arg(argv, ZEND_RESULT_CODE *);
if (!(zvalue = zend_hash_index_find(Z_ARRVAL_P(zrow), key->h))) {
- php_error_docref(NULL, E_WARNING, "Failed to find column ad index
%lu"
, key->h);
+ php_error_docref(NULL, E_WARNING, "Failed to find column ad index
" ZEND_ULONG_FMT
, key->h);
*rv = FAILURE;
return ZEND_HASH_APPLY_STOP;
} else {
*rv = FAILURE;
return ZEND_HASH_APPLY_STOP;
} else {