Skip to content

Commit 605469f

Browse files
derickrderickr
committed
Merged pull request #931 
2 parents 8de5632 + 55eb5b3 commit 605469f

20 files changed

+15
-222
lines changed

‎phongo_compat.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
#define phongo_get_gc_table zval**
8282
#define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t*) ecalloc(1, sizeof(_obj_t) + zend_object_properties_size(_class_type))
8383
#define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data)
84-
#define SUPPRESS_UNUSED_WARNING(x)
8584
#define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
8685
#define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
8786
#define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), (char*) (_value));
@@ -118,7 +117,6 @@
118117
#define phongo_get_gc_table zval***
119118
#define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t*) ecalloc(1, sizeof(_obj_t))
120119
#define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data) TSRMLS_FETCH_FROM_CTX(user_data)
121-
#define SUPPRESS_UNUSED_WARNING(x) (void) x;
122120
#define DECLARE_RETURN_VALUE_USED
123121
#define EXCEPTION_P(_ex, _zp) _zp = _ex
124122
#define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), (char*) (_value), 1);

‎php_phongo.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ static void phongo_exception_add_error_labels(bson_t* reply TSRMLS_DC)
209209
bson_iter_recurse(&iter, &error_labels);
210210
while (bson_iter_next(&error_labels)) {
211211
if (BSON_ITER_HOLDS_UTF8(&error_labels)) {
212-
const char* error_label;
213-
uint32_t error_label_len;
212+
const char* error_label;
213+
uint32_t error_label_len;
214214

215215
error_label = bson_iter_utf8(&error_labels, &error_label_len);
216216
#if PHP_VERSION_ID >= 70000
@@ -807,7 +807,7 @@ bool phongo_cursor_advance_and_check_for_error(mongoc_cursor_t* cursor TSRMLS_DC
807807
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) /* {{{ */
808808
{
809809
const php_phongo_query_t* query;
810-
bson_t opts = BSON_INITIALIZER;
810+
bson_t opts = BSON_INITIALIZER;
811811
mongoc_cursor_t* cursor;
812812
char* dbname;
813813
char* collname;

‎src/BSON/functions.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ PHP_FUNCTION(MongoDB_BSON_fromPHP)
3636
zval* data;
3737
bson_t* bson;
3838

39-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
40-
SUPPRESS_UNUSED_WARNING(this_ptr)
41-
SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
42-
4339
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &data) == FAILURE) {
4440
return;
4541
}
@@ -60,10 +56,6 @@ PHP_FUNCTION(MongoDB_BSON_toPHP)
6056
zval* typemap = NULL;
6157
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
6258

63-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
64-
SUPPRESS_UNUSED_WARNING(this_ptr)
65-
SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
66-
6759
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!", &data, &data_len, &typemap) == FAILURE) {
6860
return;
6961
}
@@ -96,10 +88,6 @@ PHP_FUNCTION(MongoDB_BSON_fromJSON)
9688
bson_t bson = BSON_INITIALIZER;
9789
bson_error_t error = { 0 };
9890

99-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
100-
SUPPRESS_UNUSED_WARNING(this_ptr)
101-
SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
102-
10391
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &json, &json_len) == FAILURE) {
10492
return;
10593
}
@@ -122,10 +110,6 @@ static void phongo_bson_to_json(INTERNAL_FUNCTION_PARAMETERS, php_phongo_json_mo
122110
char* json = NULL;
123111
size_t json_len;
124112

125-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
126-
SUPPRESS_UNUSED_WARNING(this_ptr)
127-
SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
128-
129113
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) {
130114
return;
131115
}

‎src/MongoDB/BulkWrite.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ static PHP_METHOD(BulkWrite, __construct)
243243
zend_error_handling error_handling;
244244
zval* options = NULL;
245245
zend_bool ordered = 1;
246-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
247-
SUPPRESS_UNUSED_WARNING(return_value)
248-
SUPPRESS_UNUSED_WARNING(return_value_used)
249246

250247
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
251248
intern = Z_BULKWRITE_OBJ_P(getThis());
@@ -283,7 +280,6 @@ static PHP_METHOD(BulkWrite, insert)
283280
int bson_flags = PHONGO_BSON_ADD_ID;
284281
bson_error_t error = { 0 };
285282
DECLARE_RETURN_VALUE_USED
286-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
287283

