From 60e13bec5af90b0de3469d3b9a43c62f21e5552f Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Fri, 25 May 2018 19:42:47 +0100 Subject: [PATCH] Fix and finish test for oo init with home dir --- gnupg.c | 6 +++--- tests/gnupg_oo_init_home_dir.phpt | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gnupg.c b/gnupg.c index 4730855..1e87896 100644 --- a/gnupg.c +++ b/gnupg.c @@ -162,7 +162,7 @@ static void php_gnupg_this_make(PHPC_THIS_DECLARE(gnupg), zval *options TSRMLS_D } if (options && PHPC_HASH_CSTR_FIND_IN_COND( Z_ARRVAL_P(options), "home_dir", ppv_home_dir)) { - home_dir = PHPC_STRVAL_P(ppv_file_name); + home_dir = PHPC_STRVAL_P(ppv_home_dir); } if (file_name != NULL || home_dir != NULL) { @@ -685,7 +685,7 @@ PHP_METHOD(gnupg, __construct) PHPC_THIS_DECLARE(gnupg); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a", - options) == FAILURE) { + &options) == FAILURE) { return; } @@ -703,7 +703,7 @@ PHP_FUNCTION(gnupg_init) PHPC_THIS_DECLARE(gnupg); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a", - options) == FAILURE) { + &options) == FAILURE) { return; } diff --git a/tests/gnupg_oo_init_home_dir.phpt b/tests/gnupg_oo_init_home_dir.phpt index 3aceb23..76bb1b6 100644 --- a/tests/gnupg_oo_init_home_dir.phpt +++ b/tests/gnupg_oo_init_home_dir.phpt @@ -15,7 +15,6 @@ $gpg->seterrormode(gnupg::ERROR_WARNING); $gpg->import($testkey); $imported = false; foreach (glob("$homedir/*") as $filename) { - //var_dump($filename); $imported = true; } var_dump($imported); @@ -28,4 +27,4 @@ foreach (glob(__DIR__ . '/init_oo_home/*') as $filename) { unlink($filename); } rmdir($homedir); -?> \ No newline at end of file +?>