github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2024-11-22 14:27:09 +00:00
Code Issues Projects Releases Packages Activity

Fix CS

Browse source
This commit is contained in:
Jakub Zelenka 2016-09-11 20:23:32 +01:00
parent 9f6a48c4c1
commit c0c8d0acda
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnupg.c
View file

@ -42,7 +42,8 @@ PHPC_OBJ_DEFINE_HANDLER_VAR(gnupg);
if (this) { \ if (this) { \
PHPC_THIS_FETCH_FROM_ZVAL(gnupg, this); \ PHPC_THIS_FETCH_FROM_ZVAL(gnupg, this); \
if (!PHPC_THIS) { \ if (!PHPC_THIS) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized gnupg object"); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, \
"Invalid or unitialized gnupg object"); \
RETURN_FALSE; \ RETURN_FALSE; \
} \ } \
} \ } \
@ -50,17 +51,23 @@ PHPC_OBJ_DEFINE_HANDLER_VAR(gnupg);
/* }}} */ /* }}} */
#define GNUPG_RES_FETCH() \ #define GNUPG_RES_FETCH() \
PHPC_THIS = (PHPC_OBJ_STRUCT_NAME(gnupg) *) PHPC_RES_FETCH(res, "ctx", le_gnupg) PHPC_THIS = (PHPC_OBJ_STRUCT_NAME(gnupg) *) \
PHPC_RES_FETCH(res, "ctx", le_gnupg)
/* {{{ GNUPG_ERR */ /* {{{ GNUPG_ERR */
#define GNUPG_ERR(error) \ #define GNUPG_ERR(error) \
if (PHPC_THIS) { \ if (PHPC_THIS) { \
switch (PHPC_THIS->errormode) { \ switch (PHPC_THIS->errormode) { \
case 1: \ case 1: \
php_error_docref(NULL TSRMLS_CC, E_WARNING, (char*)error); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, \
(char*)error); \
break; \ break; \
case 2: \ case 2: \
zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char*) error, 0 TSRMLS_CC); \ zend_throw_exception(\
zend_exception_get_default(TSRMLS_C), \
(char*) error, \
0 TSRMLS_CC \
); \
break; \ break; \
default: \ default: \
PHPC_THIS->errortxt = (char*)error; \ PHPC_THIS->errortxt = (char*)error; \
@ -95,7 +102,7 @@ static void gnupg_free_encryptkeys(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC)
} }
/* }}} */ /* }}} */
/* {{{ gnupg_free_resource_ptre */ /* {{{ gnupg_free_resource_ptr */
static void gnupg_free_resource_ptr(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC) static void gnupg_free_resource_ptr(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC)
{ {
if (PHPC_THIS) { if (PHPC_THIS) {
@ -135,9 +142,10 @@ static void gnupg_res_init(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC)
err = gpgme_new(&ctx); err = gpgme_new(&ctx);
if (err == GPG_ERR_NO_ERROR) { if (err == GPG_ERR_NO_ERROR) {
#ifdef GNUPG_PATH #ifdef GNUPG_PATH
gpgme_ctx_set_engine_info(ctx, GPGME_PROTOCOL_OpenPGP, GNUPG_PATH, NULL); gpgme_ctx_set_engine_info(\
ctx, GPGME_PROTOCOL_OpenPGP, GNUPG_PATH, NULL);
#endif #endif
gpgme_set_armor(ctx,1); gpgme_set_armor(ctx, 1);
} }
PHPC_THIS->ctx = ctx; PHPC_THIS->ctx = ctx;
PHPC_THIS->encryptkeys = NULL; PHPC_THIS->encryptkeys = NULL;