Skip to content

Commit b7e4a8e

Browse files
alcaeusalcaeus
committed
PHPC-1442: Remove obsolete macros from phongo_compat.h
1 parent c0e2074 commit b7e4a8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+285
-344
lines changed

‎phongo_compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRML
2121
{
2222
if (EG(exception)) {
2323
zval ex;
24-
EXCEPTION_P(EG(exception), ex);
24+
ZVAL_OBJ(&ex, EG(exception));
2525
zend_update_property(Z_OBJCE(ex), &ex, prop, prop_len, value);
2626
}
2727
}

‎phongo_compat.h

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,14 @@
5858
#define PHONGO_BREAK_INTENTIONALLY_MISSING
5959
#endif
6060

61-
#define phongo_char zend_string
62-
#define phongo_long zend_long
6361
#if SIZEOF_ZEND_LONG == 8
6462
#define PHONGO_LONG_FORMAT PRId64
6563
#elif SIZEOF_ZEND_LONG == 4
6664
#define PHONGO_LONG_FORMAT PRId32
6765
#else
6866
#error Unsupported architecture (integers are neither 32-bit nor 64-bit)
6967
#endif
70-
#define SIZEOF_PHONGO_LONG SIZEOF_ZEND_LONG
71-
#define phongo_create_object_retval zend_object*
72-
#define phongo_get_gc_table zval**
7368
#define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t*) ecalloc(1, sizeof(_obj_t) + zend_object_properties_size(_class_type))
74-
#define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data)
75-
#define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
76-
#define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
7769
#define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), (char*) (_value));
7870
#define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), (char*) (_value), _len);
7971
#define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, (char*) (_value), _value_len);
@@ -96,28 +88,20 @@
9688
ADD_ASSOC_ZVAL_EX((_zv), (_key), &z_int); \
9789
} while (0)
9890
#define ADD_NEXT_INDEX_STRINGL(_zv, _value, _len) add_next_index_stringl(_zv, _value, _len);
99-
#define phongo_free_object_arg zend_object
100-
#define phongo_zpp_char_len size_t
101-
#define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
102-
#define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
103-
#define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen)
104-
#define PHONGO_RETVAL_STRING(s) RETVAL_STRING(s)
105-
#define PHONGO_RETURN_STRING(s) RETURN_STRING(s)
106-
#define PHONGO_RETVAL_SMART_STR(val) PHONGO_RETVAL_STRINGL(ZSTR_VAL((val).s), ZSTR_LEN((val).s));
107-
#define ZVAL_RETVAL_TYPE zval
91+
#define PHONGO_RETVAL_SMART_STR(val) RETVAL_STRINGL(ZSTR_VAL((val).s), ZSTR_LEN((val).s));
10892
#define ZVAL_STATIC_INIT \
10993
{ \
11094
{ \
11195
0 \
11296
} \
11397
}
11498

115-
#if SIZEOF_PHONGO_LONG == 8
99+
#if SIZEOF_ZEND_LONG == 8
116100
#define ADD_INDEX_INT64(_zv, _index, _value) add_index_long((_zv), (_index), (_value))
117101
#define ADD_NEXT_INDEX_INT64(_zv, _value) add_next_index_long((_zv), (_value))
118102
#define ADD_ASSOC_INT64(_zv, _key, _value) add_assoc_long((_zv), (_key), (_value))
119103
#define ZVAL_INT64(_zv, _value) ZVAL_LONG((_zv), (_value))
120-
#elif SIZEOF_PHONGO_LONG == 4
104+
#elif SIZEOF_ZEND_LONG == 4
121105
#define ADD_INDEX_INT64(_zv, _index, _value) \
122106
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
123107
zval zchild; \
@@ -148,9 +132,9 @@
148132
} else { \
149133
ZVAL_LONG((_zv), (_value)); \
150134
}
151-
#else /* SIZEOF_PHONGO_LONG != 8 && SIZEOF_PHONGO_LONG != 4 */
135+
#else /* SIZEOF_ZEND_LONG != 8 && SIZEOF_ZEND_LONG != 4 */
152136
#error Unsupported architecture (integers are neither 32-bit nor 64-bit)
153-
#endif /* SIZEOF_PHONGO_LONG */
137+
#endif /* SIZEOF_ZEND_LONG */
154138

