diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
| commit | d87cc976e1156b839fc6d4aa6b473a126802b8e3 (patch) | |
| tree | 8acb068dd7458e1c8df3a7d8ecb87d065990fdb1 /ext/crack | |
| parent | b4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (diff) | |
| download | php-git-d87cc976e1156b839fc6d4aa6b473a126802b8e3.tar.gz | |
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'ext/crack')
| -rw-r--r-- | ext/crack/crack.c | 13 | ||||
| -rw-r--r-- | ext/crack/php_crack.h | 4 |
2 files changed, 3 insertions, 14 deletions
diff --git a/ext/crack/crack.c b/ext/crack/crack.c index 131d5d57ac..a3e2d8916d 100644 --- a/ext/crack/crack.c +++ b/ext/crack/crack.c @@ -65,8 +65,7 @@ long _crack_open_dict(char *dictpath) { PWDICT *pwdict; long resource; - - CRACKLS_FETCH(); + TSRMLS_FETCH(); if (CRACKG(current_id) != -1) { zend_error(E_WARNING, "Can not use more than one open dictionary with this implementation of libcrack"); @@ -111,8 +110,6 @@ ZEND_MSHUTDOWN_FUNCTION(crack) ZEND_RINIT_FUNCTION(crack) { - CRACKLS_FETCH(); - CRACKG(last_message) = NULL; CRACKG(current_id) = -1; @@ -121,7 +118,7 @@ ZEND_RINIT_FUNCTION(crack) ZEND_RSHUTDOWN_FUNCTION(crack) { - CRACKLS_FETCH(); + TSRMLS_FETCH(); if (NULL != CRACKG(last_message)) { efree(CRACKG(last_message)); @@ -168,8 +165,6 @@ ZEND_FUNCTION(crack_closedict) zval **dictionary; long id; - CRACKLS_FETCH(); - switch (ZEND_NUM_ARGS()) { case 0: id = CRACKG(current_id); @@ -205,8 +200,6 @@ ZEND_FUNCTION(crack_check) PWDICT *pwdict; long id; - CRACKLS_FETCH(); - switch (ZEND_NUM_ARGS()) { case 1: if (zend_get_parameters_ex(1, &password) == FAILURE) { @@ -254,8 +247,6 @@ ZEND_FUNCTION(crack_check) Returns the message from the last obscure check. */ ZEND_FUNCTION(crack_getlastmessage) { - CRACKLS_FETCH(); - if (ZEND_NUM_ARGS() != 0) { WRONG_PARAM_COUNT; } diff --git a/ext/crack/php_crack.h b/ext/crack/php_crack.h index 17ad313481..c3f2961f72 100644 --- a/ext/crack/php_crack.h +++ b/ext/crack/php_crack.h @@ -30,11 +30,9 @@ ZEND_BEGIN_MODULE_GLOBALS(crack) ZEND_END_MODULE_GLOBALS(crack) #ifdef ZTS -#define CRACKG(v) (crack_globals->v) -#define CRACKLS_FETCH() zend_crack_globals *crack_globals = ts_resource(crack_globals_id) +#define CRACKG(v) TSRMG(crack_globals_id, zend_crack_globals *, v) #else #define CRACKG(v) (crack_globals.v) -#define CRACKLS_FETCH() #endif #else |