From 1b3e2c299d2d39830d0bec5abe82407db673594a Mon Sep 17 00:00:00 2001 From: DQNEO Date: Fri, 13 Dec 2013 23:20:37 +0200 Subject: [PATCH 1/2] Fix doc (svn -> git) --- CODING_STANDARDS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODING_STANDARDS b/CODING_STANDARDS index 5ceacdc4dce..7a0562e6ca9 100644 --- a/CODING_STANDARDS +++ b/CODING_STANDARDS @@ -59,8 +59,8 @@ Exceptions: you're calling. 7. When commenting out code using a #if statement, do NOT use 0 only. Instead - use "_0". For example, #if FOO_0, where FOO is your - svn user foo. This allows easier tracking of why code was commented out, + use "_0". For example, #if FOO_0, where FOO is your + git user foo. This allows easier tracking of why code was commented out, especially in bundled libraries. 8. Do not define functions that are not available. For instance, if a From 68a73ce3c449622f729bae257d1ed42e54a1a839 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 14 Dec 2013 20:43:02 +0100 Subject: [PATCH 2/2] fixed parameter order for zend_throw_exception_ex call --- ext/snmp/snmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 93c2b21ddc2..1bf0b3a4da5 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -533,7 +533,7 @@ static void php_snmp_error(zval *object, const char *docref TSRMLS_DC, int type, } if (object && (snmp_object->exceptions_enabled & type)) { - zend_throw_exception_ex(php_snmp_exception_ce, type, snmp_object->snmp_errstr TSRMLS_CC); + zend_throw_exception_ex(php_snmp_exception_ce, type TSRMLS_CC, snmp_object->snmp_errstr); } else { va_start(args, format); php_verror(docref, "", E_WARNING, format, args TSRMLS_CC);