From d6af95d1a4cca2f249bf3f24bb2f147f84005991 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 23 Jan 2007 23:31:14 +0000 Subject: [PATCH] fix folding and a couple of typos --- ext/phar/phar.c | 5 ++++- ext/phar/phar_object.c | 4 ++-- ext/phar/tests/phar_oo_001.phpt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 3bf2ee3a61..4a209c41f3 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -26,7 +26,7 @@ ZEND_DECLARE_MODULE_GLOBALS(phar) /* if the original value is 0 (disabled), then allow setting/unsetting at will otherwise, only allow 1 (enabled), and error on disabling */ -ZEND_INI_MH(phar_ini_modify_handler) +ZEND_INI_MH(phar_ini_modify_handler) /* {{{ */ { zend_bool *p, test; #ifndef ZTS @@ -73,6 +73,7 @@ ZEND_INI_MH(phar_ini_modify_handler) } return SUCCESS; } +/* }}}*/ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("phar.readonly", "1", PHP_INI_ALL, phar_ini_modify_handler, readonly, zend_phar_globals, phar_globals) @@ -825,6 +826,7 @@ static int phar_open_or_create_filename(char *fname, int fname_len, char *alias, } return SUCCESS; } +/* }}}*/ /** * Return an already opened filename. @@ -2482,6 +2484,7 @@ ZEND_GET_MODULE(phar) function_entry phar_functions[] = { {NULL, NULL, NULL} /* Must be the last line in phar_functions[] */ }; +/* }}}*/ /* {{{ php_phar_init_globals */ diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 5d35de239e..f04126a4cb 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -176,7 +176,7 @@ PHP_METHOD(Phar, __construct) phar_archive_object *phar_obj = (phar_archive_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \ if (!phar_obj->arc.archive) { \ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, \ - "Cannot call method on an uninitialzed Phar object"); \ + "Cannot call method on an uninitialized Phar object"); \ return; \ } @@ -521,7 +521,7 @@ PHP_METHOD(PharFileInfo, __construct) phar_entry_object *entry_obj = (phar_entry_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \ if (!entry_obj->ent.entry) { \ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, \ - "Cannot call method on an uninitialzed PharFileInfo object"); \ + "Cannot call method on an uninitialized PharFileInfo object"); \ return; \ } diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index ebd1c5b81e..8b18873a1f 100755 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -41,5 +41,5 @@ __halt_compiler(); --EXPECT-- string(5) "0.9.0" int(5) -string(49) "Cannot call method on an uninitialzed Phar object" +string(50) "Cannot call method on an uninitialized Phar object" ===DONE=== -- 2.50.1