summaryrefslogtreecommitdiff
path: root/ext/interbase/ibase_blobs.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-19 08:07:31 +0200
committerAnatol Belski <ab@php.net>2014-08-19 08:07:31 +0200
commit63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (patch)
treee561a58d6e084c5e4cbdde1f84aed16cf4724383 /ext/interbase/ibase_blobs.c
parent1e8273964fbd517a2eb9e560f9cdb4afffa0c034 (diff)
downloadphp-git-63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc.tar.gz
basic macro replacements, all at once
Diffstat (limited to 'ext/interbase/ibase_blobs.c')
-rw-r--r--ext/interbase/ibase_blobs.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index 8b8d731d7b..13265c7745 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -135,7 +135,7 @@ int _php_ibase_blob_add(zval *string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{
convert_to_string_ex(string_arg);
- for (rem_cnt = Z_STRLEN_P(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
+ for (rem_cnt = Z_STRSIZE_P(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
chunk_size = rem_cnt > USHRT_MAX ? USHRT_MAX : (unsigned short)rem_cnt;
@@ -337,9 +337,9 @@ PHP_FUNCTION(ibase_blob_get)
RETURN_FALSE;
}
- convert_to_long_ex(len_arg);
+ convert_to_int_ex(len_arg);
- if (_php_ibase_blob_get(return_value, ib_blob, Z_LVAL_P(len_arg) TSRMLS_CC) != SUCCESS) {
+ if (_php_ibase_blob_get(return_value, ib_blob, Z_IVAL_P(len_arg) TSRMLS_CC) != SUCCESS) {
RETURN_FALSE;
}
}
@@ -460,14 +460,14 @@ PHP_FUNCTION(ibase_blob_info)
array_init(return_value);
- add_index_long(return_value, 0, bl_info.total_length);
- add_assoc_long(return_value, "length", bl_info.total_length);
+ add_index_int(return_value, 0, bl_info.total_length);
+ add_assoc_int(return_value, "length", bl_info.total_length);
- add_index_long(return_value, 1, bl_info.num_segments);
- add_assoc_long(return_value, "numseg", bl_info.num_segments);
+ add_index_int(return_value, 1, bl_info.num_segments);
+ add_assoc_int(return_value, "numseg", bl_info.num_segments);
- add_index_long(return_value, 2, bl_info.max_segment);
- add_assoc_long(return_value, "maxseg", bl_info.max_segment);
+ add_index_int(return_value, 2, bl_info.max_segment);
+ add_assoc_int(return_value, "maxseg", bl_info.max_segment);
add_index_bool(return_value, 3, bl_info.bl_stream);
add_assoc_bool(return_value, "stream", bl_info.bl_stream);