Skip to content

Commit e8ba12b

Browse files
bjoriderickr
bjori
authored and
derickr
committed
hash API changes, off-by-ones
1 parent 2261c87 commit e8ba12b

File tree

11 files changed

+27
-25
lines changed

11 files changed

+27
-25
lines changed

‎phongo_compat.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@
158158
# define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(_zp, _ex)
159159
# define PHONGO_STREAM_ID(stream) stream->res->handle
160160
# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), _value);
161-
# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), _value, _len);
161+
# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), _value, _len);
162+
# define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRL(_key), _value);
162163
# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, _value, _value_len);
163164
# define phongo_free_object_arg zend_object
164165
# define phongo_zpp_char_len size_t
@@ -181,6 +182,7 @@
181182
# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), _value, 1);
182183
# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), _value, _len, 1);
183184
# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len+1, _value, _value_len, 1);
185+
# define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRS(_key), _value);
184186
# define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC)
185187
# define Z_ISUNDEF(x) !x
186188
# define phongo_free_object_arg void

‎php_phongo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,8 +1280,8 @@ void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *
12801280
array_init(retval);
12811281

12821282
ADD_ASSOC_STRING(retval, "host", (char *)sd->host.host);
1283-
add_assoc_long_ex(retval, ZEND_STRS("port"), sd->host.port);
1284-
add_assoc_long_ex(retval, ZEND_STRS("type"), sd->type);
1283+
ADD_ASSOC_LONG_EX(retval, "port", sd->host.port);
1284+
ADD_ASSOC_LONG_EX(retval, "type", sd->type);
12851285
add_assoc_bool_ex(retval, ZEND_STRS("is_primary"), sd->type == MONGOC_SERVER_RS_PRIMARY);
12861286
add_assoc_bool_ex(retval, ZEND_STRS("is_secondary"), sd->type == MONGOC_SERVER_RS_SECONDARY);
12871287
add_assoc_bool_ex(retval, ZEND_STRS("is_arbiter"), sd->type == MONGOC_SERVER_RS_ARBITER);
@@ -1315,7 +1315,7 @@ void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *
13151315
bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
13161316
add_assoc_zval_ex(retval, ZEND_STRS("last_is_master"), state.zchild);
13171317
}
1318-
add_assoc_long_ex(retval, ZEND_STRS("round_trip_time"), sd->round_trip_time);
1318+
ADD_ASSOC_LONG_EX(retval, "round_trip_time", sd->round_trip_time);
13191319

13201320
} /* }}} */
13211321

@@ -1337,7 +1337,7 @@ void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t
13371337

13381338
array_init_size(retval, 2);
13391339

1340-
add_assoc_long_ex(retval, ZEND_STRS("mode"), read_prefs->mode);
1340+
ADD_ASSOC_LONG_EX(retval, "mode", read_prefs->mode);
13411341
if (read_prefs->tags.len) {
13421342
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
13431343
/* Use native arrays for debugging output */
@@ -1363,13 +1363,13 @@ void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t
13631363
} else if (mongoc_write_concern_get_wmajority(write_concern)) {
13641364
ADD_ASSOC_STRING(retval, "w", (char *)PHONGO_WRITE_CONCERN_W_MAJORITY);
13651365
} else if (w != MONGOC_WRITE_CONCERN_W_DEFAULT) {
1366-
add_assoc_long_ex(retval, ZEND_STRS("w"), w);
1366+
ADD_ASSOC_LONG_EX(retval, ZEND_STRS("w"), w);
13671367
} else {
13681368
add_assoc_null_ex(retval, ZEND_STRS("w"));
13691369
}
13701370

13711371
add_assoc_bool_ex(retval, ZEND_STRS("wmajority"), mongoc_write_concern_get_wmajority(write_concern));
1372-
add_assoc_long_ex(retval, ZEND_STRS("wtimeout"), mongoc_write_concern_get_wtimeout(write_concern));
1372+
ADD_ASSOC_LONG_EX(retval, ZEND_STRS("wtimeout"), mongoc_write_concern_get_wtimeout(write_concern));
13731373

