Skip to content

Commit 64bd9b7

Browse files
weltlingweltling
committed
master renames phase 1
1 parent 685f240 commit 64bd9b7

File tree

6 files changed

+115
-115
lines changed

6 files changed

+115
-115
lines changed

‎ibase_blobs.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int _php_ibase_blob_add(zval *string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{
135135

136136
convert_to_string_ex(string_arg);
137137

138-
for (rem_cnt = Z_STRSIZE_P(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
138+
for (rem_cnt = Z_STRLEN_P(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
139139

140140
chunk_size = rem_cnt > USHRT_MAX ? USHRT_MAX : (unsigned short)rem_cnt;
141141

@@ -339,7 +339,7 @@ PHP_FUNCTION(ibase_blob_get)
339339

340340
convert_to_int_ex(len_arg);
341341

342-
if (_php_ibase_blob_get(return_value, ib_blob, Z_IVAL_P(len_arg) TSRMLS_CC) != SUCCESS) {
342+
if (_php_ibase_blob_get(return_value, ib_blob, Z_LVAL_P(len_arg) TSRMLS_CC) != SUCCESS) {
343343
RETURN_FALSE;
344344
}
345345
}
@@ -460,14 +460,14 @@ PHP_FUNCTION(ibase_blob_info)
460460

461461
array_init(return_value);
462462

463-
add_index_int(return_value, 0, bl_info.total_length);
464-
add_assoc_int(return_value, "length", bl_info.total_length);
463+
add_index_long(return_value, 0, bl_info.total_length);
464+
add_assoc_long(return_value, "length", bl_info.total_length);
465465

466-
add_index_int(return_value, 1, bl_info.num_segments);
467-
add_assoc_int(return_value, "numseg", bl_info.num_segments);
466+
add_index_long(return_value, 1, bl_info.num_segments);
467+
add_assoc_long(return_value, "numseg", bl_info.num_segments);
468468

469-
add_index_int(return_value, 2, bl_info.max_segment);
470-
add_assoc_int(return_value, "maxseg", bl_info.max_segment);
469+
add_index_long(return_value, 2, bl_info.max_segment);
470+
add_assoc_long(return_value, "maxseg", bl_info.max_segment);
471471

472472
add_index_bool(return_value, 3, bl_info.bl_stream);
473473
add_assoc_bool(return_value, "stream", bl_info.bl_stream);

‎ibase_events.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ PHP_FUNCTION(ibase_wait_event)
178178
isc_event_counts(occurred_event, buffer_size, event_buffer, result_buffer);
179179
for (i = 0; i < event_count; ++i) {
180180
if (occurred_event[i]) {
181-
zend_string *result = STR_INIT(events[i], strlen(events[i]), 0);
181+
zend_string *result = zend_string_init(events[i], strlen(events[i]), 0);
182182
_php_ibase_event_free(event_buffer,result_buffer);
183183
efree(args);
184184
RETURN_STR(result);
@@ -298,7 +298,7 @@ PHP_FUNCTION(ibase_set_event_handler)
298298
}
299299

300300
convert_to_int_ex(&args[0]);
301-
link_res_id = Z_IVAL(args[0]);
301+
link_res_id = Z_LVAL(args[0]);
302302

303303
} else {
304304
/* callback, event_1 [, ... event_15]
@@ -319,10 +319,10 @@ PHP_FUNCTION(ibase_set_event_handler)
319319
/* get the callback */
320320
if (!zend_is_callable(cb_arg, 0, &cb_name TSRMLS_CC)) {
321321
_php_ibase_module_error("Callback argument %s is not a callable function" TSRMLS_CC, cb_name->val);
322-
STR_RELEASE(cb_name);
322+
zend_string_release(cb_name);
323323
RETURN_FALSE;
324324
}
325-
STR_RELEASE(cb_name);
325+
zend_string_release(cb_name);
326326

327327
/* allocate the event resource */
328328
event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0);

‎ibase_query.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "php_interbase.h"
3030
#include "php_ibase_includes.h"
3131

32-
#define ISC_INT_MIN INT_MIN
33-
#define ISC_INT_MAX INT_MAX
32+
#define ISC_LONG_MIN INT_MIN
33+
#define ISC_LONG_MAX INT_MAX
3434

3535
#define QUERY_RESULT 1
3636
#define EXECUTE_RESULT 2
@@ -498,7 +498,7 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
498498
*(short*) buf = (short) l;
499499
break;
500500
case SQL_LONG:
501-
if (l > ISC_INT_MAX || l < ISC_INT_MIN) {
501+
if (l > ISC_LONG_MAX || l < ISC_LONG_MIN) {
502502
_php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
503503
return FAILURE;
504504
}
@@ -535,26 +535,26 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
535535

536536
case SQL_SHORT:
537537
convert_to_int(val);
538-
if (Z_IVAL_P(val) > SHRT_MAX || Z_IVAL_P(val) < SHRT_MIN) {
538+
if (Z_LVAL_P(val) > SHRT_MAX || Z_LVAL_P(val) < SHRT_MIN) {
539539
_php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
540540
return FAILURE;
541541
}
542-
*(short *) buf = (short) Z_IVAL_P(val);
542+
*(short *) buf = (short) Z_LVAL_P(val);
543543
break;
544544
case SQL_LONG:
545545
convert_to_int(val);
546546
#if (SIZEOF_LONG > 4)
547-
if (Z_IVAL_P(val) > ISC_INT_MAX || Z_IVAL_P(val) < ISC_INT_MIN) {
547+
if (Z_LVAL_P(val) > ISC_LONG_MAX || Z_LVAL_P(val) < ISC_LONG_MIN) {
548548
_php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
549549
return FAILURE;
550550
}
551551
#endif
552-
*(ISC_LONG *) buf = (ISC_LONG) Z_IVAL_P(val);
552+
*(ISC_LONG *) buf = (ISC_LONG) Z_LVAL_P(val);
553553
break;
554554
case SQL_INT64:
555555
#if (SIZEOF_LONG >= 8)
556556
convert_to_int(val);
557-
*(long *) buf = Z_IVAL_P(val);
557+
*(long *) buf = Z_LVAL_P(val);
558558
#else
559559
convert_to_string(val);
560560
if (!sscanf(Z_STRVAL_P(val), "%" LL_MASK "d", &l)) {
@@ -664,7 +664,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
664664
case SQL_TIMESTAMP:
665665
case SQL_TYPE_DATE:
666666
case SQL_TYPE_TIME:
667-
force_null = (Z_STRSIZE_P(b_var) == 0);
667+
force_null = (Z_STRLEN_P(b_var) == 0);
668668
}
669669

670670
if (! force_null) break;
@@ -689,9 +689,9 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
689689
case SQL_TIMESTAMP:
690690
case SQL_TYPE_DATE:
691691
case SQL_TYPE_TIME:
692-
if (Z_TYPE_P(b_var) == IS_INT) {
692+
if (Z_TYPE_P(b_var) == IS_LONG) {
693693
struct tm *res;
694-
res = php_gmtime_r(&Z_IVAL_P(b_var), &t);
694+
res = php_gmtime_r(&Z_LVAL_P(b_var), &t);
695695
if (!res) {
696696
return FAILURE;
697697
}
@@ -734,7 +734,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
734734

735735
convert_to_string(b_var);
736736

737-
if (Z_STRSIZE_P(b_var) != BLOB_ID_LEN ||
737+
if (Z_STRLEN_P(b_var) != BLOB_ID_LEN ||
738738
!_php_ibase_string_to_quad(Z_STRVAL_P(b_var), &buf[i].val.qval)) {
739739

740740
ibase_blob ib_blob = { NULL, BLOB_INPUT };
@@ -762,7 +762,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
762762
if (Z_TYPE_P(b_var) != IS_ARRAY) {
763763
convert_to_string(b_var);
764764

765-
if (Z_STRSIZE_P(b_var) != BLOB_ID_LEN ||
765+
if (Z_STRLEN_P(b_var) != BLOB_ID_LEN ||
766766
!_php_ibase_string_to_quad(Z_STRVAL_P(b_var), &buf[i].val.qval)) {
767767

768768
_php_ibase_module_error("Parameter %d: invalid array ID" TSRMLS_CC,i+1);
@@ -799,7 +799,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
799799
/* we end up here if none of the switch cases handled the field */
800800
convert_to_string(b_var);
801801
var->sqldata = Z_STRVAL_P(b_var);
802-
var->sqllen = Z_STRSIZE_P(b_var);
802+
var->sqllen = Z_STRLEN_P(b_var);
803803
var->sqltype = SQL_TEXT;
804804
} /* for */
805805
return rv;
@@ -1022,7 +1022,7 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
10221022

10231023
if (!ib_query->out_sqlda) { /* no result set is being returned */
10241024
if (affected_rows) {
1025-
RETVAL_INT(affected_rows);
1025+
RETVAL_LONG(affected_rows);
10261026
} else {
10271027
RETVAL_TRUE;
10281028
}
@@ -1228,7 +1228,7 @@ PHP_FUNCTION(ibase_affected_rows)
12281228
trans = ib_link->tr_list->trans;
12291229
}
12301230
}
1231-
RETURN_INT(trans->affected_rows);
1231+
RETURN_LONG(trans->affected_rows);
12321232
}
12331233
/* }}} */
12341234

@@ -1281,7 +1281,7 @@ PHP_FUNCTION(ibase_num_rows)
12811281
while (result[i] != isc_info_end && i < result_size) {
12821282
short len = (short)isc_vax_integer(&result[i+1],2);
12831283
if (result[i] == isc_info_req_select_count) {
1284-
RETURN_INT(isc_vax_integer(&result[i+3],len));
1284+
RETURN_LONG(isc_vax_integer(&result[i+3],len));
12851285
}
12861286
i += len+3;
12871287
}
@@ -1354,7 +1354,7 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13541354
n = *(ISC_LONG *) data;
13551355
_sql_long:
13561356
if (scale == 0) {
1357-
ZVAL_INT(val,n);
1357+
ZVAL_LONG(val,n);
13581358
} else {
13591359
long f = (long) scales[-scale];
13601360

@@ -1396,7 +1396,7 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13961396
t.tm_zone = tzname[0];
13971397
#endif
13981398
if (flag & PHP_IBASE_UNIXTIME) {
1399-
ZVAL_INT(val, mktime(&t));
1399+
ZVAL_LONG(val, mktime(&t));
14001400
} else {
14011401
#if HAVE_STRFTIME
14021402
l = strftime(string_data, sizeof(string_data), format, &t);
@@ -1463,7 +1463,7 @@ static int _php_ibase_arr_zval(zval *ar_zval, char *data, unsigned long data_siz
14631463
if (ib_array->ar_desc.array_desc_dtype == blr_varying ||
14641464
ib_array->ar_desc.array_desc_dtype == blr_varying2) {
14651465

1466-
Z_STRSIZE_P(ar_zval) = strlen(Z_STRVAL_P(ar_zval));
1466+
Z_STRLEN_P(ar_zval) = strlen(Z_STRVAL_P(ar_zval));
14671467
}
14681468
}
14691469
return SUCCESS;
@@ -1904,9 +1904,9 @@ PHP_FUNCTION(ibase_num_fields)
19041904
}
19051905

19061906
if (sqlda == NULL) {
1907-
RETURN_INT(0);
1907+
RETURN_LONG(0);
19081908
} else {
1909-
RETURN_INT(sqlda->sqld);
1909+
RETURN_LONG(sqlda->sqld);
19101910
}
19111911
}
19121912
/* }}} */
@@ -2055,9 +2055,9 @@ PHP_FUNCTION(ibase_num_params)
20552055
ZEND_FETCH_RESOURCE(ib_query, ibase_query *, result, -1, LE_QUERY, le_query);
20562056

20572057
if (ib_query->in_sqlda == NULL) {
2058-
RETURN_INT(0);
2058+
RETURN_LONG(0);
20592059
} else {
2060-
RETURN_INT(ib_query->in_sqlda->sqld);
2060+
RETURN_LONG(ib_query->in_sqlda->sqld);
20612061
}
20622062
}
20632063
/* }}} */

‎ibase_service.c‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -67,67 +67,67 @@ void php_ibase_service_minit(INIT_FUNC_ARGS) /* {{{ */
6767
"interbase service manager handle", module_number);
6868

6969
/* backup options */
70-
REGISTER_INT_CONSTANT("IBASE_BKP_IGNORE_CHECKSUMS", isc_spb_bkp_ignore_checksums, CONST_PERSISTENT);
71-
REGISTER_INT_CONSTANT("IBASE_BKP_IGNORE_LIMBO", isc_spb_bkp_ignore_limbo, CONST_PERSISTENT);
72-
REGISTER_INT_CONSTANT("IBASE_BKP_METADATA_ONLY", isc_spb_bkp_metadata_only, CONST_PERSISTENT);
73-
REGISTER_INT_CONSTANT("IBASE_BKP_NO_GARBAGE_COLLECT", isc_spb_bkp_no_garbage_collect, CONST_PERSISTENT);
74-
REGISTER_INT_CONSTANT("IBASE_BKP_OLD_DESCRIPTIONS", isc_spb_bkp_old_descriptions, CONST_PERSISTENT);
75-
REGISTER_INT_CONSTANT("IBASE_BKP_NON_TRANSPORTABLE", isc_spb_bkp_non_transportable, CONST_PERSISTENT);
76-
REGISTER_INT_CONSTANT("IBASE_BKP_CONVERT", isc_spb_bkp_convert, CONST_PERSISTENT);
70+
REGISTER_LONG_CONSTANT("IBASE_BKP_IGNORE_CHECKSUMS", isc_spb_bkp_ignore_checksums, CONST_PERSISTENT);
71+
REGISTER_LONG_CONSTANT("IBASE_BKP_IGNORE_LIMBO", isc_spb_bkp_ignore_limbo, CONST_PERSISTENT);
72+
REGISTER_LONG_CONSTANT("IBASE_BKP_METADATA_ONLY", isc_spb_bkp_metadata_only, CONST_PERSISTENT);
73+
REGISTER_LONG_CONSTANT("IBASE_BKP_NO_GARBAGE_COLLECT", isc_spb_bkp_no_garbage_collect, CONST_PERSISTENT);
74+
REGISTER_LONG_CONSTANT("IBASE_BKP_OLD_DESCRIPTIONS", isc_spb_bkp_old_descriptions, CONST_PERSISTENT);
75+
REGISTER_LONG_CONSTANT("IBASE_BKP_NON_TRANSPORTABLE", isc_spb_bkp_non_transportable, CONST_PERSISTENT);
76+
REGISTER_LONG_CONSTANT("IBASE_BKP_CONVERT", isc_spb_bkp_convert, CONST_PERSISTENT);
7777

7878
/* restore options */
79-
REGISTER_INT_CONSTANT("IBASE_RES_DEACTIVATE_IDX", isc_spb_res_deactivate_idx, CONST_PERSISTENT);
80-
REGISTER_INT_CONSTANT("IBASE_RES_NO_SHADOW", isc_spb_res_no_shadow, CONST_PERSISTENT);
81-
REGISTER_INT_CONSTANT("IBASE_RES_NO_VALIDITY", isc_spb_res_no_validity, CONST_PERSISTENT);
82-
REGISTER_INT_CONSTANT("IBASE_RES_ONE_AT_A_TIME", isc_spb_res_one_at_a_time, CONST_PERSISTENT);
83-
REGISTER_INT_CONSTANT("IBASE_RES_REPLACE", isc_spb_res_replace, CONST_PERSISTENT);
84-
REGISTER_INT_CONSTANT("IBASE_RES_CREATE", isc_spb_res_create, CONST_PERSISTENT);
85-
REGISTER_INT_CONSTANT("IBASE_RES_USE_ALL_SPACE", isc_spb_res_use_all_space, CONST_PERSISTENT);
79+
REGISTER_LONG_CONSTANT("IBASE_RES_DEACTIVATE_IDX", isc_spb_res_deactivate_idx, CONST_PERSISTENT);
80+
REGISTER_LONG_CONSTANT("IBASE_RES_NO_SHADOW", isc_spb_res_no_shadow, CONST_PERSISTENT);
81+
REGISTER_LONG_CONSTANT("IBASE_RES_NO_VALIDITY", isc_spb_res_no_validity, CONST_PERSISTENT);
82+
REGISTER_LONG_CONSTANT("IBASE_RES_ONE_AT_A_TIME", isc_spb_res_one_at_a_time, CONST_PERSISTENT);
83+
REGISTER_LONG_CONSTANT("IBASE_RES_REPLACE", isc_spb_res_replace, CONST_PERSISTENT);
84+
REGISTER_LONG_CONSTANT("IBASE_RES_CREATE", isc_spb_res_create, CONST_PERSISTENT);
85+
REGISTER_LONG_CONSTANT("IBASE_RES_USE_ALL_SPACE", isc_spb_res_use_all_space, CONST_PERSISTENT);
8686

8787
/* manage options */
88-
REGISTER_INT_CONSTANT("IBASE_PRP_PAGE_BUFFERS", isc_spb_prp_page_buffers, CONST_PERSISTENT);
89-
REGISTER_INT_CONSTANT("IBASE_PRP_SWEEP_INTERVAL", isc_spb_prp_sweep_interval, CONST_PERSISTENT);
90-
REGISTER_INT_CONSTANT("IBASE_PRP_SHUTDOWN_DB", isc_spb_prp_shutdown_db, CONST_PERSISTENT);
91-
REGISTER_INT_CONSTANT("IBASE_PRP_DENY_NEW_TRANSACTIONS", isc_spb_prp_deny_new_transactions, CONST_PERSISTENT);
92-
REGISTER_INT_CONSTANT("IBASE_PRP_DENY_NEW_ATTACHMENTS", isc_spb_prp_deny_new_attachments, CONST_PERSISTENT);
93-
REGISTER_INT_CONSTANT("IBASE_PRP_RESERVE_SPACE", isc_spb_prp_reserve_space, CONST_PERSISTENT);
94-
REGISTER_INT_CONSTANT("IBASE_PRP_RES_USE_FULL", isc_spb_prp_res_use_full, CONST_PERSISTENT);
95-
REGISTER_INT_CONSTANT("IBASE_PRP_RES", isc_spb_prp_res, CONST_PERSISTENT);
96-
REGISTER_INT_CONSTANT("IBASE_PRP_WRITE_MODE", isc_spb_prp_write_mode, CONST_PERSISTENT);
97-
REGISTER_INT_CONSTANT("IBASE_PRP_WM_ASYNC", isc_spb_prp_wm_async, CONST_PERSISTENT);
98-
REGISTER_INT_CONSTANT("IBASE_PRP_WM_SYNC", isc_spb_prp_wm_sync, CONST_PERSISTENT);
99-
REGISTER_INT_CONSTANT("IBASE_PRP_ACCESS_MODE", isc_spb_prp_access_mode, CONST_PERSISTENT);
100-
REGISTER_INT_CONSTANT("IBASE_PRP_AM_READONLY", isc_spb_prp_am_readonly, CONST_PERSISTENT);
101-
REGISTER_INT_CONSTANT("IBASE_PRP_AM_READWRITE", isc_spb_prp_am_readwrite, CONST_PERSISTENT);
102-
REGISTER_INT_CONSTANT("IBASE_PRP_SET_SQL_DIALECT", isc_spb_prp_set_sql_dialect, CONST_PERSISTENT);
103-
REGISTER_INT_CONSTANT("IBASE_PRP_ACTIVATE", isc_spb_prp_activate, CONST_PERSISTENT);
104-
REGISTER_INT_CONSTANT("IBASE_PRP_DB_ONLINE", isc_spb_prp_db_online, CONST_PERSISTENT);
88+
REGISTER_LONG_CONSTANT("IBASE_PRP_PAGE_BUFFERS", isc_spb_prp_page_buffers, CONST_PERSISTENT);
89+
REGISTER_LONG_CONSTANT("IBASE_PRP_SWEEP_INTERVAL", isc_spb_prp_sweep_interval, CONST_PERSISTENT);
90+
REGISTER_LONG_CONSTANT("IBASE_PRP_SHUTDOWN_DB", isc_spb_prp_shutdown_db, CONST_PERSISTENT);
91+
REGISTER_LONG_CONSTANT("IBASE_PRP_DENY_NEW_TRANSACTIONS", isc_spb_prp_deny_new_transactions, CONST_PERSISTENT);
92+
REGISTER_LONG_CONSTANT("IBASE_PRP_DENY_NEW_ATTACHMENTS", isc_spb_prp_deny_new_attachments, CONST_PERSISTENT);
93+
REGISTER_LONG_CONSTANT("IBASE_PRP_RESERVE_SPACE", isc_spb_prp_reserve_space, CONST_PERSISTENT);
94+
REGISTER_LONG_CONSTANT("IBASE_PRP_RES_USE_FULL", isc_spb_prp_res_use_full, CONST_PERSISTENT);
95+
REGISTER_LONG_CONSTANT("IBASE_PRP_RES", isc_spb_prp_res, CONST_PERSISTENT);
96+
REGISTER_LONG_CONSTANT("IBASE_PRP_WRITE_MODE", isc_spb_prp_write_mode, CONST_PERSISTENT);
97+
REGISTER_LONG_CONSTANT("IBASE_PRP_WM_ASYNC", isc_spb_prp_wm_async, CONST_PERSISTENT);
98+
REGISTER_LONG_CONSTANT("IBASE_PRP_WM_SYNC", isc_spb_prp_wm_sync, CONST_PERSISTENT);
99+
REGISTER_LONG_CONSTANT("IBASE_PRP_ACCESS_MODE", isc_spb_prp_access_mode, CONST_PERSISTENT);
100+
REGISTER_LONG_CONSTANT("IBASE_PRP_AM_READONLY", isc_spb_prp_am_readonly, CONST_PERSISTENT);
101+
REGISTER_LONG_CONSTANT("IBASE_PRP_AM_READWRITE", isc_spb_prp_am_readwrite, CONST_PERSISTENT);
102+
REGISTER_LONG_CONSTANT("IBASE_PRP_SET_SQL_DIALECT", isc_spb_prp_set_sql_dialect, CONST_PERSISTENT);
103+
REGISTER_LONG_CONSTANT("IBASE_PRP_ACTIVATE", isc_spb_prp_activate, CONST_PERSISTENT);
104+
REGISTER_LONG_CONSTANT("IBASE_PRP_DB_ONLINE", isc_spb_prp_db_online, CONST_PERSISTENT);
105105

106106
/* repair options */
107-
REGISTER_INT_CONSTANT("IBASE_RPR_CHECK_DB", isc_spb_rpr_check_db, CONST_PERSISTENT);
108-
REGISTER_INT_CONSTANT("IBASE_RPR_IGNORE_CHECKSUM", isc_spb_rpr_ignore_checksum, CONST_PERSISTENT);
109-
REGISTER_INT_CONSTANT("IBASE_RPR_KILL_SHADOWS", isc_spb_rpr_kill_shadows, CONST_PERSISTENT);
110-
REGISTER_INT_CONSTANT("IBASE_RPR_MEND_DB", isc_spb_rpr_mend_db, CONST_PERSISTENT);
111-
REGISTER_INT_CONSTANT("IBASE_RPR_VALIDATE_DB", isc_spb_rpr_validate_db, CONST_PERSISTENT);
112-
REGISTER_INT_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT);
113-
REGISTER_INT_CONSTANT("IBASE_RPR_SWEEP_DB", isc_spb_rpr_sweep_db, CONST_PERSISTENT);
107+
REGISTER_LONG_CONSTANT("IBASE_RPR_CHECK_DB", isc_spb_rpr_check_db, CONST_PERSISTENT);
108+
REGISTER_LONG_CONSTANT("IBASE_RPR_IGNORE_CHECKSUM", isc_spb_rpr_ignore_checksum, CONST_PERSISTENT);
109+
REGISTER_LONG_CONSTANT("IBASE_RPR_KILL_SHADOWS", isc_spb_rpr_kill_shadows, CONST_PERSISTENT);
110+
REGISTER_LONG_CONSTANT("IBASE_RPR_MEND_DB", isc_spb_rpr_mend_db, CONST_PERSISTENT);
111+
REGISTER_LONG_CONSTANT("IBASE_RPR_VALIDATE_DB", isc_spb_rpr_validate_db, CONST_PERSISTENT);
112+
REGISTER_LONG_CONSTANT("IBASE_RPR_FULL", isc_spb_rpr_full, CONST_PERSISTENT);
113+
REGISTER_LONG_CONSTANT("IBASE_RPR_SWEEP_DB", isc_spb_rpr_sweep_db, CONST_PERSISTENT);
114114

115115
/* db info arguments */
116-
REGISTER_INT_CONSTANT("IBASE_STS_DATA_PAGES", isc_spb_sts_data_pages, CONST_PERSISTENT);
117-
REGISTER_INT_CONSTANT("IBASE_STS_DB_LOG", isc_spb_sts_db_log, CONST_PERSISTENT);
118-
REGISTER_INT_CONSTANT("IBASE_STS_HDR_PAGES", isc_spb_sts_hdr_pages, CONST_PERSISTENT);
119-
REGISTER_INT_CONSTANT("IBASE_STS_IDX_PAGES", isc_spb_sts_idx_pages, CONST_PERSISTENT);
120-
REGISTER_INT_CONSTANT("IBASE_STS_SYS_RELATIONS", isc_spb_sts_sys_relations, CONST_PERSISTENT);
116+
REGISTER_LONG_CONSTANT("IBASE_STS_DATA_PAGES", isc_spb_sts_data_pages, CONST_PERSISTENT);
117+
REGISTER_LONG_CONSTANT("IBASE_STS_DB_LOG", isc_spb_sts_db_log, CONST_PERSISTENT);
118+
REGISTER_LONG_CONSTANT("IBASE_STS_HDR_PAGES", isc_spb_sts_hdr_pages, CONST_PERSISTENT);
119+
REGISTER_LONG_CONSTANT("IBASE_STS_IDX_PAGES", isc_spb_sts_idx_pages, CONST_PERSISTENT);
120+
REGISTER_LONG_CONSTANT("IBASE_STS_SYS_RELATIONS", isc_spb_sts_sys_relations, CONST_PERSISTENT);
121121

122122
/* server info arguments */
123-
REGISTER_INT_CONSTANT("IBASE_SVC_SERVER_VERSION", isc_info_svc_server_version, CONST_PERSISTENT);
124-
REGISTER_INT_CONSTANT("IBASE_SVC_IMPLEMENTATION", isc_info_svc_implementation, CONST_PERSISTENT);
125-
REGISTER_INT_CONSTANT("IBASE_SVC_GET_ENV", isc_info_svc_get_env, CONST_PERSISTENT);
126-
REGISTER_INT_CONSTANT("IBASE_SVC_GET_ENV_LOCK", isc_info_svc_get_env_lock, CONST_PERSISTENT);
127-
REGISTER_INT_CONSTANT("IBASE_SVC_GET_ENV_MSG", isc_info_svc_get_env_msg, CONST_PERSISTENT);
128-
REGISTER_INT_CONSTANT("IBASE_SVC_USER_DBPATH", isc_info_svc_user_dbpath, CONST_PERSISTENT);
129-
REGISTER_INT_CONSTANT("IBASE_SVC_SVR_DB_INFO", isc_info_svc_svr_db_info, CONST_PERSISTENT);
130-
REGISTER_INT_CONSTANT("IBASE_SVC_GET_USERS", isc_info_svc_get_users, CONST_PERSISTENT);
123+
REGISTER_LONG_CONSTANT("IBASE_SVC_SERVER_VERSION", isc_info_svc_server_version, CONST_PERSISTENT);
124+
REGISTER_LONG_CONSTANT("IBASE_SVC_IMPLEMENTATION", isc_info_svc_implementation, CONST_PERSISTENT);
125+
REGISTER_LONG_CONSTANT("IBASE_SVC_GET_ENV", isc_info_svc_get_env, CONST_PERSISTENT);
126+
REGISTER_LONG_CONSTANT("IBASE_SVC_GET_ENV_LOCK", isc_info_svc_get_env_lock, CONST_PERSISTENT);
127+
REGISTER_LONG_CONSTANT("IBASE_SVC_GET_ENV_MSG", isc_info_svc_get_env_msg, CONST_PERSISTENT);
128+
REGISTER_LONG_CONSTANT("IBASE_SVC_USER_DBPATH", isc_info_svc_user_dbpath, CONST_PERSISTENT);
129+
REGISTER_LONG_CONSTANT("IBASE_SVC_SVR_DB_INFO", isc_info_svc_svr_db_info, CONST_PERSISTENT);
130+
REGISTER_LONG_CONSTANT("IBASE_SVC_GET_USERS", isc_info_svc_get_users, CONST_PERSISTENT);
131131
}
132132
/* }}} */
133133

@@ -343,12 +343,12 @@ static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
343343
int len;
344344

345345
case isc_spb_num_att:
346-
add_assoc_int(return_value, "attachments", isc_vax_integer(result,4));
346+
add_assoc_long(return_value, "attachments", isc_vax_integer(result,4));
347347
result += 4;
348348
break;
349349

350350
case isc_spb_num_db:
351-
add_assoc_int(return_value, "databases", isc_vax_integer(result,4));
351+
add_assoc_long(return_value, "databases", isc_vax_integer(result,4));
352352
result += 4;
353353
break;
354354

@@ -398,12 +398,12 @@ static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
398398
break;
399399

400400
case isc_spb_sec_userid:
401-
add_assoc_int(&user, "user_id", isc_vax_integer(result, 4));
401+
add_assoc_long(&user, "user_id", isc_vax_integer(result, 4));
402402
result += 4;
403403
break;
404404

405405
case isc_spb_sec_groupid:
406-
add_assoc_int(&user, "group_id", isc_vax_integer(result, 4));
406+
add_assoc_long(&user, "group_id", isc_vax_integer(result, 4));
407407
result += 4;
408408
break;
409409
}

0 commit comments

Comments
 (0)