From: Marcus Boerger Date: Tue, 9 May 2006 22:12:50 +0000 (+0000) Subject: - Methods have flags X-Git-Tag: BEFORE_NEW_OUTPUT_API~254 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c0c9f098fc4d675f6b606e9c457cc0693f98ac0;p=php - Methods have flags --- diff --git a/Zend/zend_API.h b/Zend/zend_API.h index ff30d9fccc..5ab491e249 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -54,11 +54,12 @@ typedef struct _zend_function_entry { #define ZEND_DEP_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED) #define ZEND_FALIAS(name, alias, arg_info) ZEND_FENTRY(name, ZEND_FN(alias), arg_info, 0) #define ZEND_DEP_FALIAS(name, alias, arg_info) ZEND_FENTRY(name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED) +#define ZEND_NAMED_ME(zend_name, name, arg_info, flags) ZEND_FENTRY(zend_name, name, arg_info, flags) #define ZEND_ME(classname, name, arg_info, flags) ZEND_FENTRY(name, ZEND_MN(classname##_##name), arg_info, flags) #define ZEND_ABSTRACT_ME(classname, name, arg_info) ZEND_FENTRY(name, NULL, arg_info, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT) #define ZEND_MALIAS(classname, name, alias, arg_info, flags) \ ZEND_FENTRY(name, ZEND_MN(classname##_##alias), arg_info, flags) -#define ZEND_ME_MAPPING(name, func_name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types) +#define ZEND_ME_MAPPING(name, func_name, arg_types, flags) ZEND_NAMED_ME(name, ZEND_FN(func_name), arg_types, flags) #define ZEND_ARG_INFO(pass_by_ref, name) { {#name}, sizeof(#name)-1, {NULL}, 0, 0, 0, pass_by_ref, 0, 0 }, #define ZEND_ARG_PASS_INFO(pass_by_ref) { {NULL}, 0, {NULL}, 0, 0, 0, pass_by_ref, 0, 0 }, diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index 9fbb6b6f4e..66e3a9fc7f 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -207,61 +207,61 @@ zend_function_entry sqlite_functions[] = { }; zend_function_entry sqlite_funcs_db[] = { - PHP_ME_MAPPING(__construct, sqlite_open, third_arg_force_ref) -/* PHP_ME_MAPPING(close, sqlite_close, NULL)*/ - PHP_ME_MAPPING(query, sqlite_query, third_arg_force_ref) - PHP_ME_MAPPING(queryExec, sqlite_exec, second_arg_force_ref) - PHP_ME_MAPPING(arrayQuery, sqlite_array_query, NULL) - PHP_ME_MAPPING(singleQuery, sqlite_single_query, NULL) - PHP_ME_MAPPING(unbufferedQuery, sqlite_unbuffered_query, third_arg_force_ref) - PHP_ME_MAPPING(lastInsertRowid, sqlite_last_insert_rowid, NULL) - PHP_ME_MAPPING(changes, sqlite_changes, NULL) - PHP_ME_MAPPING(createAggregate, sqlite_create_aggregate, NULL) - PHP_ME_MAPPING(createFunction, sqlite_create_function, NULL) - PHP_ME_MAPPING(busyTimeout, sqlite_busy_timeout, NULL) - PHP_ME_MAPPING(lastError, sqlite_last_error, NULL) - PHP_ME_MAPPING(fetchColumnTypes, sqlite_fetch_column_types, NULL) -/* PHP_ME_MAPPING(error_string, sqlite_error_string, NULL) static */ -/* PHP_ME_MAPPING(escape_string, sqlite_escape_string, NULL) static */ + PHP_ME_MAPPING(__construct, sqlite_open, third_arg_force_ref, 0) +/* PHP_ME_MAPPING(close, sqlite_close, NULL, 0)*/ + PHP_ME_MAPPING(query, sqlite_query, third_arg_force_ref, 0) + PHP_ME_MAPPING(queryExec, sqlite_exec, second_arg_force_ref, 0) + PHP_ME_MAPPING(arrayQuery, sqlite_array_query, NULL, 0) + PHP_ME_MAPPING(singleQuery, sqlite_single_query, NULL, 0) + PHP_ME_MAPPING(unbufferedQuery, sqlite_unbuffered_query, third_arg_force_ref, 0) + PHP_ME_MAPPING(lastInsertRowid, sqlite_last_insert_rowid, NULL, 0) + PHP_ME_MAPPING(changes, sqlite_changes, NULL, 0) + PHP_ME_MAPPING(createAggregate, sqlite_create_aggregate, NULL, 0) + PHP_ME_MAPPING(createFunction, sqlite_create_function, NULL, 0) + PHP_ME_MAPPING(busyTimeout, sqlite_busy_timeout, NULL, 0) + PHP_ME_MAPPING(lastError, sqlite_last_error, NULL, 0) + PHP_ME_MAPPING(fetchColumnTypes, sqlite_fetch_column_types, NULL, 0) +/* PHP_ME_MAPPING(error_string, sqlite_error_string, NULL, 0) static */ +/* PHP_ME_MAPPING(escape_string, sqlite_escape_string, NULL, 0) static */ {NULL, NULL, NULL} }; zend_function_entry sqlite_funcs_query[] = { - PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL) - PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL) - PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL) - PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL) - PHP_ME_MAPPING(column, sqlite_column, NULL) - PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL) - PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL) + PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL, 0) + PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL, 0) + PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL, 0) + PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL, 0) + PHP_ME_MAPPING(column, sqlite_column, NULL, 0) + PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL, 0) + PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL, 0) /* iterator */ - PHP_ME_MAPPING(current, sqlite_current, NULL) - PHP_ME_MAPPING(key, sqlite_key, NULL) - PHP_ME_MAPPING(next, sqlite_next, NULL) - PHP_ME_MAPPING(valid, sqlite_valid, NULL) - PHP_ME_MAPPING(rewind, sqlite_rewind, NULL) + PHP_ME_MAPPING(current, sqlite_current, NULL, 0) + PHP_ME_MAPPING(key, sqlite_key, NULL, 0) + PHP_ME_MAPPING(next, sqlite_next, NULL, 0) + PHP_ME_MAPPING(valid, sqlite_valid, NULL, 0) + PHP_ME_MAPPING(rewind, sqlite_rewind, NULL, 0) /* countable */ - PHP_ME_MAPPING(count, sqlite_num_rows, NULL) + PHP_ME_MAPPING(count, sqlite_num_rows, NULL, 0) /* additional */ - PHP_ME_MAPPING(prev, sqlite_prev, NULL) - PHP_ME_MAPPING(hasPrev, sqlite_has_prev, NULL) - PHP_ME_MAPPING(numRows, sqlite_num_rows, NULL) - PHP_ME_MAPPING(seek, sqlite_seek, NULL) + PHP_ME_MAPPING(prev, sqlite_prev, NULL, 0) + PHP_ME_MAPPING(hasPrev, sqlite_has_prev, NULL, 0) + PHP_ME_MAPPING(numRows, sqlite_num_rows, NULL, 0) + PHP_ME_MAPPING(seek, sqlite_seek, NULL, 0) {NULL, NULL, NULL} }; zend_function_entry sqlite_funcs_ub_query[] = { - PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL) - PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL) - PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL) - PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL) - PHP_ME_MAPPING(column, sqlite_column, NULL) - PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL) - PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL) + PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL, 0) + PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL, 0) + PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL, 0) + PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL, 0) + PHP_ME_MAPPING(column, sqlite_column, NULL, 0) + PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL, 0) + PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL, 0) /* iterator */ - PHP_ME_MAPPING(current, sqlite_current, NULL) - PHP_ME_MAPPING(next, sqlite_next, NULL) - PHP_ME_MAPPING(valid, sqlite_valid, NULL) + PHP_ME_MAPPING(current, sqlite_current, NULL, 0) + PHP_ME_MAPPING(next, sqlite_next, NULL, 0) + PHP_ME_MAPPING(valid, sqlite_valid, NULL, 0) {NULL, NULL, NULL} }; diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 7404f35eba..7011996e09 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -176,53 +176,53 @@ static zend_function_entry xmlwriter_functions[] = { #ifdef ZEND_ENGINE_2 /* {{{ xmlwriter_class_functions */ static zend_function_entry xmlwriter_class_functions[] = { - PHP_ME_MAPPING(openUri, xmlwriter_open_uri, NULL) - PHP_ME_MAPPING(openMemory, xmlwriter_open_memory, NULL) + PHP_ME_MAPPING(openUri, xmlwriter_open_uri, NULL, 0) + PHP_ME_MAPPING(openMemory, xmlwriter_open_memory, NULL, 0) #if LIBXML_VERSION >= 20605 - PHP_ME_MAPPING(setIndent, xmlwriter_set_indent, NULL) - PHP_ME_MAPPING(setIndentString, xmlwriter_set_indent_string, NULL) + PHP_ME_MAPPING(setIndent, xmlwriter_set_indent, NULL, 0) + PHP_ME_MAPPING(setIndentString, xmlwriter_set_indent_string, NULL, 0) #endif #if LIBXML_VERSION >= 20607 - PHP_ME_MAPPING(startComment, xmlwriter_start_comment, NULL) - PHP_ME_MAPPING(endComment, xmlwriter_end_comment, NULL) + PHP_ME_MAPPING(startComment, xmlwriter_start_comment, NULL, 0) + PHP_ME_MAPPING(endComment, xmlwriter_end_comment, NULL, 0) #endif - PHP_ME_MAPPING(startAttribute, xmlwriter_start_attribute, NULL) - PHP_ME_MAPPING(endAttribute, xmlwriter_end_attribute, NULL) - PHP_ME_MAPPING(writeAttribute, xmlwriter_write_attribute, NULL) + PHP_ME_MAPPING(startAttribute, xmlwriter_start_attribute, NULL, 0) + PHP_ME_MAPPING(endAttribute, xmlwriter_end_attribute, NULL, 0) + PHP_ME_MAPPING(writeAttribute, xmlwriter_write_attribute, NULL, 0) #if LIBXML_VERSION > 20617 - PHP_ME_MAPPING(startAttributeNs, xmlwriter_start_attribute_ns,NULL) - PHP_ME_MAPPING(writeAttributeNs, xmlwriter_write_attribute_ns,NULL) + PHP_ME_MAPPING(startAttributeNs, xmlwriter_start_attribute_ns,NULL, 0) + PHP_ME_MAPPING(writeAttributeNs, xmlwriter_write_attribute_ns,NULL, 0) #endif - PHP_ME_MAPPING(startElement, xmlwriter_start_element, NULL) - PHP_ME_MAPPING(endElement, xmlwriter_end_element, NULL) - PHP_ME_MAPPING(fullEndElement, xmlwriter_full_end_element, NULL) - PHP_ME_MAPPING(startElementNs, xmlwriter_start_element_ns, NULL) - PHP_ME_MAPPING(writeElement, xmlwriter_write_element, NULL) - PHP_ME_MAPPING(writeElementNs, xmlwriter_write_element_ns, NULL) - PHP_ME_MAPPING(startPi, xmlwriter_start_pi, NULL) - PHP_ME_MAPPING(endPi, xmlwriter_end_pi, NULL) - PHP_ME_MAPPING(writePi, xmlwriter_write_pi, NULL) - PHP_ME_MAPPING(startCdata, xmlwriter_start_cdata, NULL) - PHP_ME_MAPPING(endCdata, xmlwriter_end_cdata, NULL) - PHP_ME_MAPPING(writeCdata, xmlwriter_write_cdata, NULL) - PHP_ME_MAPPING(text, xmlwriter_text, NULL) - PHP_ME_MAPPING(writeRaw, xmlwriter_write_raw, NULL) - PHP_ME_MAPPING(startDocument, xmlwriter_start_document, NULL) - PHP_ME_MAPPING(endDocument, xmlwriter_end_document, NULL) - PHP_ME_MAPPING(writeComment, xmlwriter_write_comment, NULL) - PHP_ME_MAPPING(startDtd, xmlwriter_start_dtd, NULL) - PHP_ME_MAPPING(endDtd, xmlwriter_end_dtd, NULL) - PHP_ME_MAPPING(writeDtd, xmlwriter_write_dtd, NULL) - PHP_ME_MAPPING(startDtdElement, xmlwriter_start_dtd_element, NULL) - PHP_ME_MAPPING(endDtdElement, xmlwriter_end_dtd_element, NULL) - PHP_ME_MAPPING(writeDtdElement, xmlwriter_write_dtd_element, NULL) + PHP_ME_MAPPING(startElement, xmlwriter_start_element, NULL, 0) + PHP_ME_MAPPING(endElement, xmlwriter_end_element, NULL, 0) + PHP_ME_MAPPING(fullEndElement, xmlwriter_full_end_element, NULL, 0) + PHP_ME_MAPPING(startElementNs, xmlwriter_start_element_ns, NULL, 0) + PHP_ME_MAPPING(writeElement, xmlwriter_write_element, NULL, 0) + PHP_ME_MAPPING(writeElementNs, xmlwriter_write_element_ns, NULL, 0) + PHP_ME_MAPPING(startPi, xmlwriter_start_pi, NULL, 0) + PHP_ME_MAPPING(endPi, xmlwriter_end_pi, NULL, 0) + PHP_ME_MAPPING(writePi, xmlwriter_write_pi, NULL, 0) + PHP_ME_MAPPING(startCdata, xmlwriter_start_cdata, NULL, 0) + PHP_ME_MAPPING(endCdata, xmlwriter_end_cdata, NULL, 0) + PHP_ME_MAPPING(writeCdata, xmlwriter_write_cdata, NULL, 0) + PHP_ME_MAPPING(text, xmlwriter_text, NULL, 0) + PHP_ME_MAPPING(writeRaw, xmlwriter_write_raw, NULL, 0) + PHP_ME_MAPPING(startDocument, xmlwriter_start_document, NULL, 0) + PHP_ME_MAPPING(endDocument, xmlwriter_end_document, NULL, 0) + PHP_ME_MAPPING(writeComment, xmlwriter_write_comment, NULL, 0) + PHP_ME_MAPPING(startDtd, xmlwriter_start_dtd, NULL, 0) + PHP_ME_MAPPING(endDtd, xmlwriter_end_dtd, NULL, 0) + PHP_ME_MAPPING(writeDtd, xmlwriter_write_dtd, NULL, 0) + PHP_ME_MAPPING(startDtdElement, xmlwriter_start_dtd_element, NULL, 0) + PHP_ME_MAPPING(endDtdElement, xmlwriter_end_dtd_element, NULL, 0) + PHP_ME_MAPPING(writeDtdElement, xmlwriter_write_dtd_element, NULL, 0) #if LIBXML_VERSION > 20608 - PHP_ME_MAPPING(startDtdAttlist, xmlwriter_start_dtd_attlist, NULL) - PHP_ME_MAPPING(endDtdAttlist, xmlwriter_end_dtd_attlist, NULL) - PHP_ME_MAPPING(writeDtdAttlist, xmlwriter_write_dtd_attlist, NULL) + PHP_ME_MAPPING(startDtdAttlist, xmlwriter_start_dtd_attlist, NULL, 0) + PHP_ME_MAPPING(endDtdAttlist, xmlwriter_end_dtd_attlist, NULL, 0) + PHP_ME_MAPPING(writeDtdAttlist, xmlwriter_write_dtd_attlist, NULL, 0) #endif - PHP_ME_MAPPING(outputMemory, xmlwriter_output_memory, NULL) - PHP_ME_MAPPING(flush, xmlwriter_flush, NULL) + PHP_ME_MAPPING(outputMemory, xmlwriter_output_memory, NULL, 0) + PHP_ME_MAPPING(flush, xmlwriter_flush, NULL, 0) {NULL, NULL, NULL} }; /* }}} */