288284
intern = Z_BULKWRITE_OBJ_P(getThis());
289285

@@ -326,9 +322,6 @@ static PHP_METHOD(BulkWrite, update)
326322
zval * zquery, *zupdate, *zoptions = NULL;
327323
bson_t bquery = BSON_INITIALIZER, bupdate = BSON_INITIALIZER, boptions = BSON_INITIALIZER;
328324
bson_error_t error = { 0 };
329-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
330-
SUPPRESS_UNUSED_WARNING(return_value)
331-
SUPPRESS_UNUSED_WARNING(return_value_used)
332325

333326
intern = Z_BULKWRITE_OBJ_P(getThis());
334327

@@ -392,9 +385,6 @@ static PHP_METHOD(BulkWrite, delete)
392385
zval * zquery, *zoptions = NULL;
393386
bson_t bquery = BSON_INITIALIZER, boptions = BSON_INITIALIZER;
394387
bson_error_t error = { 0 };
395-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
396-
SUPPRESS_UNUSED_WARNING(return_value)
397-
SUPPRESS_UNUSED_WARNING(return_value_used)
398388

399389
intern = Z_BULKWRITE_OBJ_P(getThis());
400390

@@ -436,9 +426,6 @@ static PHP_METHOD(BulkWrite, delete)
436426
static PHP_METHOD(BulkWrite, count)
437427
{
438428
php_phongo_bulkwrite_t* intern;
439-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
440-
SUPPRESS_UNUSED_WARNING(return_value)
441-
SUPPRESS_UNUSED_WARNING(return_value_used)
442429

443430
intern = Z_BULKWRITE_OBJ_P(getThis());
444431

‎src/MongoDB/Command.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ static PHP_METHOD(Command, __construct)
9999
zend_error_handling error_handling;
100100
zval* document;
101101
zval* options = NULL;
102-
SUPPRESS_UNUSED_WARNING(return_value)
103-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
104-
SUPPRESS_UNUSED_WARNING(return_value_used)
105102

106103
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
107104
intern = Z_COMMAND_OBJ_P(getThis());

‎src/MongoDB/Cursor.c‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,6 @@ static PHP_METHOD(Cursor, setTypeMap)
224224
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
225225
zval* typemap = NULL;
226226
bool restore_current_element = false;
227-
SUPPRESS_UNUSED_WARNING(return_value)
228-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
229-
SUPPRESS_UNUSED_WARNING(return_value_used)
230227

231228
intern = Z_CURSOR_OBJ_P(getThis());
232229

@@ -297,9 +294,6 @@ static int php_phongo_cursor_to_array_apply(zend_object_iterator* iter, void* pu
297294
Returns an array of all result documents for this cursor */
298295
static PHP_METHOD(Cursor, toArray)
299296
{
300-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
301-
SUPPRESS_UNUSED_WARNING(return_value_used)
302-
303297
if (zend_parse_parameters_none() == FAILURE) {
304298
return;
305299
}
@@ -317,8 +311,6 @@ static PHP_METHOD(Cursor, toArray)
317311
static PHP_METHOD(Cursor, getId)
318312
{
319313
php_phongo_cursor_t* intern;
320-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
321-
SUPPRESS_UNUSED_WARNING(return_value_used)
322314

323315
intern = Z_CURSOR_OBJ_P(getThis());
324316

@@ -334,8 +326,6 @@ static PHP_METHOD(Cursor, getId)
334326
static PHP_METHOD(Cursor, getServer)
335327
{
336328
php_phongo_cursor_t* intern;
337-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
338-
SUPPRESS_UNUSED_WARNING(return_value_used)
339329

340330
intern = Z_CURSOR_OBJ_P(getThis());
341331

@@ -351,8 +341,6 @@ static PHP_METHOD(Cursor, getServer)
351341
static PHP_METHOD(Cursor, isDead)
352342
{
353343
php_phongo_cursor_t* intern;
354-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
355-
SUPPRESS_UNUSED_WARNING(return_value_used)
356344

357345
intern = Z_CURSOR_OBJ_P(getThis());
358346

‎src/MongoDB/CursorId.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ static PHP_METHOD(CursorId, __toString)
3333
php_phongo_cursorid_t* intern;
3434
char* tmp;
3535
int tmp_len;
36-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
37-
SUPPRESS_UNUSED_WARNING(return_value_used)
3836

3937
intern = Z_CURSORID_OBJ_P(getThis());
4038

‎src/MongoDB/Exception/RuntimeException.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static bool php_phongo_has_string_array_element(zval* labels, char* label TSRMLS
5252
#else
5353
{
5454
HashPosition pos;
55-
zval** z_label;
55+
zval** z_label;
5656

5757
for (
5858
zend_hash_internal_pointer_reset_ex(ht_data, &pos);
@@ -75,9 +75,9 @@ static bool php_phongo_has_string_array_element(zval* labels, char* label TSRMLS
7575
Returns whether a specific error label has been set */
7676
static PHP_METHOD(RuntimeException, hasErrorLabel)
7777
{
78-
char* label;
79-
phongo_zpp_char_len label_len;
80-
zval* error_labels;
78+
char* label;
79+
phongo_zpp_char_len label_len;
80+
zval* error_labels;
8181
#if PHP_VERSION_ID >= 70000
8282
zval rv;
8383
#endif

‎src/MongoDB/Manager.c‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,6 @@ static PHP_METHOD(Manager, __construct)
295295
phongo_zpp_char_len uri_string_len = 0;
296296
zval* options = NULL;
297297
zval* driverOptions = NULL;
298-
SUPPRESS_UNUSED_WARNING(return_value)
299-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
300-
SUPPRESS_UNUSED_WARNING(return_value_used)
301298

302299
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
303300

@@ -341,7 +338,6 @@ static PHP_METHOD(Manager, executeCommand)
341338
zval* zreadPreference = NULL;
342339
uint32_t server_id = 0;
343340
DECLARE_RETURN_VALUE_USED
344-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
345341

346342
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|z!", &db, &db_len, &command, php_phongo_command_ce, &options) == FAILURE) {
347343
return;
@@ -381,7 +377,6 @@ static PHP_METHOD(Manager, executeReadCommand)
381377
zval* zreadPreference = NULL;
382378
uint32_t server_id = 0;
383379
DECLARE_RETURN_VALUE_USED
384-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
385380

386381
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|a!", &db, &db_len, &command, php_phongo_command_ce, &options) == FAILURE) {
387382
return;
@@ -413,7 +408,6 @@ static PHP_METHOD(Manager, executeWriteCommand)
413408
zval* options = NULL;
414409
uint32_t server_id = 0;
415410
DECLARE_RETURN_VALUE_USED
416-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
417411

418412
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|a!", &db, &db_len, &command, php_phongo_command_ce, &options) == FAILURE) {
419413
return;
@@ -440,7 +434,6 @@ static PHP_METHOD(Manager, executeReadWriteCommand)
440434
zval* options = NULL;
441435
uint32_t server_id = 0;
442436
DECLARE_RETURN_VALUE_USED
443-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
444437

445438
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|a!", &db, &db_len, &command, php_phongo_command_ce, &options) == FAILURE) {
446439
return;
@@ -469,7 +462,6 @@ static PHP_METHOD(Manager, executeQuery)
469462
zval* zreadPreference = NULL;
470463
uint32_t server_id = 0;
471464
DECLARE_RETURN_VALUE_USED
472-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
473465

474466
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|z!", &namespace, &namespace_len, &query, php_phongo_query_ce, &options) == FAILURE) {
475467
return;
@@ -510,7 +502,6 @@ static PHP_METHOD(Manager, executeBulkWrite)
510502
bool free_options = false;
511503
uint32_t server_id = 0;
512504
DECLARE_RETURN_VALUE_USED
513-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
514505

515506
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|z!", &namespace, &namespace_len, &zbulk, php_phongo_bulkwrite_ce, &options) == FAILURE) {
516507
return;
@@ -540,7 +531,6 @@ static PHP_METHOD(Manager, getReadConcern)
540531
{
541532
php_phongo_manager_t* intern;
542533
DECLARE_RETURN_VALUE_USED
543-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
544534

545535
intern = Z_MANAGER_OBJ_P(getThis());
546536

@@ -559,7 +549,6 @@ static PHP_METHOD(Manager, getReadPreference)
559549
{
560550
php_phongo_manager_t* intern;
561551
DECLARE_RETURN_VALUE_USED
562-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
563552

564553
intern = Z_MANAGER_OBJ_P(getThis());
565554

@@ -579,8 +568,6 @@ static PHP_METHOD(Manager, getServers)
579568
php_phongo_manager_t* intern;
580569
mongoc_server_description_t** sds;
581570
size_t i, n = 0;
582-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
583-
SUPPRESS_UNUSED_WARNING(return_value_used)
584571

585572
intern = Z_MANAGER_OBJ_P(getThis());
586573

@@ -615,7 +602,6 @@ static PHP_METHOD(Manager, getWriteConcern)
615602
{
616603
php_phongo_manager_t* intern;
617604
DECLARE_RETURN_VALUE_USED
618-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
619605

620606
intern = Z_MANAGER_OBJ_P(getThis());
621607

@@ -635,8 +621,6 @@ static PHP_METHOD(Manager, selectServer)
635621
php_phongo_manager_t* intern;
636622
zval* zreadPreference = NULL;
637623
uint32_t server_id = 0;
638-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
639-
SUPPRESS_UNUSED_WARNING(return_value_used)
640624

641625
intern = Z_MANAGER_OBJ_P(getThis());
642626

@@ -662,8 +646,6 @@ static PHP_METHOD(Manager, startSession)
662646
mongoc_client_session_t* cs;
663647
bson_error_t error = { 0 };
664648
mongoc_transaction_opt_t* txn_opts = NULL;
665-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
666-
SUPPRESS_UNUSED_WARNING(return_value_used)
667649

668650
intern = Z_MANAGER_OBJ_P(getThis());
669651

@@ -684,8 +666,7 @@ static PHP_METHOD(Manager, startSession)
684666
phongo_throw_exception(
685667
PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC,
686668
"Expected \"defaultTransactionOptions\" option to be an array, %s given",
687-
PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(txn_options)
688-
);
669+
PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(txn_options));
689670
goto cleanup;
690671
}
691672

‎src/MongoDB/Monitoring/CommandFailedEvent.c‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ zend_class_entry* php_phongo_commandfailedevent_ce;
3131
PHP_METHOD(CommandFailedEvent, getCommandName)
3232
{
3333
php_phongo_commandfailedevent_t* intern;
34-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
35-
SUPPRESS_UNUSED_WARNING(return_value_used)
3634

3735
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
3836

@@ -48,8 +46,6 @@ PHP_METHOD(CommandFailedEvent, getCommandName)
4846
PHP_METHOD(CommandFailedEvent, getDurationMicros)
4947
{
5048
php_phongo_commandfailedevent_t* intern;
51-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
52-
SUPPRESS_UNUSED_WARNING(return_value_used)
5349

5450
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
5551

@@ -65,8 +61,6 @@ PHP_METHOD(CommandFailedEvent, getDurationMicros)
6561
PHP_METHOD(CommandFailedEvent, getError)
6662
{
6763
php_phongo_commandfailedevent_t* intern;
68-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
69-
SUPPRESS_UNUSED_WARNING(return_value_used)
7064

7165
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
7266

@@ -87,8 +81,6 @@ PHP_METHOD(CommandFailedEvent, getOperationId)
8781
{
8882
php_phongo_commandfailedevent_t* intern;
8983
char int_as_string[20];
90-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
91-
SUPPRESS_UNUSED_WARNING(return_value_used)
9284

9385
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
9486

@@ -106,8 +98,6 @@ PHP_METHOD(CommandFailedEvent, getReply)
10698
{
10799
php_phongo_commandfailedevent_t* intern;
108100
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
109-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
110-
SUPPRESS_UNUSED_WARNING(return_value_used)
111101

112102
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
113103

@@ -129,8 +119,6 @@ PHP_METHOD(CommandFailedEvent, getRequestId)
129119
{
130120
php_phongo_commandfailedevent_t* intern;
131121
char int_as_string[20];
132-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
133-
SUPPRESS_UNUSED_WARNING(return_value_used)
134122

135123
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
136124

@@ -147,8 +135,6 @@ PHP_METHOD(CommandFailedEvent, getRequestId)
147135
PHP_METHOD(CommandFailedEvent, getServer)
148136
{
149137
php_phongo_commandfailedevent_t* intern;
150-
SUPPRESS_UNUSED_WARNING(return_value_ptr)
151-
SUPPRESS_UNUSED_WARNING(return_value_used)
152138

153139
intern = Z_COMMANDFAILEDEVENT_OBJ_P(getThis());
154140

0 commit comments

Comments
 (0)