From 1503e63658cc86fe4ff26bfba02ac326388541b6 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Tue, 23 Feb 2021 22:45:15 +0100 Subject: [PATCH] Fixed compile error be generating arginfo headers --- pcsc_arginfo.h | 63 ++++++++++++++++++++++--------------------- pcsc_legacy_arginfo.h | 60 ++++++++++++++++++++--------------------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/pcsc_arginfo.h b/pcsc_arginfo.h index 6ecb3e8..704a4ae 100644 --- a/pcsc_arginfo.h +++ b/pcsc_arginfo.h @@ -1,51 +1,54 @@ +/* This is a generated file, edit the .stub.php file instead. + * Stub hash: 676b86ff0a1ee4d762d86126e8068f4cb6805272 */ + ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_establish_context, 0, 0, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_release_context, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() #define arginfo_scard_is_valid_context arginfo_scard_release_context ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_scard_list_readers, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_scard_connect, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, context) - ZEND_ARG_TYPE_INFO(0, reader_name, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preferred_protocol, IS_LONG, 0, "SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, current_protocol, IS_LONG, 0, "NULL") + ZEND_ARG_INFO(0, context) + ZEND_ARG_TYPE_INFO(0, reader_name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preferred_protocol, IS_LONG, 0, "SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, current_protocol, IS_LONG, 0, "NULL") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_disconnect, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, card) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disposition, IS_LONG, 0, "SCARD_EJECT_CARD") + ZEND_ARG_INFO(0, card) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disposition, IS_LONG, 0, "SCARD_EJECT_CARD") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_begin_transaction, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, card) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_begin_transaction, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, card) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_end_transaction, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, card) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disposition, IS_LONG, 0, "SCARD_LEAVE_CARD") +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_end_transaction, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, card) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disposition, IS_LONG, 0, "SCARD_LEAVE_CARD") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_scard_transmit, 0, 2, MAY_BE_STRING|MAY_BE_FALSE) - ZEND_ARG_INFO(0, card) - ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0) + ZEND_ARG_INFO(0, card) + ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_scard_status, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, card) + ZEND_ARG_INFO(0, card) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_last_errno, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_scard_errstr, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, errno, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, errno, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -64,17 +67,17 @@ ZEND_FUNCTION(scard_errstr); static const zend_function_entry ext_functions[] = { - ZEND_FE(scard_establish_context, arginfo_scard_establish_context) - ZEND_FE(scard_release_context, arginfo_scard_release_context) - ZEND_FE(scard_is_valid_context, arginfo_scard_is_valid_context) - ZEND_FE(scard_list_readers, arginfo_scard_list_readers) - ZEND_FE(scard_connect, arginfo_scard_connect) - ZEND_FE(scard_disconnect, arginfo_scard_disconnect) - ZEND_FE(scard_begin_transaction, arginfo_scard_begin_transaction) - ZEND_FE(scard_end_transaction, arginfo_scard_end_transaction) - ZEND_FE(scard_transmit, arginfo_scard_transmit) - ZEND_FE(scard_status, arginfo_scard_status) - ZEND_FE(scard_last_errno, arginfo_scard_last_errno) - ZEND_FE(scard_errstr, arginfo_scard_errstr) - ZEND_FE_END + ZEND_FE(scard_establish_context, arginfo_scard_establish_context) + ZEND_FE(scard_release_context, arginfo_scard_release_context) + ZEND_FE(scard_is_valid_context, arginfo_scard_is_valid_context) + ZEND_FE(scard_list_readers, arginfo_scard_list_readers) + ZEND_FE(scard_connect, arginfo_scard_connect) + ZEND_FE(scard_disconnect, arginfo_scard_disconnect) + ZEND_FE(scard_begin_transaction, arginfo_scard_begin_transaction) + ZEND_FE(scard_end_transaction, arginfo_scard_end_transaction) + ZEND_FE(scard_transmit, arginfo_scard_transmit) + ZEND_FE(scard_status, arginfo_scard_status) + ZEND_FE(scard_last_errno, arginfo_scard_last_errno) + ZEND_FE(scard_errstr, arginfo_scard_errstr) + ZEND_FE_END }; diff --git a/pcsc_legacy_arginfo.h b/pcsc_legacy_arginfo.h index 17975db..132f188 100644 --- a/pcsc_legacy_arginfo.h +++ b/pcsc_legacy_arginfo.h @@ -1,8 +1,11 @@ +/* This is a generated file, edit the .stub.php file instead. + * Stub hash: 676b86ff0a1ee4d762d86126e8068f4cb6805272 */ + ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_establish_context, 0, 0, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_release_context, 0, 0, 1) - ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, context) ZEND_END_ARG_INFO() #define arginfo_scard_is_valid_context arginfo_scard_release_context @@ -10,39 +13,34 @@ ZEND_END_ARG_INFO() #define arginfo_scard_list_readers arginfo_scard_release_context ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_connect, 0, 0, 2) - ZEND_ARG_INFO(0, context) - ZEND_ARG_INFO(0, reader_name) - ZEND_ARG_INFO(0, preferred_protocol) - ZEND_ARG_INFO(1, current_protocol) + ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, reader_name) + ZEND_ARG_INFO(0, preferred_protocol) + ZEND_ARG_INFO(1, current_protocol) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_disconnect, 0, 0, 1) - ZEND_ARG_INFO(0, card) - ZEND_ARG_INFO(0, disposition) + ZEND_ARG_INFO(0, card) + ZEND_ARG_INFO(0, disposition) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_begin_transaction, 0, 0, 1) - ZEND_ARG_INFO(0, card) + ZEND_ARG_INFO(0, card) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_end_transaction, 0, 0, 1) - ZEND_ARG_INFO(0, card) - ZEND_ARG_INFO(0, disposition) -ZEND_END_ARG_INFO() +#define arginfo_scard_end_transaction arginfo_scard_disconnect ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_transmit, 0, 0, 2) - ZEND_ARG_INFO(0, card) - ZEND_ARG_INFO(0, command) + ZEND_ARG_INFO(0, card) + ZEND_ARG_INFO(0, command) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_status, 0, 0, 1) - ZEND_ARG_INFO(0, card) -ZEND_END_ARG_INFO() +#define arginfo_scard_status arginfo_scard_begin_transaction #define arginfo_scard_last_errno arginfo_scard_establish_context ZEND_BEGIN_ARG_INFO_EX(arginfo_scard_errstr, 0, 0, 1) - ZEND_ARG_INFO(0, errno) + ZEND_ARG_INFO(0, errno) ZEND_END_ARG_INFO() @@ -61,17 +59,17 @@ ZEND_FUNCTION(scard_errstr); static const zend_function_entry ext_functions[] = { - ZEND_FE(scard_establish_context, arginfo_scard_establish_context) - ZEND_FE(scard_release_context, arginfo_scard_release_context) - ZEND_FE(scard_is_valid_context, arginfo_scard_is_valid_context) - ZEND_FE(scard_list_readers, arginfo_scard_list_readers) - ZEND_FE(scard_connect, arginfo_scard_connect) - ZEND_FE(scard_disconnect, arginfo_scard_disconnect) - ZEND_FE(scard_begin_transaction, arginfo_scard_begin_transaction) - ZEND_FE(scard_end_transaction, arginfo_scard_end_transaction) - ZEND_FE(scard_transmit, arginfo_scard_transmit) - ZEND_FE(scard_status, arginfo_scard_status) - ZEND_FE(scard_last_errno, arginfo_scard_last_errno) - ZEND_FE(scard_errstr, arginfo_scard_errstr) - ZEND_FE_END + ZEND_FE(scard_establish_context, arginfo_scard_establish_context) + ZEND_FE(scard_release_context, arginfo_scard_release_context) + ZEND_FE(scard_is_valid_context, arginfo_scard_is_valid_context) + ZEND_FE(scard_list_readers, arginfo_scard_list_readers) + ZEND_FE(scard_connect, arginfo_scard_connect) + ZEND_FE(scard_disconnect, arginfo_scard_disconnect) + ZEND_FE(scard_begin_transaction, arginfo_scard_begin_transaction) + ZEND_FE(scard_end_transaction, arginfo_scard_end_transaction) + ZEND_FE(scard_transmit, arginfo_scard_transmit) + ZEND_FE(scard_status, arginfo_scard_status) + ZEND_FE(scard_last_errno, arginfo_scard_last_errno) + ZEND_FE(scard_errstr, arginfo_scard_errstr) + ZEND_FE_END };