1
0
mirror of https://github.com/php/php-src.git synced 2026-04-02 13:43:02 +02:00

fix folding and a couple of typos

This commit is contained in:
Antony Dovgal
2007-01-23 23:31:14 +00:00
parent 94292d3e01
commit d6af95d1a4
3 changed files with 7 additions and 4 deletions

View File

@@ -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
*/

View File

@@ -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; \
}

View File

@@ -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===