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

PHPC-397: RETURN_STRING() duplicate argument removed

Browse Source
This commit is contained in:
Hannes Magnusson
2015-08-31 14:35:11 -07:00
committed by Derick Rethans
parent bf00161ef3
commit 36ce2d7ecd
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phongo_compat.h
View File

@@ -161,6 +161,7 @@
# define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
# define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
# define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
# define PHONGO_RETURN_STRING(s) RETVAL_STRING(s)
#else
# define phongo_char char
# define phongo_char_pdup(str) pestrdup(filename, 1)
@@ -181,6 +182,7 @@
# define ZEND_HASH_APPLY_COUNT(ht) (ht)->nApplyCount
# define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
# define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
# define PHONGO_RETURN_STRING(s) RETVAL_STRING(s, 1)
#endif

2
src/MongoDB/Server.c
View File

@@ -147,7 +147,7 @@ PHP_METHOD(Server, getHost)
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_STRING(sd->host.host, 1);
PHONGO_RETURN_STRING(sd->host.host);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);

2
src/MongoDB/WriteConcernError.c
View File

@@ -95,7 +95,7 @@ PHP_METHOD(WriteConcernError, getMessage)
return;
}
RETURN_STRING(intern->message, 1);
PHONGO_RETURN_STRING(intern->message);
}
/* }}} */

2
src/MongoDB/WriteError.c
View File

@@ -94,7 +94,7 @@ PHP_METHOD(WriteError, getMessage)
}
RETURN_STRING(intern->message, 1);
PHONGO_RETURN_STRING(intern->message);
}
/* }}} */
/* {{{ proto mixed WriteError::getInfo()