github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2026-02-05 05:41:34 +00:00
Code Issues Projects Releases Packages Activity

proper macro usage

Browse source 
deletekey now accepts a secret key in procedural mode
fixed erealloc in addencryptkey
This commit is contained in:
Thilo Raufeisen 2006-11-03 12:38:35 +00:00
parent 6803be309c
commit f98e3c57e4
4 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gnupg_keylistiterator.c
View file

@ -82,12 +82,12 @@ zend_object_value gnupg_keylistiterator_objects_new(zend_class_entry *class_type
/* {{{ methodlist gnupg_keylistiterator */
static zend_function_entry gnupg_keylistiterator_methods[] = {
ZEND_ME(gnupg_keylistiterator, __construct, NULL, ZEND_ACC_PUBLIC)
ZEND_ME(gnupg_keylistiterator, current, NULL, ZEND_ACC_PUBLIC)
ZEND_ME(gnupg_keylistiterator, key, NULL, ZEND_ACC_PUBLIC)
ZEND_ME(gnupg_keylistiterator, next, NULL, ZEND_ACC_PUBLIC)
ZEND_ME(gnupg_keylistiterator, rewind, NULL, ZEND_ACC_PUBLIC)
ZEND_ME(gnupg_keylistiterator, valid, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, __construct, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, current, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, key, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, next, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, rewind, NULL, ZEND_ACC_PUBLIC)
PHP_ME(gnupg_keylistiterator, valid, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
/* }}} */
@ -112,7 +112,7 @@ int _gnupg_keylistiterator_init(INIT_FUNC_ARGS)
/* }}} */
PHP_FUNCTION(gnupg_keylistiterator___construct){
PHP_METHOD(gnupg_keylistiterator,__construct){
zval *pattern;
int args = ZEND_NUM_ARGS();
@ -129,19 +129,19 @@ PHP_FUNCTION(gnupg_keylistiterator___construct){
ZVAL_EMPTY_STRING(&intern->pattern);
}
}
PHP_FUNCTION(gnupg_keylistiterator_current){
PHP_METHOD(gnupg_keylistiterator,current){
GNUPG_GET_ITERATOR();
RETURN_STRING(intern->gpgkey->uids[0].uid,1);
}
PHP_FUNCTION(gnupg_keylistiterator_key){
PHP_METHOD(gnupg_keylistiterator,key){
GNUPG_GET_ITERATOR();
RETURN_STRING(intern->gpgkey->subkeys[0].fpr,1);
}
PHP_FUNCTION(gnupg_keylistiterator_next){
PHP_METHOD(gnupg_keylistiterator,next){
GNUPG_GET_ITERATOR();
if(intern->gpgkey){
@ -155,7 +155,7 @@ PHP_FUNCTION(gnupg_keylistiterator_next){
RETURN_TRUE;
}
PHP_FUNCTION(gnupg_keylistiterator_rewind){
PHP_METHOD(gnupg_keylistiterator,rewind){
GNUPG_GET_ITERATOR();
if((intern->err = gpgme_op_keylist_start(intern->ctx, Z_STRVAL(intern->pattern), 0)) != GPG_ERR_NO_ERROR){
@ -167,7 +167,7 @@ PHP_FUNCTION(gnupg_keylistiterator_rewind){
RETURN_TRUE;
}
PHP_FUNCTION(gnupg_keylistiterator_valid){
PHP_METHOD(gnupg_keylistiterator,valid){
GNUPG_GET_ITERATOR();
if(intern->gpgkey!=NULL){