admin/mongo-php-driver
1
0
Fork 0
mirror of https://github.com/macintoshplus/mongo-php-driver.git synced 2026-04-25 01:18:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regenerate after coverity fixes

Browse Source
This commit is contained in:
Hannes Magnusson
2014-07-16 17:18:42 -07:00
parent 619b58141f
commit e80fecb2d9
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Manager.c
+2 -2
View File
@@ -55,7 +55,7 @@ PHP_METHOD(Manager, __construct)
int uri_len;
zval *options = NULL;
zval *driverOptions = NULL;
void ***ctx = NULL;
void ***ctx = NULL;
TSRMLS_SET_CTX(ctx);
@@ -219,7 +219,7 @@ PHP_METHOD(Manager, executeUpdate)
zval *writeOptions = NULL;
bson_t *query;
bson_t *update;
mongoc_update_flags_t flags;
mongoc_update_flags_t flags = MONGOC_UPDATE_NONE;
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
src/Query.c
+8 -8
View File
@@ -137,14 +137,14 @@ PHP_MINIT_FUNCTION(Query)
php_phongo_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_query_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NONE"), MONGOC_QUERY_NONE TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_TAILABLE_CURSOR"), MONGOC_QUERY_TAILABLE_CURSOR TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_SLAVE_OK"), MONGOC_QUERY_SLAVE_OK TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_OPLOG_REPLAY"), MONGOC_QUERY_OPLOG_REPLAY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NO_CURSOR_TIMEOUT"), MONGOC_QUERY_NO_CURSOR_TIMEOUT TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_AWAIT_DATA"), MONGOC_QUERY_AWAIT_DATA TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_EXHAUST"), MONGOC_QUERY_EXHAUST TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_PARTIAL"), MONGOC_QUERY_PARTIAL TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NONE"), 0x00 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_TAILABLE_CURSOR"), 0x01 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_SLAVE_OK"), 0x02 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_OPLOG_REPLAY"), 0x04 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NO_CURSOR_TIMEOUT"), 0x08 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_AWAIT_DATA"), 0x10 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_EXHAUST"), 0x20 TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_PARTIAL"), 0x40 TSRMLS_CC);
return SUCCESS;
}
src/Server.c
+2
View File
@@ -431,9 +431,11 @@ static int php_phongo_server_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{
if (intern1 && intern2) {
return 0;
}
/*
if (!strcmp(intern1->host->host_and_port, intern2->host->host_and_port)) {
return 0;
}
*/
return 1;
} /* }}} */