13741374
if (write_concern->journal != MONGOC_WRITE_CONCERN_JOURNAL_DEFAULT) {
13751375
add_assoc_bool_ex(retval, ZEND_STRS("journal"), mongoc_write_concern_get_journal(write_concern));
@@ -1383,7 +1383,7 @@ void php_phongo_cursor_to_zval(zval *retval, const mongoc_cursor_t *cursor) /* {
13831383

13841384
array_init_size(retval, 19);
13851385

1386-
add_assoc_long_ex(retval, ZEND_STRS("stamp"), cursor->stamp);
1386+
ADD_ASSOC_LONG_EX(retval, "stamp", cursor->stamp);
13871387

13881388
#define _ADD_BOOL(z, field) add_assoc_bool_ex(z, ZEND_STRS(#field), cursor->field)
13891389
_ADD_BOOL(retval, is_command);

‎src/BSON/Binary.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ HashTable *php_phongo_binary_get_debug_info(zval *object, int *is_temp TSRMLS_DC
183183
array_init_size(&retval, 2);
184184

185185
ADD_ASSOC_STRINGL(&retval, "data", intern->data, intern->data_len);
186-
add_assoc_long_ex(&retval, ZEND_STRS("type"), intern->type);
186+
ADD_ASSOC_LONG_EX(&retval, "type", intern->type);
187187

188188
return Z_ARRVAL(retval);
189189
} /* }}} */

‎src/MongoDB/BulkWrite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ HashTable *php_phongo_bulkwrite_get_debug_info(zval *object, int *is_temp TSRMLS
337337

338338
add_assoc_bool_ex(&retval, ZEND_STRS("ordered"), intern->bulk->flags.ordered);
339339
add_assoc_bool_ex(&retval, ZEND_STRS("executed"), intern->bulk->executed);
340-
add_assoc_long_ex(&retval, ZEND_STRS("server_id"), intern->bulk->hint);
340+
ADD_ASSOC_LONG_EX(&retval, "server_id", intern->bulk->hint);
341341

342342
if (intern->bulk->write_concern) {
343343
#if PHP_VERSION_ID >= 70000

‎src/MongoDB/Cursor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC
283283
add_assoc_null_ex(&retval, ZEND_STRS("cursor"));
284284
}
285285

286-
add_assoc_long_ex(&retval, ZEND_STRS("server_id"), intern->server_id);
286+
ADD_ASSOC_LONG_EX(&retval, "server_id", intern->server_id);
287287

288288
return Z_ARRVAL(retval);
289289

‎src/MongoDB/CursorId.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ HashTable *php_phongo_cursorid_get_debug_info(zval *object, int *is_temp TSRMLS_
132132

133133
array_init(&retval);
134134

135-
add_assoc_long_ex(&retval, ZEND_STRS("id"), intern->id);
135+
ADD_ASSOC_LONG_EX(&retval, "id", intern->id);
136136

137137
return Z_ARRVAL(retval);
138138

‎src/MongoDB/Manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
448448

449449
array_init(&retval);
450450

451-
add_assoc_long_ex(&retval, ZEND_STRS("request_id"), intern->client->request_id);
451+
ADD_ASSOC_LONG_EX(&retval, "request_id", intern->client->request_id);
452452
ADD_ASSOC_STRING(&retval, "uri", (char *)mongoc_uri_get_string(intern->client->uri));
453453

454454

‎src/MongoDB/Query.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
203203
add_assoc_null_ex(&retval, ZEND_STRS("selector"));
204204
}
205205

206-
add_assoc_long_ex(&retval, ZEND_STRS("flags"), intern->flags);
207-
add_assoc_long_ex(&retval, ZEND_STRS("skip"), intern->skip);
208-
add_assoc_long_ex(&retval, ZEND_STRS("limit"), intern->limit);
209-
add_assoc_long_ex(&retval, ZEND_STRS("batch_size"), intern->batch_size);
206+
ADD_ASSOC_LONG_EX(&retval, "flags", intern->flags);
207+
ADD_ASSOC_LONG_EX(&retval, "skip", intern->skip);
208+
ADD_ASSOC_LONG_EX(&retval, "limit", intern->limit);
209+
ADD_ASSOC_LONG_EX(&retval, "batch_size", intern->batch_size);
210210

211211
return Z_ARRVAL(retval);
212212

‎src/MongoDB/WriteConcernError.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ HashTable *php_phongo_writeconcernerror_get_debug_info(zval *object, int *is_tem
189189

190190
array_init_size(&retval, 3);
191191
ADD_ASSOC_STRING(&retval, "message", intern->message);
192-
add_assoc_long_ex(&retval, ZEND_STRS("code"), intern->code);
192+
ADD_ASSOC_LONG_EX(&retval, "code", intern->code);
193193
if (intern->info) {
194194
Z_ADDREF_P(intern->info);
195195
add_assoc_zval_ex(&retval, ZEND_STRS("info"), intern->info);

‎src/MongoDB/WriteError.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ HashTable *php_phongo_writeerror_get_debug_info(zval *object, int *is_temp TSRML
211211

212212
array_init_size(&retval, 3);
213213
ADD_ASSOC_STRING(&retval, "message", intern->message);
214-
add_assoc_long_ex(&retval, ZEND_STRS("code"), intern->code);
215-
add_assoc_long_ex(&retval, ZEND_STRS("index"), intern->index);
214+
ADD_ASSOC_LONG_EX(&retval, "code", intern->code);
215+
ADD_ASSOC_LONG_EX(&retval, "index", intern->index);
216216
if (intern->info) {
217217
Z_ADDREF_P(intern->info);
218218
add_assoc_zval_ex(&retval, ZEND_STRS("info"), intern->info);

0 commit comments

Comments
 (0)