diff options
Diffstat (limited to 'ext/pfpro')
| -rw-r--r-- | ext/pfpro/pfpro.c | 12 | ||||
| -rw-r--r-- | ext/pfpro/php_pfpro.h | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ext/pfpro/pfpro.c b/ext/pfpro/pfpro.c index b861af0a17..e477ca92f4 100644 --- a/ext/pfpro/pfpro.c +++ b/ext/pfpro/pfpro.c @@ -100,8 +100,6 @@ PHP_MSHUTDOWN_FUNCTION(pfpro) PHP_RINIT_FUNCTION(pfpro) { - PFPROLS_FETCH(); - PFPROG(initialized) = 0; return SUCCESS; @@ -109,7 +107,7 @@ PHP_RINIT_FUNCTION(pfpro) PHP_RSHUTDOWN_FUNCTION(pfpro) { - PFPROLS_FETCH(); + TSRMLS_FETCH(); if (PFPROG(initialized) == 1) { pfproCleanup(); @@ -147,8 +145,6 @@ PHP_FUNCTION(pfpro_version) Initializes the Payflow Pro library */ PHP_FUNCTION(pfpro_init) { - PFPROLS_FETCH(); - if (ZEND_NUM_ARGS() != 0) { WRONG_PARAM_COUNT; } @@ -165,8 +161,6 @@ PHP_FUNCTION(pfpro_init) Shuts down the Payflow Pro library */ PHP_FUNCTION(pfpro_cleanup) { - PFPROLS_FETCH(); - if (ZEND_NUM_ARGS() != 0) { WRONG_PARAM_COUNT; } @@ -203,8 +197,6 @@ PHP_FUNCTION(pfpro_process_raw) char *response; #endif - PFPROLS_FETCH(); - if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 8) { WRONG_PARAM_COUNT; } @@ -333,8 +325,6 @@ PHP_FUNCTION(pfpro_process) *sp1, *sp2, *pdelim1="&", *pdelim2="="; - PFPROLS_FETCH(); - if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 8) { WRONG_PARAM_COUNT; } diff --git a/ext/pfpro/php_pfpro.h b/ext/pfpro/php_pfpro.h index 1f97100fd0..9fc9a32aeb 100644 --- a/ext/pfpro/php_pfpro.h +++ b/ext/pfpro/php_pfpro.h @@ -64,11 +64,9 @@ typedef struct { } php_pfpro_globals; #ifdef ZTS -#define PFPROG(v) (pfpro_globals->v) -#define PFPROLS_FETCH() php_pfpro_globals *pfpro_globals = ts_resource(gd_pfpro_id) +#define PFPROG(v) TSRMG(gd_pfpro_id, php_pfpro_globals *, v) #else #define PFPROG(v) (pfpro_globals.v) -#define PFPROLS_FETCH() #endif #else |