155139
void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC);
156140
zend_bool php_phongo_zend_hash_apply_protection_begin(HashTable* ht);

‎php_bson.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ typedef struct {
7676
} php_phongo_bson_typemap;
7777

7878
typedef struct {
79-
ZVAL_RETVAL_TYPE zchild;
79+
zval zchild;
8080
php_phongo_bson_typemap map;
8181
zend_class_entry* odm;
8282
bool is_visiting_array;

‎php_phongo.c

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,9 @@ static void php_phongo_log(mongoc_log_level_t log_level, const char* log_domain,
253253
{
254254
struct timeval tv;
255255
time_t t;
256-
phongo_long tu;
257-
phongo_char* dt;
256+
zend_long tu;
257+
zend_string* dt;
258258

259-
PHONGO_TSRMLS_FETCH_FROM_CTX(user_data);
260259
(void) user_data;
261260

262261
gettimeofday(&tv, NULL);
@@ -663,7 +662,7 @@ static bool phongo_parse_write_concern(zval* options, bson_t* mongoc_opts, zval*
663662
return true;
664663
}
665664

666-
bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, php_phongo_bulkwrite_t* bulk_write, zval* options, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC) /* {{{ */
665+
bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, php_phongo_bulkwrite_t* bulk_write, zval* options, uint32_t server_id, zval* return_value TSRMLS_DC) /* {{{ */
667666
{
668667
bson_error_t error = { 0 };
669668
int success;
@@ -721,12 +720,6 @@ bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, p
721720
success = mongoc_bulk_operation_execute(bulk, &reply, &error);
722721
bulk_write->executed = true;
723722

724-
/* Write succeeded and the user doesn't care for the results */
725-
if (success && !return_value_used) {
726-
bson_destroy(&reply);
727-
return true;
728-
}
729-
730723
writeresult = phongo_writeresult_init(return_value, &reply, client, mongoc_bulk_operation_get_hint(bulk) TSRMLS_CC);
731724
writeresult->write_concern = mongoc_write_concern_copy(write_concern);
732725

@@ -794,7 +787,7 @@ bool phongo_cursor_advance_and_check_for_error(mongoc_cursor_t* cursor TSRMLS_DC
794787
return true;
795788
} /* }}} */
796789

797-
bool phongo_execute_query(mongoc_client_t* client, const char* namespace, zval* zquery, zval* options, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC) /* {{{ */
790+
bool phongo_execute_query(mongoc_client_t* client, const char* namespace, zval* zquery, zval* options, uint32_t server_id, zval* return_value TSRMLS_DC) /* {{{ */
798791
{
799792
const php_phongo_query_t* query;
800793
bson_t opts = BSON_INITIALIZER;
@@ -856,11 +849,6 @@ bool phongo_execute_query(mongoc_client_t* client, const char* namespace, zval*
856849
return false;
857850
}
858851

859-
if (!return_value_used) {
860-
mongoc_cursor_destroy(cursor);
861-
return true;
862-
}
863-
864852
phongo_cursor_init_for_query(return_value, client, cursor, namespace, zquery, zreadPreference, zsession TSRMLS_CC);
865853

866854
return true;
@@ -897,7 +885,7 @@ static zval* phongo_create_implicit_session(mongoc_client_t* client TSRMLS_DC) /
897885
return zsession;
898886
} /* }}} */
899887

900-
bool phongo_execute_command(mongoc_client_t* client, php_phongo_command_type_t type, const char* db, zval* zcommand, zval* options, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC) /* {{{ */
888+
bool phongo_execute_command(mongoc_client_t* client, php_phongo_command_type_t type, const char* db, zval* zcommand, zval* options, uint32_t server_id, zval* return_value TSRMLS_DC) /* {{{ */
901889
{
902890
const php_phongo_command_t* command;
903891
bson_iter_t iter;
@@ -1003,10 +991,6 @@ bool phongo_execute_command(mongoc_client_t* client, php_phongo_command_type_t t
1003991
goto cleanup;
1004992
}
1005993

1006-
if (!return_value_used) {
1007-
goto cleanup;
1008-
}
1009-
1010994
/* According to mongoc_cursor_new_from_command_reply_with_opts(), the reply
1011995
* bson_t is ultimately destroyed on both success and failure. */
1012996
if (bson_iter_init_find(&iter, &reply, "cursor") && BSON_ITER_HOLDS_DOCUMENT(&iter)) {
@@ -1165,7 +1149,7 @@ bool php_phongo_server_to_zval(zval* retval, mongoc_server_description_t* sd) /*
11651149

11661150
ADD_ASSOC_ZVAL_EX(retval, "last_is_master", &state.zchild);
11671151
}
1168-
ADD_ASSOC_LONG_EX(retval, "round_trip_time", (phongo_long) mongoc_server_description_round_trip_time(sd));
1152+
ADD_ASSOC_LONG_EX(retval, "round_trip_time", (zend_long) mongoc_server_description_round_trip_time(sd));
11691153

11701154
return true;
11711155
} /* }}} */
@@ -3113,7 +3097,7 @@ void phongo_manager_init(php_phongo_manager_t* manager, const char* uri_string,
31133097
#endif
31143098
} /* }}} */
31153099

3116-
bool php_phongo_parse_int64(int64_t* retval, const char* data, phongo_zpp_char_len data_len) /* {{{ */
3100+
bool php_phongo_parse_int64(int64_t* retval, const char* data, size_t data_len) /* {{{ */
31173101
{
31183102
int64_t value;
31193103
char* endptr = NULL;
@@ -3200,7 +3184,7 @@ ZEND_INI_MH(OnUpdateDebug)
32003184
int fd = -1;
32013185
char* prefix;
32023186
int len;
3203-
phongo_char* filename;
3187+
zend_string* filename;
32043188

32053189
time(&t);
32063190
len = spprintf(&prefix, 0, "PHONGO-%ld", t);

‎php_phongo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ void phongo_session_init(zval* return_value, mongoc_client_session_t* client_ses
116116
void phongo_readconcern_init(zval* return_value, const mongoc_read_concern_t* read_concern TSRMLS_DC);
117117
void phongo_readpreference_init(zval* return_value, const mongoc_read_prefs_t* read_prefs TSRMLS_DC);
118118
void phongo_writeconcern_init(zval* return_value, const mongoc_write_concern_t* write_concern TSRMLS_DC);
119-
bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, php_phongo_bulkwrite_t* bulk_write, zval* zwriteConcern, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC);
120-
bool phongo_execute_command(mongoc_client_t* client, php_phongo_command_type_t type, const char* db, zval* zcommand, zval* zreadPreference, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC);
121-
bool phongo_execute_query(mongoc_client_t* client, const char* namespace, zval* zquery, zval* zreadPreference, uint32_t server_id, zval* return_value, int return_value_used TSRMLS_DC);
119+
bool phongo_execute_bulk_write(mongoc_client_t* client, const char* namespace, php_phongo_bulkwrite_t* bulk_write, zval* zwriteConcern, uint32_t server_id, zval* return_value TSRMLS_DC);
120+
bool phongo_execute_command(mongoc_client_t* client, php_phongo_command_type_t type, const char* db, zval* zcommand, zval* zreadPreference, uint32_t server_id, zval* return_value TSRMLS_DC);
121+
bool phongo_execute_query(mongoc_client_t* client, const char* namespace, zval* zquery, zval* zreadPreference, uint32_t server_id, zval* return_value TSRMLS_DC);
122122

123123
bool phongo_cursor_advance_and_check_for_error(mongoc_cursor_t* cursor TSRMLS_DC);
124124

@@ -145,7 +145,7 @@ void php_phongo_cursor_to_zval(zval* retval, const mongoc_cursor_t* cursor);
145145
void phongo_manager_init(php_phongo_manager_t* manager, const char* uri_string, zval* options, zval* driverOptions TSRMLS_DC);
146146
int php_phongo_set_monitoring_callbacks(mongoc_client_t* client);
147147

148-
bool php_phongo_parse_int64(int64_t* retval, const char* data, phongo_zpp_char_len data_len);
148+
bool php_phongo_parse_int64(int64_t* retval, const char* data, size_t data_len);
149149

150150
void phongo_clientencryption_create_datakey(php_phongo_clientencryption_t* clientencryption, zval* return_value, char* kms_provider, zval* options TSRMLS_DC);
151151
void phongo_clientencryption_encrypt(php_phongo_clientencryption_t* clientencryption, zval* zvalue, zval* zciphertext, zval* options TSRMLS_DC);

‎src/BSON/Binary.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ zend_class_entry* php_phongo_binary_ce;
3434

3535
/* Initialize the object and return whether it was successful. An exception will
3636
* be thrown on error. */
37-
static bool php_phongo_binary_init(php_phongo_binary_t* intern, const char* data, phongo_zpp_char_len data_len, phongo_long type TSRMLS_DC) /* {{{ */
37+
static bool php_phongo_binary_init(php_phongo_binary_t* intern, const char* data, size_t data_len, zend_long type TSRMLS_DC) /* {{{ */
3838
{
3939
if (type < 0 || type > UINT8_MAX) {
4040
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected type to be an unsigned 8-bit integer, %" PHONGO_LONG_FORMAT " given", type);
@@ -76,8 +76,8 @@ static PHP_METHOD(Binary, __construct)
7676
php_phongo_binary_t* intern;
7777
zend_error_handling error_handling;
7878
char* data;
79-
phongo_zpp_char_len data_len;
80-
phongo_long type;
79+
size_t data_len;
80+
zend_long type;
8181

8282
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
8383
intern = Z_BINARY_OBJ_P(getThis());
@@ -123,7 +123,7 @@ static PHP_METHOD(Binary, __toString)
123123

124124
intern = Z_BINARY_OBJ_P(getThis());
125125

126-
PHONGO_RETURN_STRINGL(intern->data, intern->data_len);
126+
RETURN_STRINGL(intern->data, intern->data_len);
127127
} /* }}} */
128128

129129
/* {{{ proto string MongoDB\BSON\Binary::getData()
@@ -138,7 +138,7 @@ static PHP_METHOD(Binary, getData)
138138
return;
139139
}
140140

141-
PHONGO_RETURN_STRINGL(intern->data, intern->data_len);
141+
RETURN_STRINGL(intern->data, intern->data_len);
142142
} /* }}} */
143143

144144
/* {{{ proto integer MongoDB\BSON\Binary::getType()
@@ -187,7 +187,7 @@ static PHP_METHOD(Binary, jsonSerialize)
187187
static PHP_METHOD(Binary, serialize)
188188
{
189189
php_phongo_binary_t* intern;
190-
ZVAL_RETVAL_TYPE retval;
190+
zval retval;
191191
php_serialize_data_t var_hash;
192192
smart_str buf = { 0 };
193193

@@ -219,7 +219,7 @@ static PHP_METHOD(Binary, unserialize)
219219
php_phongo_binary_t* intern;
220220
zend_error_handling error_handling;
221221
char* serialized;
222-
phongo_zpp_char_len serialized_len;
222+
size_t serialized_len;
223223
zval props;
224224
php_unserialize_data_t var_hash;
225225

@@ -282,7 +282,7 @@ static zend_function_entry php_phongo_binary_me[] = {
282282
/* {{{ MongoDB\BSON\Binary object handlers */
283283
static zend_object_handlers php_phongo_handler_binary;
284284

285-
static void php_phongo_binary_free_object(phongo_free_object_arg* object TSRMLS_DC) /* {{{ */
285+
static void php_phongo_binary_free_object(zend_object* object TSRMLS_DC) /* {{{ */
286286
{
287287
php_phongo_binary_t* intern = Z_OBJ_BINARY(object);
288288

@@ -298,7 +298,7 @@ static void php_phongo_binary_free_object(phongo_free_object_arg* object TSRMLS_
298298
}
299299
} /* }}} */
300300

301-
static phongo_create_object_retval php_phongo_binary_create_object(zend_class_entry* class_type TSRMLS_DC) /* {{{ */
301+
static zend_object* php_phongo_binary_create_object(zend_class_entry* class_type TSRMLS_DC) /* {{{ */
302302
{
303303
php_phongo_binary_t* intern = NULL;
304304

@@ -312,11 +312,11 @@ static phongo_create_object_retval php_phongo_binary_create_object(zend_class_en
312312
return &intern->std;
313313
} /* }}} */
314314

315-
static phongo_create_object_retval php_phongo_binary_clone_object(zval* object TSRMLS_DC) /* {{{ */
315+
static zend_object* php_phongo_binary_clone_object(zval* object TSRMLS_DC) /* {{{ */
316316
{
317-
php_phongo_binary_t* intern;
318-
php_phongo_binary_t* new_intern;
319-
phongo_create_object_retval new_object;
317+
php_phongo_binary_t* intern;
318+
php_phongo_binary_t* new_intern;
319+
zend_object* new_object;
320320

321321
intern = Z_BINARY_OBJ_P(object);
322322
new_object = php_phongo_binary_create_object(Z_OBJCE_P(object) TSRMLS_CC);
@@ -349,7 +349,7 @@ static int php_phongo_binary_compare_objects(zval* o1, zval* o2 TSRMLS_DC) /* {{
349349
return zend_binary_strcmp(intern1->data, intern1->data_len, intern2->data, intern2->data_len);
350350
} /* }}} */
351351

352-
static HashTable* php_phongo_binary_get_gc(zval* object, phongo_get_gc_table table, int* n TSRMLS_DC) /* {{{ */
352+
static HashTable* php_phongo_binary_get_gc(zval* object, zval** table, int* n TSRMLS_DC) /* {{{ */
353353
{
354354
*table = NULL;
355355
*n = 0;

‎src/BSON/DBPointer.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ zend_class_entry* php_phongo_dbpointer_ce;
3131

3232
/* Initialize the object and return whether it was successful. An exception will
3333
* be thrown on error. */
34-
static bool php_phongo_dbpointer_init(php_phongo_dbpointer_t* intern, const char* ref, phongo_zpp_char_len ref_len, const char* id, phongo_zpp_char_len id_len TSRMLS_DC) /* {{{ */
34+
static bool php_phongo_dbpointer_init(php_phongo_dbpointer_t* intern, const char* ref, size_t ref_len, const char* id, size_t id_len TSRMLS_DC) /* {{{ */
3535
{
3636
if (strlen(ref) != (size_t) ref_len) {
3737
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Ref cannot contain null bytes");
@@ -82,7 +82,7 @@ static PHP_METHOD(DBPointer, __toString)
8282
intern = Z_DBPOINTER_OBJ_P(getThis());
8383

8484
retval_len = spprintf(&retval, 0, "[%s/%s]", intern->ref, intern->id);
85-
PHONGO_RETVAL_STRINGL(retval, retval_len);
85+
RETVAL_STRINGL(retval, retval_len);
8686
efree(retval);
8787
} /* }}} */
8888

@@ -91,8 +91,8 @@ static PHP_METHOD(DBPointer, __toString)
9191
static PHP_METHOD(DBPointer, jsonSerialize)
9292
{
9393
php_phongo_dbpointer_t* intern;
94-
ZVAL_RETVAL_TYPE zdb_pointer;
95-
ZVAL_RETVAL_TYPE zoid;
94+
zval zdb_pointer;
95+
zval zoid;
9696

9797
if (zend_parse_parameters_none() == FAILURE) {
9898
return;
@@ -115,7 +115,7 @@ static PHP_METHOD(DBPointer, jsonSerialize)
115115
static PHP_METHOD(DBPointer, serialize)
116116
{
117117
php_phongo_dbpointer_t* intern;
118-
ZVAL_RETVAL_TYPE retval;
118+
zval retval;
119119
php_serialize_data_t var_hash;
120120
smart_str buf = { 0 };
121121

@@ -147,7 +147,7 @@ static PHP_METHOD(DBPointer, unserialize)
147147
php_phongo_dbpointer_t* intern;
148148
zend_error_handling error_handling;
149149
char* serialized;
150-
phongo_zpp_char_len serialized_len;
150+
size_t serialized_len;
151151
zval props;
152152
php_unserialize_data_t var_hash;
153153

@@ -199,7 +199,7 @@ static zend_function_entry php_phongo_dbpointer_me[] = {
199199
/* {{{ MongoDB\BSON\DBPointer object handlers */
200200
static zend_object_handlers php_phongo_handler_dbpointer;
201201

202-
static void php_phongo_dbpointer_free_object(phongo_free_object_arg* object TSRMLS_DC) /* {{{ */
202+
static void php_phongo_dbpointer_free_object(zend_object* object TSRMLS_DC) /* {{{ */
203203
{
204204
php_phongo_dbpointer_t* intern = Z_OBJ_DBPOINTER(object);
205205

@@ -215,7 +215,7 @@ static void php_phongo_dbpointer_free_object(phongo_free_object_arg* object TSRM
215215
}
216216
} /* }}} */
217217

218-
phongo_create_object_retval php_phongo_dbpointer_create_object(zend_class_entry* class_type TSRMLS_DC) /* {{{ */
218+
zend_object* php_phongo_dbpointer_create_object(zend_class_entry* class_type TSRMLS_DC) /* {{{ */
219219
{
220220
php_phongo_dbpointer_t* intern = NULL;
221221

@@ -228,11 +228,11 @@ phongo_create_object_retval php_phongo_dbpointer_create_object(zend_class_entry*
228228
return &intern->std;
229229
} /* }}} */
230230

231-
static phongo_create_object_retval php_phongo_dbpointer_clone_object(zval* object TSRMLS_DC) /* {{{ */
231+
static zend_object* php_phongo_dbpointer_clone_object(zval* object TSRMLS_DC) /* {{{ */
232232
{
233-
php_phongo_dbpointer_t* intern;
234-
php_phongo_dbpointer_t* new_intern;
235-
phongo_create_object_retval new_object;
233+
php_phongo_dbpointer_t* intern;
234+
php_phongo_dbpointer_t* new_intern;
235+
zend_object* new_object;
236236

237237
intern = Z_DBPOINTER_OBJ_P(object);
238238
new_object = php_phongo_dbpointer_create_object(Z_OBJCE_P(object) TSRMLS_CC);
@@ -262,7 +262,7 @@ static int php_phongo_dbpointer_compare_objects(zval* o1, zval* o2 TSRMLS_DC) /*
262262
return strcmp(intern1->id, intern2->id);
263263
} /* }}} */
264264

265-
static HashTable* php_phongo_dbpointer_get_gc(zval* object, phongo_get_gc_table table, int* n TSRMLS_DC) /* {{{ */
265+
static HashTable* php_phongo_dbpointer_get_gc(zval* object, zval** table, int* n TSRMLS_DC) /* {{{ */
266266
{
267267
*table = NULL;
268268
*n = 0;

0 commit comments

Comments
 (0)