projects
/
m6w6
/
ext-ircclient
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
trigger mirror
[m6w6/ext-ircclient]
/
php_ircclient.c
diff --git
a/php_ircclient.c
b/php_ircclient.c
index 022d2981a9384a48428a7dcebe671b026fd88e25..e1e6ab65be1dc7d39cc07b30eae784e5ccc75a95 100644
(file)
--- a/
php_ircclient.c
+++ b/
php_ircclient.c
@@
-1138,7
+1138,7
@@
static void call_closure(INTERNAL_FUNCTION_PARAMETERS, /* stupid non-const API *
INIT_PZVAL(&za);
array_init(&za);
INIT_PZVAL(&za);
array_init(&za);
- if (SUCCESS == zend_copy_parameters_array(ZEND_NUM_ARGS(), &za)) {
+ if (SUCCESS == zend_copy_parameters_array(ZEND_NUM_ARGS(), &za
TSRMLS_CC
)) {
php_printf("ircclient: %s - ", prop_str);
zend_print_flat_zval_r(&za TSRMLS_CC);
php_printf("\n");
php_printf("ircclient: %s - ", prop_str);
zend_print_flat_zval_r(&za TSRMLS_CC);
php_printf("\n");
@@
-1418,14
+1418,15
@@
PHP_MINFO_FUNCTION(ircclient)
{
unsigned int high, low;
char *version[2];
{
unsigned int high, low;
char *version[2];
+ char *lt16 = "<=1.6";
irc_get_version(&high, &low);
spprintf(&version[1], 0, "%u.%u", high, low);
irc_get_version(&high, &low);
spprintf(&version[1], 0, "%u.%u", high, low);
-#if PHP_I
PHP_I
RCCLIENT_LIBIRCCLIENT_VERSION_HIGH
+#if PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH
spprintf(&version[0], 0, "%u.%u", PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH, PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW);
#else
spprintf(&version[0], 0, "%u.%u", PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH, PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW);
#else
- /* version <= 1.6 doesn't expose
d
its version */
-
spprintf(&version[0], 0, "-")
;
+ /* version <= 1.6 doesn't expose its version */
+
version[0] = lt16
;
#endif
php_info_print_table_start();
php_info_print_table_header(2, "IRC client support", "enabled");
#endif
php_info_print_table_start();
php_info_print_table_header(2, "IRC client support", "enabled");
@@
-1441,7
+1442,9
@@
PHP_MINFO_FUNCTION(ircclient)
);
php_info_print_table_end();
);
php_info_print_table_end();
- efree(version[0]);
+ if (version[0] != lt16) {
+ efree(version[0]);
+ }
efree(version[1]);
}
efree(version[1]);
}