archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove proto comments from C files

Browse source 
Closes GH-5758
This commit is contained in:
Max Semenik 2020-07-01 16:32:55 +03:00 • committed by Máté Kocsis
parent 4757998650
commit 2b5de6f839
No known key found for this signature in database
GPG key ID: FD055E41728BF310
234 changed files with 3892 additions and 8084 deletions
Download patch file Download diff file Expand all files Collapse all files

161
Zend/zend_builtin_functions.c
View file

@ -65,8 +65,7 @@ int zend_startup_builtin_functions(void) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto string zend_version(void) /* {{{ Get the version of the Zend Engine */
Get the version of the Zend Engine */
ZEND_FUNCTION(zend_version) ZEND_FUNCTION(zend_version)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -75,8 +74,7 @@ ZEND_FUNCTION(zend_version)
} }
/* }}} */ /* }}} */
/* {{{ proto int gc_mem_caches(void) /* {{{ Reclaims memory used by MM caches.
Reclaims memory used by MM caches.
Returns number of freed bytes */ Returns number of freed bytes */
ZEND_FUNCTION(gc_mem_caches) ZEND_FUNCTION(gc_mem_caches)
{ {
@ -86,8 +84,7 @@ ZEND_FUNCTION(gc_mem_caches)
} }
/* }}} */ /* }}} */
/* {{{ proto int gc_collect_cycles(void) /* {{{ Forces collection of any existing garbage cycles.
Forces collection of any existing garbage cycles.
Returns number of freed zvals */ Returns number of freed zvals */
ZEND_FUNCTION(gc_collect_cycles) ZEND_FUNCTION(gc_collect_cycles)
{ {
@ -97,8 +94,7 @@ ZEND_FUNCTION(gc_collect_cycles)
} }
/* }}} */ /* }}} */
/* {{{ proto void gc_enabled(void) /* {{{ Returns status of the circular reference collector */
Returns status of the circular reference collector */
ZEND_FUNCTION(gc_enabled) ZEND_FUNCTION(gc_enabled)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -107,8 +103,7 @@ ZEND_FUNCTION(gc_enabled)
} }
/* }}} */ /* }}} */
/* {{{ proto void gc_enable(void) /* {{{ Activates the circular reference collector */
Activates the circular reference collector */
ZEND_FUNCTION(gc_enable) ZEND_FUNCTION(gc_enable)
{ {
zend_string *key; zend_string *key;
@ -121,8 +116,7 @@ ZEND_FUNCTION(gc_enable)
} }
/* }}} */ /* }}} */
/* {{{ proto void gc_disable(void) /* {{{ Deactivates the circular reference collector */
Deactivates the circular reference collector */
ZEND_FUNCTION(gc_disable) ZEND_FUNCTION(gc_disable)
{ {
zend_string *key; zend_string *key;
@ -135,8 +129,7 @@ ZEND_FUNCTION(gc_disable)
} }
/* }}} */ /* }}} */
/* {{{ proto array gc_status(void) /* {{{ Returns current GC statistics */
Returns current GC statistics */
ZEND_FUNCTION(gc_status) ZEND_FUNCTION(gc_status)
{ {
zend_gc_status status; zend_gc_status status;
@ -154,8 +147,7 @@ ZEND_FUNCTION(gc_status)
} }
/* }}} */ /* }}} */
/* {{{ proto int func_num_args(void) /* {{{ Get the number of arguments that were passed to the function */
Get the number of arguments that were passed to the function */
ZEND_FUNCTION(func_num_args) ZEND_FUNCTION(func_num_args)
{ {
zend_execute_data *ex = EX(prev_execute_data); zend_execute_data *ex = EX(prev_execute_data);
@ -175,8 +167,7 @@ ZEND_FUNCTION(func_num_args)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed func_get_arg(int arg_num) /* {{{ Get the $arg_num'th argument that was passed to the function */
Get the $arg_num'th argument that was passed to the function */
ZEND_FUNCTION(func_get_arg) ZEND_FUNCTION(func_get_arg)
{ {
uint32_t arg_count, first_extra_arg; uint32_t arg_count, first_extra_arg;
@ -222,8 +213,7 @@ ZEND_FUNCTION(func_get_arg)
} }
/* }}} */ /* }}} */
/* {{{ proto array func_get_args() /* {{{ Get an array of the arguments that were passed to the function */
Get an array of the arguments that were passed to the function */
ZEND_FUNCTION(func_get_args) ZEND_FUNCTION(func_get_args)
{ {
zval *p, *q; zval *p, *q;
@ -292,8 +282,7 @@ ZEND_FUNCTION(func_get_args)
} }
/* }}} */ /* }}} */
/* {{{ proto int strlen(string str) /* {{{ Get string length
Get string length
Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ Warning: This function is special-cased by zend_compile.c and so is usually bypassed */
ZEND_FUNCTION(strlen) ZEND_FUNCTION(strlen)
{ {
@ -307,8 +296,7 @@ ZEND_FUNCTION(strlen)
} }
/* }}} */ /* }}} */
/* {{{ proto int strcmp(string str1, string str2) /* {{{ Binary safe string comparison */
Binary safe string comparison */
ZEND_FUNCTION(strcmp) ZEND_FUNCTION(strcmp)
{ {
zend_string *s1, *s2; zend_string *s1, *s2;
@ -322,8 +310,7 @@ ZEND_FUNCTION(strcmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int strncmp(string str1, string str2, int len) /* {{{ Binary safe string comparison */
Binary safe string comparison */
ZEND_FUNCTION(strncmp) ZEND_FUNCTION(strncmp)
{ {
zend_string *s1, *s2; zend_string *s1, *s2;
@ -344,8 +331,7 @@ ZEND_FUNCTION(strncmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int strcasecmp(string str1, string str2) /* {{{ Binary safe case-insensitive string comparison */
Binary safe case-insensitive string comparison */
ZEND_FUNCTION(strcasecmp) ZEND_FUNCTION(strcasecmp)
{ {
zend_string *s1, *s2; zend_string *s1, *s2;
@ -359,8 +345,7 @@ ZEND_FUNCTION(strcasecmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int strncasecmp(string str1, string str2, int len) /* {{{ Binary safe string comparison */
Binary safe string comparison */
ZEND_FUNCTION(strncasecmp) ZEND_FUNCTION(strncasecmp)
{ {
zend_string *s1, *s2; zend_string *s1, *s2;
@ -381,8 +366,7 @@ ZEND_FUNCTION(strncasecmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int error_reporting([int new_error_level]) /* {{{ Return the current error_reporting level, and if an argument was passed - change to the new level */
Return the current error_reporting level, and if an argument was passed - change to the new level */
ZEND_FUNCTION(error_reporting) ZEND_FUNCTION(error_reporting)
{ {
zval *err = NULL; zval *err = NULL;
@ -496,8 +480,7 @@ static void copy_constant_array(zval *dst, zval *src) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto bool define(string constant_name, mixed value[, bool case_insensitive]) /* {{{ Define a new constant */
Define a new constant */
ZEND_FUNCTION(define) ZEND_FUNCTION(define)
{ {
zend_string *name; zend_string *name;
@ -571,8 +554,7 @@ register_constant:
} }
/* }}} */ /* }}} */
/* {{{ proto bool defined(string constant_name) /* {{{ Check whether a constant exists
Check whether a constant exists
Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ Warning: This function is special-cased by zend_compile.c and so is usually bypassed */
ZEND_FUNCTION(defined) ZEND_FUNCTION(defined)
{ {
@ -590,8 +572,7 @@ ZEND_FUNCTION(defined)
} }
/* }}} */ /* }}} */
/* {{{ proto string get_class([object object]) /* {{{ Retrieves the class name */
Retrieves the class name */
ZEND_FUNCTION(get_class) ZEND_FUNCTION(get_class)
{ {
zval *obj = NULL; zval *obj = NULL;
@ -615,8 +596,7 @@ ZEND_FUNCTION(get_class)
} }
/* }}} */ /* }}} */
/* {{{ proto string get_called_class() /* {{{ Retrieves the "Late Static Binding" class name */
Retrieves the "Late Static Binding" class name */
ZEND_FUNCTION(get_called_class) ZEND_FUNCTION(get_called_class)
{ {
zend_class_entry *called_scope; zend_class_entry *called_scope;
@ -633,8 +613,7 @@ ZEND_FUNCTION(get_called_class)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed get_parent_class([mixed object]) /* {{{ Retrieves the parent class name for object or class or current scope or false if not in a scope. */
Retrieves the parent class name for object or class or current scope or false if not in a scope. */
ZEND_FUNCTION(get_parent_class) ZEND_FUNCTION(get_parent_class)
{ {
zend_class_entry *ce = NULL; zend_class_entry *ce = NULL;
@ -708,16 +687,14 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /*
} }
/* }}} */ /* }}} */
/* {{{ proto bool is_subclass_of(mixed object_or_string, string class_name [, bool allow_string]) /* {{{ Returns true if the object has this class as one of its parents */
Returns true if the object has this class as one of its parents */
ZEND_FUNCTION(is_subclass_of) ZEND_FUNCTION(is_subclass_of)
{ {
is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool is_a(mixed object_or_string, string class_name [, bool allow_string]) /* {{{ Returns true if the first argument is an object and is this class or has this class as one of its parents, */
Returns true if the first argument is an object and is this class or has this class as one of its parents, */
ZEND_FUNCTION(is_a) ZEND_FUNCTION(is_a)
{ {
is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
@ -771,8 +748,7 @@ static void add_class_vars(zend_class_entry *scope, zend_class_entry *ce, int st
} }
/* }}} */ /* }}} */
/* {{{ proto array get_class_vars(string class_name) /* {{{ Returns an array of default properties of the class. */
Returns an array of default properties of the class. */
ZEND_FUNCTION(get_class_vars) ZEND_FUNCTION(get_class_vars)
{ {
zend_string *class_name; zend_string *class_name;
@ -799,8 +775,7 @@ ZEND_FUNCTION(get_class_vars)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_object_vars(object obj) /* {{{ Returns an array of object properties */
Returns an array of object properties */
ZEND_FUNCTION(get_object_vars) ZEND_FUNCTION(get_object_vars)
{ {
zval *obj; zval *obj;
@ -870,8 +845,7 @@ ZEND_FUNCTION(get_object_vars)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_mangled_object_vars(object obj) /* {{{ Returns an array of mangled object properties. Does not respect property visibility. */
Returns an array of mangled object properties. Does not respect property visibility. */
ZEND_FUNCTION(get_mangled_object_vars) ZEND_FUNCTION(get_mangled_object_vars)
{ {
zval *obj; zval *obj;
@ -913,8 +887,7 @@ static int same_name(zend_string *key, zend_string *name) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto array get_class_methods(mixed class) /* {{{ Returns an array of method names for class or class instance. */
Returns an array of method names for class or class instance. */
ZEND_FUNCTION(get_class_methods) ZEND_FUNCTION(get_class_methods)
{ {
zval method_name; zval method_name;
@ -944,8 +917,7 @@ ZEND_FUNCTION(get_class_methods)
} }
/* }}} */ /* }}} */
/* {{{ proto bool method_exists(object object, string method) /* {{{ Checks if the class method exists */
Checks if the class method exists */
ZEND_FUNCTION(method_exists) ZEND_FUNCTION(method_exists)
{ {
zval *klass; zval *klass;
@ -1002,8 +974,7 @@ ZEND_FUNCTION(method_exists)
} }
/* }}} */ /* }}} */
/* {{{ proto bool property_exists(mixed object_or_class, string property_name) /* {{{ Checks if the object or class has a property */
Checks if the object or class has a property */
ZEND_FUNCTION(property_exists) ZEND_FUNCTION(property_exists)
{ {
zval *object; zval *object;
@ -1078,32 +1049,28 @@ static inline void class_exists_impl(INTERNAL_FUNCTION_PARAMETERS, int flags, in
} }
/* {{{ */ /* {{{ */
/* {{{ proto bool class_exists(string classname [, bool autoload]) /* {{{ Checks if the class exists */
Checks if the class exists */
ZEND_FUNCTION(class_exists) ZEND_FUNCTION(class_exists)
{ {
class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT); class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT);
} }
/* }}} */ /* }}} */
/* {{{ proto bool interface_exists(string classname [, bool autoload]) /* {{{ Checks if the class exists */
Checks if the class exists */
ZEND_FUNCTION(interface_exists) ZEND_FUNCTION(interface_exists)
{ {
class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED|ZEND_ACC_INTERFACE, 0); class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED|ZEND_ACC_INTERFACE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool trait_exists(string traitname [, bool autoload]) /* {{{ Checks if the trait exists */
Checks if the trait exists */
ZEND_FUNCTION(trait_exists) ZEND_FUNCTION(trait_exists)
{ {
class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0); class_exists_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool function_exists(string function_name) /* {{{ Checks if the function exists */
Checks if the function exists */
ZEND_FUNCTION(function_exists) ZEND_FUNCTION(function_exists)
{ {
zend_string *name; zend_string *name;
@ -1129,8 +1096,7 @@ ZEND_FUNCTION(function_exists)
} }
/* }}} */ /* }}} */
/* {{{ proto bool class_alias(string user_class_name , string alias_name [, bool autoload]) /* {{{ Creates an alias for user defined class */
Creates an alias for user defined class */
ZEND_FUNCTION(class_alias) ZEND_FUNCTION(class_alias)
{ {
zend_string *class_name; zend_string *class_name;
@ -1164,8 +1130,7 @@ ZEND_FUNCTION(class_alias)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_included_files(void) /* {{{ Returns an array with the file names that were include_once()'d */
Returns an array with the file names that were include_once()'d */
ZEND_FUNCTION(get_included_files) ZEND_FUNCTION(get_included_files)
{ {
zend_string *entry; zend_string *entry;
@ -1181,8 +1146,7 @@ ZEND_FUNCTION(get_included_files)
} }
/* }}} */ /* }}} */
/* {{{ proto bool trigger_error(string message [, int error_type]) /* {{{ Generates a user-level error/warning/notice message */
Generates a user-level error/warning/notice message */
ZEND_FUNCTION(trigger_error) ZEND_FUNCTION(trigger_error)
{ {
zend_long error_type = E_USER_NOTICE; zend_long error_type = E_USER_NOTICE;
@ -1212,8 +1176,7 @@ ZEND_FUNCTION(trigger_error)
} }
/* }}} */ /* }}} */
/* {{{ proto string set_error_handler(callable error_handler [, int error_types]) /* {{{ Sets a user-defined error handler function. Returns the previously defined error handler, or false on error */
Sets a user-defined error handler function. Returns the previously defined error handler, or false on error */
ZEND_FUNCTION(set_error_handler) ZEND_FUNCTION(set_error_handler)
{ {
zval *error_handler; zval *error_handler;
@ -1249,8 +1212,7 @@ ZEND_FUNCTION(set_error_handler)
} }
/* }}} */ /* }}} */
/* {{{ proto void restore_error_handler(void) /* {{{ Restores the previously defined error handler function */
Restores the previously defined error handler function */
ZEND_FUNCTION(restore_error_handler) ZEND_FUNCTION(restore_error_handler)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -1279,8 +1241,7 @@ ZEND_FUNCTION(restore_error_handler)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed set_exception_handler(callable exception_handler) /* {{{ Sets a user-defined exception handler function. Returns the previously defined exception handler, or false on error */
Sets a user-defined exception handler function. Returns the previously defined exception handler, or false on error */
ZEND_FUNCTION(set_exception_handler) ZEND_FUNCTION(set_exception_handler)
{ {
zval *exception_handler; zval *exception_handler;
@ -1313,8 +1274,7 @@ ZEND_FUNCTION(set_exception_handler)
} }
/* }}} */ /* }}} */
/* {{{ proto void restore_exception_handler(void) /* {{{ Restores the previously defined exception handler function */
Restores the previously defined exception handler function */
ZEND_FUNCTION(restore_exception_handler) ZEND_FUNCTION(restore_exception_handler)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -1364,32 +1324,28 @@ static inline void get_declared_class_impl(INTERNAL_FUNCTION_PARAMETERS, int fla
} }
/* {{{ */ /* {{{ */
/* {{{ proto array get_declared_traits() /* {{{ Returns an array of all declared traits. */
Returns an array of all declared traits. */
ZEND_FUNCTION(get_declared_traits) ZEND_FUNCTION(get_declared_traits)
{ {
get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0); get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_TRAIT, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto array get_declared_classes() /* {{{ Returns an array of all declared classes. */
Returns an array of all declared classes. */
ZEND_FUNCTION(get_declared_classes) ZEND_FUNCTION(get_declared_classes)
{ {
get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT); get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_LINKED, ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT);
} }
/* }}} */ /* }}} */
/* {{{ proto array get_declared_interfaces() /* {{{ Returns an array of all declared interfaces. */
Returns an array of all declared interfaces. */
ZEND_FUNCTION(get_declared_interfaces) ZEND_FUNCTION(get_declared_interfaces)
{ {
get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_INTERFACE, 0); get_declared_class_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_INTERFACE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto array get_defined_functions(void) /* {{{ Returns an array of all defined functions */
Returns an array of all defined functions */
ZEND_FUNCTION(get_defined_functions) ZEND_FUNCTION(get_defined_functions)
{ {
zval internal, user; zval internal, user;
@ -1425,8 +1381,7 @@ ZEND_FUNCTION(get_defined_functions)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_defined_vars(void) /* {{{ Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */
Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */
ZEND_FUNCTION(get_defined_vars) ZEND_FUNCTION(get_defined_vars)
{ {
zend_array *symbol_table; zend_array *symbol_table;
@ -1455,8 +1410,7 @@ ZEND_FUNCTION(zend_thread_id)
} }
#endif #endif
/* {{{ proto string get_resource_type(resource res) /* {{{ Get the resource type name for a given resource */
Get the resource type name for a given resource */
ZEND_FUNCTION(get_resource_type) ZEND_FUNCTION(get_resource_type)
{ {
const char *resource_type; const char *resource_type;
@ -1475,8 +1429,7 @@ ZEND_FUNCTION(get_resource_type)
} }
/* }}} */ /* }}} */
/* {{{ proto int get_resource_id(resource res) /* {{{ Get the resource ID for a given resource */
Get the resource ID for a given resource */
ZEND_FUNCTION(get_resource_id) ZEND_FUNCTION(get_resource_id)
{ {
zval *resource; zval *resource;
@ -1489,8 +1442,7 @@ ZEND_FUNCTION(get_resource_id)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_resources([string resource_type]) /* {{{ Get an array with all active resources */
Get an array with all active resources */
ZEND_FUNCTION(get_resources) ZEND_FUNCTION(get_resources)
{ {
zend_string *type = NULL; zend_string *type = NULL;
@ -1544,8 +1496,7 @@ static void add_zendext_info(zend_extension *ext, void *arg) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto array get_loaded_extensions([bool zend_extensions]) /* {{{ Return an array containing names of loaded extensions */
Return an array containing names of loaded extensions */
ZEND_FUNCTION(get_loaded_extensions) ZEND_FUNCTION(get_loaded_extensions)
{ {
zend_bool zendext = 0; zend_bool zendext = 0;
@ -1568,8 +1519,7 @@ ZEND_FUNCTION(get_loaded_extensions)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_defined_constants([bool categorize]) /* {{{ Return an array containing the names and values of all defined constants */
Return an array containing the names and values of all defined constants */
ZEND_FUNCTION(get_defined_constants) ZEND_FUNCTION(get_defined_constants)
{ {
zend_bool categorize = 0; zend_bool categorize = 0;
@ -1743,7 +1693,7 @@ static inline zend_bool skip_internal_handler(zend_execute_data *skip) /* {{{ */
} }
/* {{{ */ /* {{{ */
/* {{{ proto void debug_print_backtrace([int options[, int limit]]) */ /* {{{ */
ZEND_FUNCTION(debug_print_backtrace) ZEND_FUNCTION(debug_print_backtrace)
{ {
zend_execute_data *call, *ptr, *skip; zend_execute_data *call, *ptr, *skip;
@ -2129,8 +2079,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
} }
/* }}} */ /* }}} */
/* {{{ proto array debug_backtrace([int options[, int limit]]) /* {{{ Return backtrace as array */
Return backtrace as array */
ZEND_FUNCTION(debug_backtrace) ZEND_FUNCTION(debug_backtrace)
{ {
zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT; zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT;
@ -2144,8 +2093,7 @@ ZEND_FUNCTION(debug_backtrace)
} }
/* }}} */ /* }}} */
/* {{{ proto bool extension_loaded(string extension_name) /* {{{ Returns true if the named extension is loaded */
Returns true if the named extension is loaded */
ZEND_FUNCTION(extension_loaded) ZEND_FUNCTION(extension_loaded)
{ {
zend_string *extension_name; zend_string *extension_name;
@ -2165,8 +2113,7 @@ ZEND_FUNCTION(extension_loaded)
} }
/* }}} */ /* }}} */
/* {{{ proto array get_extension_funcs(string extension_name) /* {{{ Returns an array with the names of functions belonging to the named extension */
Returns an array with the names of functions belonging to the named extension */
ZEND_FUNCTION(get_extension_funcs) ZEND_FUNCTION(get_extension_funcs)
{ {
zend_string *extension_name; zend_string *extension_name;

12
Zend/zend_closures.c
View file

@ -109,8 +109,7 @@ static zend_bool zend_valid_closure_binding(
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Closure::call(object to [, mixed parameter] [, mixed ...] ) /* {{{ Call closure, binding to a given object with its class as the scope */
Call closure, binding to a given object with its class as the scope */
ZEND_METHOD(Closure, call) ZEND_METHOD(Closure, call)
{ {
zval *newthis, closure_result; zval *newthis, closure_result;
@ -187,8 +186,7 @@ ZEND_METHOD(Closure, call)
} }
/* }}} */ /* }}} */
/* {{{ proto Closure Closure::bind(callable old, object to [, mixed scope]) /* {{{ Create a closure from another one and bind to another object and scope */
Create a closure from another one and bind to another object and scope */
ZEND_METHOD(Closure, bind) ZEND_METHOD(Closure, bind)
{ {
zval *newthis, *zclosure, *scope_arg = NULL; zval *newthis, *zclosure, *scope_arg = NULL;
@ -323,8 +321,7 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable,
} }
/* }}} */ /* }}} */
/* {{{ proto Closure Closure::fromCallable(callable callable) /* {{{ Create a closure from a callable using the current scope. */
Create a closure from a callable using the current scope. */
ZEND_METHOD(Closure, fromCallable) ZEND_METHOD(Closure, fromCallable)
{ {
zval *callable; zval *callable;
@ -591,8 +588,7 @@ static HashTable *zend_closure_get_gc(zend_object *obj, zval **table, int *n) /*
} }
/* }}} */ /* }}} */
/* {{{ proto Closure::__construct() /* {{{ Private constructor preventing instantiation */
Private constructor preventing instantiation */
ZEND_COLD ZEND_METHOD(Closure, __construct) ZEND_COLD ZEND_METHOD(Closure, __construct)
{ {
zend_throw_error(NULL, "Instantiation of 'Closure' is not allowed"); zend_throw_error(NULL, "Instantiation of 'Closure' is not allowed");

39
Zend/zend_exceptions.c
View file

@ -267,8 +267,7 @@ static zend_object *zend_error_exception_new(zend_class_entry *class_type) /* {{
} }
/* }}} */ /* }}} */
/* {{{ proto Exception|Error Exception|Error::__clone() /* {{{ Clone the exception object */
Clone the exception object */
ZEND_COLD ZEND_METHOD(Exception, __clone) ZEND_COLD ZEND_METHOD(Exception, __clone)
{ {
/* Should never be executable */ /* Should never be executable */
@ -276,8 +275,7 @@ ZEND_COLD ZEND_METHOD(Exception, __clone)
} }
/* }}} */ /* }}} */
/* {{{ proto Exception|Error::__construct(string message, int code [, Throwable previous]) /* {{{ Exception constructor */
Exception constructor */
ZEND_METHOD(Exception, __construct) ZEND_METHOD(Exception, __construct)
{ {
zend_string *message = NULL; zend_string *message = NULL;
@ -308,8 +306,7 @@ ZEND_METHOD(Exception, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto Exception::__wakeup() /* {{{ Exception unserialize checks */
Exception unserialize checks */
#define CHECK_EXC_TYPE(id, type) \ #define CHECK_EXC_TYPE(id, type) \
pvalue = zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &value); \ pvalue = zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &value); \
if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \ if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \
@ -329,8 +326,7 @@ ZEND_METHOD(Exception, __wakeup)
} }
/* }}} */ /* }}} */
/* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Throwable previous]]]) /* {{{ ErrorException constructor */
ErrorException constructor */
ZEND_METHOD(ErrorException, __construct) ZEND_METHOD(ErrorException, __construct)
{ {
zend_string *message = NULL, *filename = NULL; zend_string *message = NULL, *filename = NULL;
@ -380,8 +376,7 @@ ZEND_METHOD(ErrorException, __construct)
#define GET_PROPERTY_SILENT(object, id) \ #define GET_PROPERTY_SILENT(object, id) \
zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &rv) zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &rv)
/* {{{ proto string Exception|Error::getFile() /* {{{ Get the file in which the exception occurred */
Get the file in which the exception occurred */
ZEND_METHOD(Exception, getFile) ZEND_METHOD(Exception, getFile)
{ {
zval *prop, rv; zval *prop, rv;
@ -393,8 +388,7 @@ ZEND_METHOD(Exception, getFile)
} }
/* }}} */ /* }}} */
/* {{{ proto int Exception|Error::getLine() /* {{{ Get the line in which the exception occurred */
Get the line in which the exception occurred */
ZEND_METHOD(Exception, getLine) ZEND_METHOD(Exception, getLine)
{ {
zval *prop, rv; zval *prop, rv;
@ -406,8 +400,7 @@ ZEND_METHOD(Exception, getLine)
} }
/* }}} */ /* }}} */
/* {{{ proto string Exception|Error::getMessage() /* {{{ Get the exception message */
Get the exception message */
ZEND_METHOD(Exception, getMessage) ZEND_METHOD(Exception, getMessage)
{ {
zval *prop, rv; zval *prop, rv;
@ -419,8 +412,7 @@ ZEND_METHOD(Exception, getMessage)
} }
/* }}} */ /* }}} */
/* {{{ proto int Exception|Error::getCode() /* {{{ Get the exception code */
Get the exception code */
ZEND_METHOD(Exception, getCode) ZEND_METHOD(Exception, getCode)
{ {
zval *prop, rv; zval *prop, rv;
@ -433,8 +425,7 @@ ZEND_METHOD(Exception, getCode)
} }
/* }}} */ /* }}} */
/* {{{ proto array Exception|Error::getTrace() /* {{{ Get the stack trace for the location in which the exception occurred */
Get the stack trace for the location in which the exception occurred */
ZEND_METHOD(Exception, getTrace) ZEND_METHOD(Exception, getTrace)
{ {
zval *prop, rv; zval *prop, rv;
@ -447,8 +438,7 @@ ZEND_METHOD(Exception, getTrace)
} }
/* }}} */ /* }}} */
/* {{{ proto int ErrorException::getSeverity() /* {{{ Get the exception severity */
Get the exception severity */
ZEND_METHOD(ErrorException, getSeverity) ZEND_METHOD(ErrorException, getSeverity)
{ {
zval *prop, rv; zval *prop, rv;
@ -590,8 +580,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
} }
/* }}} */ /* }}} */
/* {{{ proto string Exception|Error::getTraceAsString() /* {{{ Obtain the backtrace for the exception as a string (instead of an array) */
Obtain the backtrace for the exception as a string (instead of an array) */
ZEND_METHOD(Exception, getTraceAsString) ZEND_METHOD(Exception, getTraceAsString)
{ {
zval *trace, *frame, rv; zval *trace, *frame, rv;
@ -631,8 +620,7 @@ ZEND_METHOD(Exception, getTraceAsString)
} }
/* }}} */ /* }}} */
/* {{{ proto Throwable Exception|Error::getPrevious() /* {{{ Return previous Throwable or NULL. */
Return previous Throwable or NULL. */
ZEND_METHOD(Exception, getPrevious) ZEND_METHOD(Exception, getPrevious)
{ {
zval rv; zval rv;
@ -642,8 +630,7 @@ ZEND_METHOD(Exception, getPrevious)
ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS)); ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
} /* }}} */ } /* }}} */
/* {{{ proto string Exception|Error::__toString() /* {{{ Obtain the string representation of the Exception object */
Obtain the string representation of the Exception object */
ZEND_METHOD(Exception, __toString) ZEND_METHOD(Exception, __toString)
{ {
zval trace, *exception; zval trace, *exception;

24
Zend/zend_generators.c
View file

@ -828,8 +828,7 @@ static inline void zend_generator_rewind(zend_generator *generator) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto void Generator::rewind() /* {{{ Rewind the generator */
* Rewind the generator */
ZEND_METHOD(Generator, rewind) ZEND_METHOD(Generator, rewind)
{ {
zend_generator *generator; zend_generator *generator;
@ -842,8 +841,7 @@ ZEND_METHOD(Generator, rewind)
} }
/* }}} */ /* }}} */
/* {{{ proto bool Generator::valid() /* {{{ Check whether the generator is valid */
* Check whether the generator is valid */
ZEND_METHOD(Generator, valid) ZEND_METHOD(Generator, valid)
{ {
zend_generator *generator; zend_generator *generator;
@ -860,8 +858,7 @@ ZEND_METHOD(Generator, valid)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Generator::current() /* {{{ Get the current value */
* Get the current value */
ZEND_METHOD(Generator, current) ZEND_METHOD(Generator, current)
{ {
zend_generator *generator, *root; zend_generator *generator, *root;
@ -881,8 +878,7 @@ ZEND_METHOD(Generator, current)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Generator::key() /* {{{ Get the current key */
* Get the current key */
ZEND_METHOD(Generator, key) ZEND_METHOD(Generator, key)
{ {
zend_generator *generator, *root; zend_generator *generator, *root;
@ -902,8 +898,7 @@ ZEND_METHOD(Generator, key)
} }
/* }}} */ /* }}} */
/* {{{ proto void Generator::next() /* {{{ Advances the generator */
* Advances the generator */
ZEND_METHOD(Generator, next) ZEND_METHOD(Generator, next)
{ {
zend_generator *generator; zend_generator *generator;
@ -918,8 +913,7 @@ ZEND_METHOD(Generator, next)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Generator::send(mixed value) /* {{{ Sends a value to the generator */
* Sends a value to the generator */
ZEND_METHOD(Generator, send) ZEND_METHOD(Generator, send)
{ {
zval *value; zval *value;
@ -955,8 +949,7 @@ ZEND_METHOD(Generator, send)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Generator::throw(Exception exception) /* {{{ Throws an exception into the generator */
* Throws an exception into the generator */
ZEND_METHOD(Generator, throw) ZEND_METHOD(Generator, throw)
{ {
zval *exception; zval *exception;
@ -993,8 +986,7 @@ ZEND_METHOD(Generator, throw)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed Generator::getReturn() /* {{{ Retrieves the return value of the generator */
* Retrieves the return value of the generator */
ZEND_METHOD(Generator, getReturn) ZEND_METHOD(Generator, getReturn)
{ {
zend_generator *generator; zend_generator *generator;

27
Zend/zend_ini_parser.y
View file

@ -60,8 +60,7 @@ static int get_int_val(zval *op) {
} }
} }
/* {{{ zend_ini_do_op() /* {{{ zend_ini_do_op() */
*/
static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2) static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
{ {
int i_result; int i_result;
@ -98,8 +97,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_init_string() /* {{{ zend_ini_init_string() */
*/
static void zend_ini_init_string(zval *result) static void zend_ini_init_string(zval *result)
{ {
if (ZEND_SYSTEM_INI) { if (ZEND_SYSTEM_INI) {
@ -110,8 +108,7 @@ static void zend_ini_init_string(zval *result)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_add_string() /* {{{ zend_ini_add_string() */
*/
static void zend_ini_add_string(zval *result, zval *op1, zval *op2) static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
{ {
int length, op1_len; int length, op1_len;
@ -139,8 +136,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_get_constant() /* {{{ zend_ini_get_constant() */
*/
static void zend_ini_get_constant(zval *result, zval *name) static void zend_ini_get_constant(zval *result, zval *name)
{ {
zval *c, tmp; zval *c, tmp;
@ -167,8 +163,7 @@ static void zend_ini_get_constant(zval *result, zval *name)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_get_var() /* {{{ zend_ini_get_var() */
*/
static void zend_ini_get_var(zval *result, zval *name) static void zend_ini_get_var(zval *result, zval *name)
{ {
zval *curval; zval *curval;
@ -187,8 +182,7 @@ static void zend_ini_get_var(zval *result, zval *name)
} }
/* }}} */ /* }}} */
/* {{{ ini_error() /* {{{ ini_error() */
*/
static ZEND_COLD void ini_error(const char *msg) static ZEND_COLD void ini_error(const char *msg)
{ {
char *error_buf; char *error_buf;
@ -217,8 +211,7 @@ static ZEND_COLD void ini_error(const char *msg)
} }
/* }}} */ /* }}} */
/* {{{ zend_parse_ini_file() /* {{{ zend_parse_ini_file() */
*/
ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg) ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
{ {
int retval; int retval;
@ -246,8 +239,7 @@ ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_erro
} }
/* }}} */ /* }}} */
/* {{{ zend_parse_ini_string() /* {{{ zend_parse_ini_string() */
*/
ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg) ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
{ {
int retval; int retval;
@ -274,8 +266,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
} }
/* }}} */ /* }}} */
/* {{{ zval_ini_dtor() /* {{{ zval_ini_dtor() */
*/
static void zval_ini_dtor(zval *zv) static void zval_ini_dtor(zval *zv)
{ {
if (Z_TYPE_P(zv) == IS_STRING) { if (Z_TYPE_P(zv) == IS_STRING) {

21
Zend/zend_ini_scanner.l
View file

@ -217,8 +217,7 @@ static void yy_scan_buffer(char *str, unsigned int len)
#define ini_filename SCNG(filename) #define ini_filename SCNG(filename)
/* {{{ init_ini_scanner() /* {{{ init_ini_scanner() */
*/
static int init_ini_scanner(int scanner_mode, zend_file_handle *fh) static int init_ini_scanner(int scanner_mode, zend_file_handle *fh)
{ {
/* Sanity check */ /* Sanity check */
@ -244,8 +243,7 @@ static int init_ini_scanner(int scanner_mode, zend_file_handle *fh)
} }
/* }}} */ /* }}} */
/* {{{ shutdown_ini_scanner() /* {{{ shutdown_ini_scanner() */
*/
void shutdown_ini_scanner(void) void shutdown_ini_scanner(void)
{ {
zend_stack_destroy(&SCNG(state_stack)); zend_stack_destroy(&SCNG(state_stack));
@ -255,24 +253,21 @@ void shutdown_ini_scanner(void)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_scanner_get_lineno() /* {{{ zend_ini_scanner_get_lineno() */
*/
ZEND_COLD int zend_ini_scanner_get_lineno(void) ZEND_COLD int zend_ini_scanner_get_lineno(void)
{ {
return SCNG(lineno); return SCNG(lineno);
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_scanner_get_filename() /* {{{ zend_ini_scanner_get_filename() */
*/
ZEND_COLD char *zend_ini_scanner_get_filename(void) ZEND_COLD char *zend_ini_scanner_get_filename(void)
{ {
return ini_filename ? ini_filename : "Unknown"; return ini_filename ? ini_filename : "Unknown";
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_open_file_for_scanning() /* {{{ zend_ini_open_file_for_scanning() */
*/
int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode) int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode)
{ {
char *buf; char *buf;
@ -293,8 +288,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_prepare_string_for_scanning() /* {{{ zend_ini_prepare_string_for_scanning() */
*/
int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode) int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode)
{ {
int len = (int)strlen(str); int len = (int)strlen(str);
@ -309,8 +303,7 @@ int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode)
} }
/* }}} */ /* }}} */
/* {{{ zend_ini_escape_string() /* {{{ zend_ini_escape_string() */
*/
static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type) static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type)
{ {
register char *s, *t; register char *s, *t;

3
Zend/zend_signal.c
View file

@ -330,8 +330,7 @@ void zend_signal_activate(void)
SIGG(depth) = 0; SIGG(depth) = 0;
} /* }}} */ } /* }}} */
/* {{{ zend_signal_deactivate /* {{{ zend_signal_deactivate */
* */
void zend_signal_deactivate(void) void zend_signal_deactivate(void)
{ {
if (SIGG(check)) { if (SIGG(check)) {

45
ext/bcmath/bcmath.c
View file

@ -79,8 +79,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(bcmath) static PHP_GINIT_FUNCTION(bcmath)
{ {
#if defined(COMPILE_DL_BCMATH) && defined(ZTS) #if defined(COMPILE_DL_BCMATH) && defined(ZTS)
@ -91,8 +90,7 @@ static PHP_GINIT_FUNCTION(bcmath)
} }
/* }}} */ /* }}} */
/* {{{ PHP_GSHUTDOWN_FUNCTION /* {{{ PHP_GSHUTDOWN_FUNCTION */
*/
static PHP_GSHUTDOWN_FUNCTION(bcmath) static PHP_GSHUTDOWN_FUNCTION(bcmath)
{ {
_bc_free_num_ex(&bcmath_globals->_zero_, 1); _bc_free_num_ex(&bcmath_globals->_zero_, 1);
@ -101,8 +99,7 @@ static PHP_GSHUTDOWN_FUNCTION(bcmath)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(bcmath) PHP_MINIT_FUNCTION(bcmath)
{ {
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -111,8 +108,7 @@ PHP_MINIT_FUNCTION(bcmath)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(bcmath) PHP_MSHUTDOWN_FUNCTION(bcmath)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -121,8 +117,7 @@ PHP_MSHUTDOWN_FUNCTION(bcmath)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(bcmath) PHP_MINFO_FUNCTION(bcmath)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -151,8 +146,7 @@ static void php_str2num(bc_num *num, char *str)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) /* {{{ Returns the sum of two arbitrary precision numbers */
Returns the sum of two arbitrary precision numbers */
PHP_FUNCTION(bcadd) PHP_FUNCTION(bcadd)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -192,8 +186,7 @@ PHP_FUNCTION(bcadd)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcsub(string left_operand, string right_operand [, int scale]) /* {{{ Returns the difference between two arbitrary precision numbers */
Returns the difference between two arbitrary precision numbers */
PHP_FUNCTION(bcsub) PHP_FUNCTION(bcsub)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -233,8 +226,7 @@ PHP_FUNCTION(bcsub)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcmul(string left_operand, string right_operand [, int scale]) /* {{{ Returns the multiplication of two arbitrary precision numbers */
Returns the multiplication of two arbitrary precision numbers */
PHP_FUNCTION(bcmul) PHP_FUNCTION(bcmul)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -274,8 +266,7 @@ PHP_FUNCTION(bcmul)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale]) /* {{{ Returns the quotient of two arbitrary precision numbers (division) */
Returns the quotient of two arbitrary precision numbers (division) */
PHP_FUNCTION(bcdiv) PHP_FUNCTION(bcdiv)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -322,8 +313,7 @@ PHP_FUNCTION(bcdiv)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcmod(string left_operand, string right_operand [, int scale]) /* {{{ Returns the modulus of the two arbitrary precision operands */
Returns the modulus of the two arbitrary precision operands */
PHP_FUNCTION(bcmod) PHP_FUNCTION(bcmod)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -369,8 +359,7 @@ PHP_FUNCTION(bcmod)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcpowmod(string x, string y, string mod [, int scale]) /* {{{ Returns the value of an arbitrary precision number raised to the power of another reduced by a modulus */
Returns the value of an arbitrary precision number raised to the power of another reduced by a modulus */
PHP_FUNCTION(bcpowmod) PHP_FUNCTION(bcpowmod)
{ {
zend_string *left, *right, *modulus; zend_string *left, *right, *modulus;
@ -423,8 +412,7 @@ PHP_FUNCTION(bcpowmod)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcpow(string x, string y [, int scale]) /* {{{ Returns the value of an arbitrary precision number raised to the power of another */
Returns the value of an arbitrary precision number raised to the power of another */
PHP_FUNCTION(bcpow) PHP_FUNCTION(bcpow)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -463,8 +451,7 @@ PHP_FUNCTION(bcpow)
} }
/* }}} */ /* }}} */
/* {{{ proto string bcsqrt(string operand [, int scale]) /* {{{ Returns the square root of an arbitrary precision number */
Returns the square root of an arbitrary precision number */
PHP_FUNCTION(bcsqrt) PHP_FUNCTION(bcsqrt)
{ {
zend_string *left; zend_string *left;
@ -502,8 +489,7 @@ PHP_FUNCTION(bcsqrt)
} }
/* }}} */ /* }}} */
/* {{{ proto int bccomp(string left_operand, string right_operand [, int scale]) /* {{{ Compares two arbitrary precision numbers */
Compares two arbitrary precision numbers */
PHP_FUNCTION(bccomp) PHP_FUNCTION(bccomp)
{ {
zend_string *left, *right; zend_string *left, *right;
@ -545,8 +531,7 @@ PHP_FUNCTION(bccomp)
} }
/* }}} */ /* }}} */
/* {{{ proto int bcscale([int scale]) /* {{{ Sets default scale parameter for all bc math functions */
Sets default scale parameter for all bc math functions */
PHP_FUNCTION(bcscale) PHP_FUNCTION(bcscale)
{ {
zend_long old_scale, new_scale; zend_long old_scale, new_scale;

21
ext/bz2/bz2.c
View file

@ -301,8 +301,7 @@ static PHP_MINFO_FUNCTION(bz2)
php_info_print_table_end(); php_info_print_table_end();
} }
/* {{{ proto string bzread(resource bz[, int length]) /* {{{ Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */
Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */
PHP_FUNCTION(bzread) PHP_FUNCTION(bzread)
{ {
zval *bz; zval *bz;
@ -329,8 +328,7 @@ PHP_FUNCTION(bzread)
} }
/* }}} */ /* }}} */
/* {{{ proto resource bzopen(string|int file|fp, string mode) /* {{{ Opens a new BZip2 stream */
Opens a new BZip2 stream */
PHP_FUNCTION(bzopen) PHP_FUNCTION(bzopen)
{ {
zval *file; /* The file to open */ zval *file; /* The file to open */
@ -420,32 +418,28 @@ PHP_FUNCTION(bzopen)
} }
/* }}} */ /* }}} */
/* {{{ proto int bzerrno(resource bz) /* {{{ Returns the error number */
Returns the error number */
PHP_FUNCTION(bzerrno) PHP_FUNCTION(bzerrno)
{ {
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO); php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO);
} }
/* }}} */ /* }}} */
/* {{{ proto string bzerrstr(resource bz) /* {{{ Returns the error string */
Returns the error string */
PHP_FUNCTION(bzerrstr) PHP_FUNCTION(bzerrstr)
{ {
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR); php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR);
} }
/* }}} */ /* }}} */
/* {{{ proto array bzerror(resource bz) /* {{{ Returns the error number and error string in an associative array */
Returns the error number and error string in an associative array */
PHP_FUNCTION(bzerror) PHP_FUNCTION(bzerror)
{ {
php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH); php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH);
} }
/* }}} */ /* }}} */
/* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]]) /* {{{ Compresses a string into BZip2 encoded data */
Compresses a string into BZip2 encoded data */
PHP_FUNCTION(bzcompress) PHP_FUNCTION(bzcompress)
{ {
char *source; /* Source data to compress */ char *source; /* Source data to compress */
@ -495,8 +489,7 @@ PHP_FUNCTION(bzcompress)
} }
/* }}} */ /* }}} */
/* {{{ proto string bzdecompress(string source [, int small]) /* {{{ Decompresses BZip2 compressed data */
Decompresses BZip2 compressed data */
PHP_FUNCTION(bzdecompress) PHP_FUNCTION(bzdecompress)
{ {
char *source; char *source;

6
ext/calendar/cal_unix.c
View file

@ -21,8 +21,7 @@
#include "sdncal.h" #include "sdncal.h"
#include <time.h> #include <time.h>
/* {{{ proto int unixtojd([int timestamp]) /* {{{ Convert UNIX timestamp to Julian Day */
Convert UNIX timestamp to Julian Day */
PHP_FUNCTION(unixtojd) PHP_FUNCTION(unixtojd)
{ {
time_t ts; time_t ts;
@ -48,8 +47,7 @@ PHP_FUNCTION(unixtojd)
} }
/* }}} */ /* }}} */
/* {{{ proto int jdtounix(int jday) /* {{{ Convert Julian Day to UNIX timestamp */
Convert Julian Day to UNIX timestamp */
PHP_FUNCTION(jdtounix) PHP_FUNCTION(jdtounix)
{ {
zend_long uday; zend_long uday;

42
ext/calendar/calendar.c
View file

@ -169,8 +169,7 @@ static void _php_cal_info(int cal, zval *ret)
} }
/* {{{ proto array cal_info([int calendar]) /* {{{ Returns information about a particular calendar */
Returns information about a particular calendar */
PHP_FUNCTION(cal_info) PHP_FUNCTION(cal_info)
{ {
zend_long cal = -1; zend_long cal = -1;
@ -201,8 +200,7 @@ PHP_FUNCTION(cal_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int cal_days_in_month(int calendar, int month, int year) /* {{{ Returns the number of days in a month for a given year and calendar */
Returns the number of days in a month for a given year and calendar */
PHP_FUNCTION(cal_days_in_month) PHP_FUNCTION(cal_days_in_month)
{ {
zend_long cal, month, year; zend_long cal, month, year;
@ -249,8 +247,7 @@ PHP_FUNCTION(cal_days_in_month)
} }
/* }}} */ /* }}} */
/* {{{ proto int cal_to_jd(int calendar, int month, int day, int year) /* {{{ Converts from a supported calendar to Julian Day Count */
Converts from a supported calendar to Julian Day Count */
PHP_FUNCTION(cal_to_jd) PHP_FUNCTION(cal_to_jd)
{ {
zend_long cal, month, day, year; zend_long cal, month, day, year;
@ -268,8 +265,7 @@ PHP_FUNCTION(cal_to_jd)
} }
/* }}} */ /* }}} */
/* {{{ proto array cal_from_jd(int jd, int calendar) /* {{{ Converts from Julian Day Count to a supported calendar and return extended information */
Converts from Julian Day Count to a supported calendar and return extended information */
PHP_FUNCTION(cal_from_jd) PHP_FUNCTION(cal_from_jd)
{ {
zend_long jd, cal; zend_long jd, cal;
@ -320,8 +316,7 @@ PHP_FUNCTION(cal_from_jd)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdtogregorian(int juliandaycount) /* {{{ Converts a julian day count to a gregorian calendar date */
Converts a julian day count to a gregorian calendar date */
PHP_FUNCTION(jdtogregorian) PHP_FUNCTION(jdtogregorian)
{ {
zend_long julday; zend_long julday;
@ -337,8 +332,7 @@ PHP_FUNCTION(jdtogregorian)
} }
/* }}} */ /* }}} */
/* {{{ proto int gregoriantojd(int month, int day, int year) /* {{{ Converts a gregorian calendar date to julian day count */
Converts a gregorian calendar date to julian day count */
PHP_FUNCTION(gregoriantojd) PHP_FUNCTION(gregoriantojd)
{ {
zend_long year, month, day; zend_long year, month, day;
@ -351,8 +345,7 @@ PHP_FUNCTION(gregoriantojd)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdtojulian(int juliandaycount) /* {{{ Convert a julian day count to a julian calendar date */
Convert a julian day count to a julian calendar date */
PHP_FUNCTION(jdtojulian) PHP_FUNCTION(jdtojulian)
{ {
zend_long julday; zend_long julday;
@ -368,8 +361,7 @@ PHP_FUNCTION(jdtojulian)
} }
/* }}} */ /* }}} */
/* {{{ proto int juliantojd(int month, int day, int year) /* {{{ Converts a julian calendar date to julian day count */
Converts a julian calendar date to julian day count */
PHP_FUNCTION(juliantojd) PHP_FUNCTION(juliantojd)
{ {
zend_long year, month, day; zend_long year, month, day;
@ -478,8 +470,7 @@ static char *heb_number_to_chars(int n, int fl, char **ret)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdtojewish(int juliandaycount [, bool hebrew [, int fl]]) /* {{{ Converts a julian day count to a jewish calendar date */
Converts a julian day count to a jewish calendar date */
PHP_FUNCTION(jdtojewish) PHP_FUNCTION(jdtojewish)
{ {
zend_long julday, fl = 0; zend_long julday, fl = 0;
@ -512,8 +503,7 @@ PHP_FUNCTION(jdtojewish)
} }
/* }}} */ /* }}} */
/* {{{ proto int jewishtojd(int month, int day, int year) /* {{{ Converts a jewish calendar date to a julian day count */
Converts a jewish calendar date to a julian day count */
PHP_FUNCTION(jewishtojd) PHP_FUNCTION(jewishtojd)
{ {
zend_long year, month, day; zend_long year, month, day;
@ -526,8 +516,7 @@ PHP_FUNCTION(jewishtojd)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdtofrench(int juliandaycount) /* {{{ Converts a julian day count to a french republic calendar date */
Converts a julian day count to a french republic calendar date */
PHP_FUNCTION(jdtofrench) PHP_FUNCTION(jdtofrench)
{ {
zend_long julday; zend_long julday;
@ -543,8 +532,7 @@ PHP_FUNCTION(jdtofrench)
} }
/* }}} */ /* }}} */
/* {{{ proto int frenchtojd(int month, int day, int year) /* {{{ Converts a french republic calendar date to julian day count */
Converts a french republic calendar date to julian day count */
PHP_FUNCTION(frenchtojd) PHP_FUNCTION(frenchtojd)
{ {
zend_long year, month, day; zend_long year, month, day;
@ -557,8 +545,7 @@ PHP_FUNCTION(frenchtojd)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed jddayofweek(int juliandaycount [, int mode]) /* {{{ Returns name or number of day of week from julian day count */
Returns name or number of day of week from julian day count */
PHP_FUNCTION(jddayofweek) PHP_FUNCTION(jddayofweek)
{ {
zend_long julday, mode = CAL_DOW_DAYNO; zend_long julday, mode = CAL_DOW_DAYNO;
@ -588,8 +575,7 @@ PHP_FUNCTION(jddayofweek)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdmonthname(int juliandaycount, int mode) /* {{{ Returns name of month for julian day count */
Returns name of month for julian day count */
PHP_FUNCTION(jdmonthname) PHP_FUNCTION(jdmonthname)
{ {
zend_long julday, mode; zend_long julday, mode;

6
ext/calendar/easter.c
View file

@ -115,16 +115,14 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, zend_long gm)
ZVAL_LONG(return_value, result); ZVAL_LONG(return_value, result);
} }
/* {{{ proto int easter_date([int year]) /* {{{ Return the timestamp of midnight on Easter of a given year (defaults to current year) */
Return the timestamp of midnight on Easter of a given year (defaults to current year) */
PHP_FUNCTION(easter_date) PHP_FUNCTION(easter_date)
{ {
_cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); _cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto int easter_days([int year, [int method]]) /* {{{ Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */
Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */
PHP_FUNCTION(easter_days) PHP_FUNCTION(easter_days)
{ {
_cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); _cal_easter(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);

18
ext/com_dotnet/com_com.c
View file

@ -282,8 +282,7 @@ PHP_METHOD(com, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto object com_get_active_object(string progid [, int code_page ]) /* {{{ Returns a handle to an already running instance of a COM object */
Returns a handle to an already running instance of a COM object */
PHP_FUNCTION(com_get_active_object) PHP_FUNCTION(com_get_active_object)
{ {
CLSID clsid; CLSID clsid;
@ -658,8 +657,7 @@ int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen,
return php_com_do_invoke_by_id(obj, dispid, flags, v, nargs, args, 0, allow_noarg); return php_com_do_invoke_by_id(obj, dispid, flags, v, nargs, args, 0, allow_noarg);
} }
/* {{{ proto string com_create_guid() /* {{{ Generate a globally unique identifier (GUID) */
Generate a globally unique identifier (GUID) */
PHP_FUNCTION(com_create_guid) PHP_FUNCTION(com_create_guid)
{ {
GUID retval; GUID retval;
@ -686,8 +684,7 @@ PHP_FUNCTION(com_create_guid)
} }
/* }}} */ /* }}} */
/* {{{ proto bool com_event_sink(object comobject, object sinkobject [, mixed sinkinterface]) /* {{{ Connect events from a COM object to a PHP object */
Connect events from a COM object to a PHP object */
PHP_FUNCTION(com_event_sink) PHP_FUNCTION(com_event_sink)
{ {
zval *object, *sinkobject, *sink=NULL; zval *object, *sinkobject, *sink=NULL;
@ -746,8 +743,7 @@ PHP_FUNCTION(com_event_sink)
} }
/* }}} */ /* }}} */
/* {{{ proto bool com_print_typeinfo(object comobject | string typelib, string dispinterface, bool wantsink) /* {{{ Print out a PHP class definition for a dispatchable interface */
Print out a PHP class definition for a dispatchable interface */
PHP_FUNCTION(com_print_typeinfo) PHP_FUNCTION(com_print_typeinfo)
{ {
zval *arg1; zval *arg1;
@ -783,8 +779,7 @@ PHP_FUNCTION(com_print_typeinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto bool com_message_pump([int timeoutms]) /* {{{ Process COM messages, sleeping for up to timeoutms milliseconds */
Process COM messages, sleeping for up to timeoutms milliseconds */
PHP_FUNCTION(com_message_pump) PHP_FUNCTION(com_message_pump)
{ {
zend_long timeoutms = 0; zend_long timeoutms = 0;
@ -811,8 +806,7 @@ PHP_FUNCTION(com_message_pump)
} }
/* }}} */ /* }}} */
/* {{{ proto bool com_load_typelib(string typelib_name [, bool case_insensitive]) /* {{{ Loads a Typelibrary and registers its constants */
Loads a Typelibrary and registers its constants */
PHP_FUNCTION(com_load_typelib) PHP_FUNCTION(com_load_typelib)
{ {
char *name; char *name;

24
ext/com_dotnet/com_extension.c
View file

@ -37,8 +37,7 @@ zend_class_entry
*php_com_exception_class_entry, *php_com_exception_class_entry,
*php_com_saproxy_class_entry; *php_com_saproxy_class_entry;
/* {{{ com_dotnet_module_entry /* {{{ com_dotnet_module_entry */
*/
zend_module_entry com_dotnet_module_entry = { zend_module_entry com_dotnet_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"com_dotnet", "com_dotnet",
@ -64,8 +63,7 @@ ZEND_TSRMLS_CACHE_DEFINE()
ZEND_GET_MODULE(com_dotnet) ZEND_GET_MODULE(com_dotnet)
#endif #endif
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
/* com.typelib_file is the path to a file containing a /* com.typelib_file is the path to a file containing a
* list of typelibraries to register *persistently*. * list of typelibraries to register *persistently*.
@ -149,8 +147,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(com_dotnet) static PHP_GINIT_FUNCTION(com_dotnet)
{ {
#if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS) #if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS)
@ -161,8 +158,7 @@ static PHP_GINIT_FUNCTION(com_dotnet)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(com_dotnet) PHP_MINIT_FUNCTION(com_dotnet)
{ {
zend_class_entry ce, *tmp; zend_class_entry ce, *tmp;
@ -288,8 +284,7 @@ PHP_MINIT_FUNCTION(com_dotnet)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(com_dotnet) PHP_MSHUTDOWN_FUNCTION(com_dotnet)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -305,8 +300,7 @@ PHP_MSHUTDOWN_FUNCTION(com_dotnet)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RINIT_FUNCTION /* {{{ PHP_RINIT_FUNCTION */
*/
PHP_RINIT_FUNCTION(com_dotnet) PHP_RINIT_FUNCTION(com_dotnet)
{ {
COMG(rshutdown_started) = 0; COMG(rshutdown_started) = 0;
@ -314,8 +308,7 @@ PHP_RINIT_FUNCTION(com_dotnet)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION /* {{{ PHP_RSHUTDOWN_FUNCTION */
*/
PHP_RSHUTDOWN_FUNCTION(com_dotnet) PHP_RSHUTDOWN_FUNCTION(com_dotnet)
{ {
#if HAVE_MSCOREE_H #if HAVE_MSCOREE_H
@ -328,8 +321,7 @@ PHP_RSHUTDOWN_FUNCTION(com_dotnet)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(com_dotnet) PHP_MINFO_FUNCTION(com_dotnet)
{ {
php_info_print_table_start(); php_info_print_table_start();

24
ext/com_dotnet/com_persist.c
View file

@ -320,8 +320,7 @@ static inline HRESULT get_persist_file(php_com_persist_helper *helper)
} }
/* {{{ proto string COMPersistHelper::GetCurFile() /* {{{ Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */
Determines the filename into which an object will be saved, or false if none is set, via IPersistFile::GetCurFile */
CPH_METHOD(GetCurFileName) CPH_METHOD(GetCurFileName)
{ {
HRESULT res; HRESULT res;
@ -359,8 +358,7 @@ CPH_METHOD(GetCurFileName)
/* }}} */ /* }}} */
/* {{{ proto bool COMPersistHelper::SaveToFile(string filename [, bool remember]) /* {{{ Persist object data to file, via IPersistFile::Save */
Persist object data to file, via IPersistFile::Save */
CPH_METHOD(SaveToFile) CPH_METHOD(SaveToFile)
{ {
HRESULT res; HRESULT res;
@ -421,8 +419,7 @@ CPH_METHOD(SaveToFile)
} }
/* }}} */ /* }}} */
/* {{{ proto bool COMPersistHelper::LoadFromFile(string filename [, int flags]) /* {{{ Load object data from file, via IPersistFile::Load */
Load object data from file, via IPersistFile::Load */
CPH_METHOD(LoadFromFile) CPH_METHOD(LoadFromFile)
{ {
HRESULT res; HRESULT res;
@ -466,8 +463,7 @@ CPH_METHOD(LoadFromFile)
} }
/* }}} */ /* }}} */
/* {{{ proto int COMPersistHelper::GetMaxStreamSize() /* {{{ Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */
Gets maximum stream size required to store the object data, via IPersistStream::GetSizeMax (or IPersistStreamInit::GetSizeMax) */
CPH_METHOD(GetMaxStreamSize) CPH_METHOD(GetMaxStreamSize)
{ {
HRESULT res; HRESULT res;
@ -502,8 +498,7 @@ CPH_METHOD(GetMaxStreamSize)
} }
/* }}} */ /* }}} */
/* {{{ proto int COMPersistHelper::InitNew() /* {{{ Initializes the object to a default state, via IPersistStreamInit::InitNew */
Initializes the object to a default state, via IPersistStreamInit::InitNew */
CPH_METHOD(InitNew) CPH_METHOD(InitNew)
{ {
HRESULT res; HRESULT res;
@ -530,8 +525,7 @@ CPH_METHOD(InitNew)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed COMPersistHelper::LoadFromStream(resource stream) /* {{{ Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */
Initializes an object from the stream where it was previously saved, via IPersistStream::Load or OleLoadFromStream */
CPH_METHOD(LoadFromStream) CPH_METHOD(LoadFromStream)
{ {
zval *zstm; zval *zstm;
@ -589,8 +583,7 @@ CPH_METHOD(LoadFromStream)
} }
/* }}} */ /* }}} */
/* {{{ proto int COMPersistHelper::SaveToStream(resource stream) /* {{{ Saves the object to a stream, via IPersistStream::Save */
Saves the object to a stream, via IPersistStream::Save */
CPH_METHOD(SaveToStream) CPH_METHOD(SaveToStream)
{ {
zval *zstm; zval *zstm;
@ -639,8 +632,7 @@ CPH_METHOD(SaveToStream)
} }
/* }}} */ /* }}} */
/* {{{ proto COMPersistHelper::__construct([object com_object]) /* {{{ Creates a persistence helper object, usually associated with a com_object */
Creates a persistence helper object, usually associated with a com_object */
CPH_METHOD(__construct) CPH_METHOD(__construct)
{ {
php_com_dotnet_object *obj = NULL; php_com_dotnet_object *obj = NULL;

78
ext/com_dotnet/com_variant.c
View file

@ -491,8 +491,7 @@ PHP_METHOD(variant, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto void variant_set(object variant, mixed value) /* {{{ Assigns a new value for a variant object */
Assigns a new value for a variant object */
PHP_FUNCTION(variant_set) PHP_FUNCTION(variant_set)
{ {
zval *zobj, *zvalue = NULL; zval *zobj, *zvalue = NULL;
@ -638,104 +637,91 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_add(mixed left, mixed right) /* {{{ "Adds" two variant values together and returns the result */
"Adds" two variant values together and returns the result */
PHP_FUNCTION(variant_add) PHP_FUNCTION(variant_add)
{ {
variant_binary_operation(VOP_ADD, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_ADD, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_cat(mixed left, mixed right) /* {{{ concatenates two variant values together and returns the result */
concatenates two variant values together and returns the result */
PHP_FUNCTION(variant_cat) PHP_FUNCTION(variant_cat)
{ {
variant_binary_operation(VOP_CAT, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_CAT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_sub(mixed left, mixed right) /* {{{ subtracts the value of the right variant from the left variant value and returns the result */
subtracts the value of the right variant from the left variant value and returns the result */
PHP_FUNCTION(variant_sub) PHP_FUNCTION(variant_sub)
{ {
variant_binary_operation(VOP_SUB, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_SUB, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_mul(mixed left, mixed right) /* {{{ multiplies the values of the two variants and returns the result */
multiplies the values of the two variants and returns the result */
PHP_FUNCTION(variant_mul) PHP_FUNCTION(variant_mul)
{ {
variant_binary_operation(VOP_MUL, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_MUL, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_and(mixed left, mixed right) /* {{{ performs a bitwise AND operation between two variants and returns the result */
performs a bitwise AND operation between two variants and returns the result */
PHP_FUNCTION(variant_and) PHP_FUNCTION(variant_and)
{ {
variant_binary_operation(VOP_AND, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_AND, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_div(mixed left, mixed right) /* {{{ Returns the result from dividing two variants */
Returns the result from dividing two variants */
PHP_FUNCTION(variant_div) PHP_FUNCTION(variant_div)
{ {
variant_binary_operation(VOP_DIV, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_DIV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_eqv(mixed left, mixed right) /* {{{ Performs a bitwise equivalence on two variants */
Performs a bitwise equivalence on two variants */
PHP_FUNCTION(variant_eqv) PHP_FUNCTION(variant_eqv)
{ {
variant_binary_operation(VOP_EQV, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_EQV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_idiv(mixed left, mixed right) /* {{{ Converts variants to integers and then returns the result from dividing them */
Converts variants to integers and then returns the result from dividing them */
PHP_FUNCTION(variant_idiv) PHP_FUNCTION(variant_idiv)
{ {
variant_binary_operation(VOP_IDIV, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_IDIV, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_imp(mixed left, mixed right) /* {{{ Performs a bitwise implication on two variants */
Performs a bitwise implication on two variants */
PHP_FUNCTION(variant_imp) PHP_FUNCTION(variant_imp)
{ {
variant_binary_operation(VOP_IMP, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_IMP, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_mod(mixed left, mixed right) /* {{{ Divides two variants and returns only the remainder */
Divides two variants and returns only the remainder */
PHP_FUNCTION(variant_mod) PHP_FUNCTION(variant_mod)
{ {
variant_binary_operation(VOP_MOD, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_MOD, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_or(mixed left, mixed right) /* {{{ Performs a logical disjunction on two variants */
Performs a logical disjunction on two variants */
PHP_FUNCTION(variant_or) PHP_FUNCTION(variant_or)
{ {
variant_binary_operation(VOP_OR, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_OR, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_pow(mixed left, mixed right) /* {{{ Returns the result of performing the power function with two variants */
Returns the result of performing the power function with two variants */
PHP_FUNCTION(variant_pow) PHP_FUNCTION(variant_pow)
{ {
variant_binary_operation(VOP_POW, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_POW, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_xor(mixed left, mixed right) /* {{{ Performs a logical exclusion on two variants */
Performs a logical exclusion on two variants */
PHP_FUNCTION(variant_xor) PHP_FUNCTION(variant_xor)
{ {
variant_binary_operation(VOP_XOR, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_binary_operation(VOP_XOR, INTERNAL_FUNCTION_PARAM_PASSTHRU);
@ -798,48 +784,42 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_abs(mixed left) /* {{{ Returns the absolute value of a variant */
Returns the absolute value of a variant */
PHP_FUNCTION(variant_abs) PHP_FUNCTION(variant_abs)
{ {
variant_unary_operation(VOP_ABS, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_unary_operation(VOP_ABS, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_fix(mixed left) /* {{{ Returns the integer part ? of a variant */
Returns the integer part ? of a variant */
PHP_FUNCTION(variant_fix) PHP_FUNCTION(variant_fix)
{ {
variant_unary_operation(VOP_FIX, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_unary_operation(VOP_FIX, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_int(mixed left) /* {{{ Returns the integer portion of a variant */
Returns the integer portion of a variant */
PHP_FUNCTION(variant_int) PHP_FUNCTION(variant_int)
{ {
variant_unary_operation(VOP_INT, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_unary_operation(VOP_INT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_neg(mixed left) /* {{{ Performs logical negation on a variant */
Performs logical negation on a variant */
PHP_FUNCTION(variant_neg) PHP_FUNCTION(variant_neg)
{ {
variant_unary_operation(VOP_NEG, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_unary_operation(VOP_NEG, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_not(mixed left) /* {{{ Performs bitwise not negation on a variant */
Performs bitwise not negation on a variant */
PHP_FUNCTION(variant_not) PHP_FUNCTION(variant_not)
{ {
variant_unary_operation(VOP_NOT, INTERNAL_FUNCTION_PARAM_PASSTHRU); variant_unary_operation(VOP_NOT, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed variant_round(mixed left, int decimals) /* {{{ Rounds a variant to the specified number of decimal places */
Rounds a variant to the specified number of decimal places */
PHP_FUNCTION(variant_round) PHP_FUNCTION(variant_round)
{ {
VARIANT vres; VARIANT vres;
@ -874,8 +854,7 @@ PHP_FUNCTION(variant_round)
} }
/* }}} */ /* }}} */
/* {{{ proto int variant_cmp(mixed left, mixed right [, int lcid [, int flags]]) /* {{{ Compares two variants */
Compares two variants */
PHP_FUNCTION(variant_cmp) PHP_FUNCTION(variant_cmp)
{ {
VARIANT left_val, right_val; VARIANT left_val, right_val;
@ -932,8 +911,7 @@ PHP_FUNCTION(variant_cmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int variant_date_to_timestamp(object variant) /* {{{ Converts a variant date/time value to unix timestamp */
Converts a variant date/time value to unix timestamp */
PHP_FUNCTION(variant_date_to_timestamp) PHP_FUNCTION(variant_date_to_timestamp)
{ {
VARIANT vres; VARIANT vres;
@ -971,8 +949,7 @@ PHP_FUNCTION(variant_date_to_timestamp)
} }
/* }}} */ /* }}} */
/* {{{ proto object variant_date_from_timestamp(int timestamp) /* {{{ Returns a variant date representation of a unix timestamp */
Returns a variant date representation of a unix timestamp */
PHP_FUNCTION(variant_date_from_timestamp) PHP_FUNCTION(variant_date_from_timestamp)
{ {
zend_long timestamp; zend_long timestamp;
@ -1020,8 +997,7 @@ PHP_FUNCTION(variant_date_from_timestamp)
} }
/* }}} */ /* }}} */
/* {{{ proto int variant_get_type(object variant) /* {{{ Returns the VT_XXX type code for a variant */
Returns the VT_XXX type code for a variant */
PHP_FUNCTION(variant_get_type) PHP_FUNCTION(variant_get_type)
{ {
zval *zobj; zval *zobj;
@ -1037,8 +1013,7 @@ PHP_FUNCTION(variant_get_type)
} }
/* }}} */ /* }}} */
/* {{{ proto void variant_set_type(object variant, int type) /* {{{ Convert a variant into another type. Variant is modified "in-place" */
Convert a variant into another type. Variant is modified "in-place" */
PHP_FUNCTION(variant_set_type) PHP_FUNCTION(variant_set_type)
{ {
zval *zobj; zval *zobj;
@ -1072,8 +1047,7 @@ PHP_FUNCTION(variant_set_type)
} }
/* }}} */ /* }}} */
/* {{{ proto object variant_cast(object variant, int type) /* {{{ Convert a variant into a new variant object of another type */
Convert a variant into a new variant object of another type */
PHP_FUNCTION(variant_cast) PHP_FUNCTION(variant_cast)
{ {
zval *zobj; zval *zobj;

42
ext/ctype/ctype.c
View file

@ -33,8 +33,7 @@ static PHP_MINFO_FUNCTION(ctype);
/* }}} */ /* }}} */
/* {{{ ctype_module_entry /* {{{ ctype_module_entry */
*/
zend_module_entry ctype_module_entry = { zend_module_entry ctype_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"ctype", "ctype",
@ -53,8 +52,7 @@ zend_module_entry ctype_module_entry = {
ZEND_GET_MODULE(ctype) ZEND_GET_MODULE(ctype)
#endif #endif
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
static PHP_MINFO_FUNCTION(ctype) static PHP_MINFO_FUNCTION(ctype)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -63,8 +61,7 @@ static PHP_MINFO_FUNCTION(ctype)
} }
/* }}} */ /* }}} */
/* {{{ ctype /* {{{ ctype */
*/
#define CTYPE(iswhat, allow_digits, allow_minus) \ #define CTYPE(iswhat, allow_digits, allow_minus) \
zval *c; \ zval *c; \
ZEND_PARSE_PARAMETERS_START(1, 1); \ ZEND_PARSE_PARAMETERS_START(1, 1); \
@ -97,88 +94,77 @@ static PHP_MINFO_FUNCTION(ctype)
/* }}} */ /* }}} */
/* {{{ proto bool ctype_alnum(mixed c) /* {{{ Checks for alphanumeric character(s) */
Checks for alphanumeric character(s) */
PHP_FUNCTION(ctype_alnum) PHP_FUNCTION(ctype_alnum)
{ {
CTYPE(isalnum, 1, 0); CTYPE(isalnum, 1, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_alpha(mixed c) /* {{{ Checks for alphabetic character(s) */
Checks for alphabetic character(s) */
PHP_FUNCTION(ctype_alpha) PHP_FUNCTION(ctype_alpha)
{ {
CTYPE(isalpha, 0, 0); CTYPE(isalpha, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_cntrl(mixed c) /* {{{ Checks for control character(s) */
Checks for control character(s) */
PHP_FUNCTION(ctype_cntrl) PHP_FUNCTION(ctype_cntrl)
{ {
CTYPE(iscntrl, 0, 0); CTYPE(iscntrl, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_digit(mixed c) /* {{{ Checks for numeric character(s) */
Checks for numeric character(s) */
PHP_FUNCTION(ctype_digit) PHP_FUNCTION(ctype_digit)
{ {
CTYPE(isdigit, 1, 0); CTYPE(isdigit, 1, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_lower(mixed c) /* {{{ Checks for lowercase character(s) */
Checks for lowercase character(s) */
PHP_FUNCTION(ctype_lower) PHP_FUNCTION(ctype_lower)
{ {
CTYPE(islower, 0, 0); CTYPE(islower, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_graph(mixed c) /* {{{ Checks for any printable character(s) except space */
Checks for any printable character(s) except space */
PHP_FUNCTION(ctype_graph) PHP_FUNCTION(ctype_graph)
{ {
CTYPE(isgraph, 1, 1); CTYPE(isgraph, 1, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_print(mixed c) /* {{{ Checks for printable character(s) */
Checks for printable character(s) */
PHP_FUNCTION(ctype_print) PHP_FUNCTION(ctype_print)
{ {
CTYPE(isprint, 1, 1); CTYPE(isprint, 1, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_punct(mixed c) /* {{{ Checks for any printable character which is not whitespace or an alphanumeric character */
Checks for any printable character which is not whitespace or an alphanumeric character */
PHP_FUNCTION(ctype_punct) PHP_FUNCTION(ctype_punct)
{ {
CTYPE(ispunct, 0, 0); CTYPE(ispunct, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_space(mixed c) /* {{{ Checks for whitespace character(s)*/
Checks for whitespace character(s)*/
PHP_FUNCTION(ctype_space) PHP_FUNCTION(ctype_space)
{ {
CTYPE(isspace, 0, 0); CTYPE(isspace, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_upper(mixed c) /* {{{ Checks for uppercase character(s) */
Checks for uppercase character(s) */
PHP_FUNCTION(ctype_upper) PHP_FUNCTION(ctype_upper)
{ {
CTYPE(isupper, 0, 0); CTYPE(isupper, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ctype_xdigit(mixed c) /* {{{ Checks for character(s) representing a hexadecimal digit */
Checks for character(s) representing a hexadecimal digit */
PHP_FUNCTION(ctype_xdigit) PHP_FUNCTION(ctype_xdigit)
{ {
CTYPE(isxdigit, 1, 0); CTYPE(isxdigit, 1, 0);

21
ext/curl/curl_file.c
View file

@ -50,8 +50,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
} }
} }
/* {{{ proto CURLFile::__construct(string $name, [string $mimetype [, string $postfilename]]) /* {{{ Create the CURLFile object */
Create the CURLFile object */
ZEND_METHOD(CURLFile, __construct) ZEND_METHOD(CURLFile, __construct)
{ {
return_value = ZEND_THIS; return_value = ZEND_THIS;
@ -59,8 +58,7 @@ ZEND_METHOD(CURLFile, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto CURLFile curl_file_create(string $name, [string $mimetype [, string $postfilename]]) /* {{{ Create the CURLFile object */
Create the CURLFile object */
PHP_FUNCTION(curl_file_create) PHP_FUNCTION(curl_file_create)
{ {
object_init_ex( return_value, curl_CURLFile_class ); object_init_ex( return_value, curl_CURLFile_class );
@ -88,40 +86,35 @@ static void curlfile_set_property(char *name, size_t name_len, INTERNAL_FUNCTION
zend_update_property_string(curl_CURLFile_class, ZEND_THIS, name, name_len, ZSTR_VAL(arg)); zend_update_property_string(curl_CURLFile_class, ZEND_THIS, name, name_len, ZSTR_VAL(arg));
} }
/* {{{ proto string CURLFile::getFilename() /* {{{ Get file name */
Get file name */
ZEND_METHOD(CURLFile, getFilename) ZEND_METHOD(CURLFile, getFilename)
{ {
curlfile_get_property("name", sizeof("name")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); curlfile_get_property("name", sizeof("name")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto string CURLFile::getMimeType() /* {{{ Get MIME type */
Get MIME type */
ZEND_METHOD(CURLFile, getMimeType) ZEND_METHOD(CURLFile, getMimeType)
{ {
curlfile_get_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); curlfile_get_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto string CURLFile::getPostFilename() /* {{{ Get file name for POST */
Get file name for POST */
ZEND_METHOD(CURLFile, getPostFilename) ZEND_METHOD(CURLFile, getPostFilename)
{ {
curlfile_get_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); curlfile_get_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto void CURLFile::setMimeType(string $mime) /* {{{ Set MIME type */
Set MIME type */
ZEND_METHOD(CURLFile, setMimeType) ZEND_METHOD(CURLFile, setMimeType)
{ {
curlfile_set_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); curlfile_set_property("mime", sizeof("mime")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto void CURLFile::setPostFilename(string $name) /* {{{ Set file name for POST */
Set file name for POST */
ZEND_METHOD(CURLFile, setPostFilename) ZEND_METHOD(CURLFile, setPostFilename)
{ {
curlfile_set_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU); curlfile_set_property("postname", sizeof("postname")-1, INTERNAL_FUNCTION_PARAM_PASSTHRU);

87
ext/curl/interface.c
View file

@ -210,8 +210,7 @@ void _php_curl_verify_handlers(php_curl *ch, int reporterror) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ curl_module_entry /* {{{ curl_module_entry */
*/
zend_module_entry curl_module_entry = { zend_module_entry curl_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"curl", "curl",
@ -250,8 +249,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(curl) PHP_MINFO_FUNCTION(curl)
{ {
curl_version_info_data *d; curl_version_info_data *d;
@ -370,8 +368,7 @@ PHP_MINFO_FUNCTION(curl)
#define REGISTER_CURL_CONSTANT(__c) REGISTER_LONG_CONSTANT(#__c, __c, CONST_CS | CONST_PERSISTENT) #define REGISTER_CURL_CONSTANT(__c) REGISTER_LONG_CONSTANT(#__c, __c, CONST_CS | CONST_PERSISTENT)
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(curl) PHP_MINIT_FUNCTION(curl)
{ {
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -1316,8 +1313,7 @@ int curl_cast_object(zend_object *obj, zval *result, int type)
return zend_std_cast_object_tostring(obj, result, type); return zend_std_cast_object_tostring(obj, result, type);
} }
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(curl) PHP_MSHUTDOWN_FUNCTION(curl)
{ {
curl_global_cleanup(); curl_global_cleanup();
@ -1350,8 +1346,7 @@ static size_t curl_write_nothing(char *data, size_t size, size_t nmemb, void *ct
} }
/* }}} */ /* }}} */
/* {{{ curl_write /* {{{ curl_write */
*/
static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx) static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
{ {
php_curl *ch = (php_curl *) ctx; php_curl *ch = (php_curl *) ctx;
@ -1413,8 +1408,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
} }
/* }}} */ /* }}} */
/* {{{ curl_fnmatch /* {{{ curl_fnmatch */
*/
static int curl_fnmatch(void *ctx, const char *pattern, const char *string) static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
{ {
php_curl *ch = (php_curl *) ctx; php_curl *ch = (php_curl *) ctx;
@ -1459,8 +1453,7 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
} }
/* }}} */ /* }}} */
/* {{{ curl_progress /* {{{ curl_progress */
*/
static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
{ {
php_curl *ch = (php_curl *)clientp; php_curl *ch = (php_curl *)clientp;
@ -1513,8 +1506,7 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
} }
/* }}} */ /* }}} */
/* {{{ curl_read /* {{{ curl_read */
*/
static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
{ {
php_curl *ch = (php_curl *)ctx; php_curl *ch = (php_curl *)ctx;
@ -1576,8 +1568,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
} }
/* }}} */ /* }}} */
/* {{{ curl_write_header /* {{{ curl_write_header */
*/
static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx) static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx)
{ {
php_curl *ch = (php_curl *) ctx; php_curl *ch = (php_curl *) ctx;
@ -1657,16 +1648,14 @@ static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, v
} }
/* }}} */ /* }}} */
/* {{{ curl_free_string /* {{{ curl_free_string */
*/
static void curl_free_string(void **string) static void curl_free_string(void **string)
{ {
efree((char *)*string); efree((char *)*string);
} }
/* }}} */ /* }}} */
/* {{{ curl_free_post /* {{{ curl_free_post */
*/
static void curl_free_post(void **post) static void curl_free_post(void **post)
{ {
#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */ #if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
@ -1682,8 +1671,7 @@ struct mime_data_cb_arg {
php_stream *stream; php_stream *stream;
}; };
/* {{{ curl_free_cb_arg /* {{{ curl_free_cb_arg */
*/
static void curl_free_cb_arg(void **cb_arg_p) static void curl_free_cb_arg(void **cb_arg_p)
{ {
struct mime_data_cb_arg *cb_arg = (struct mime_data_cb_arg *) *cb_arg_p; struct mime_data_cb_arg *cb_arg = (struct mime_data_cb_arg *) *cb_arg_p;
@ -1694,16 +1682,14 @@ static void curl_free_cb_arg(void **cb_arg_p)
} }
/* }}} */ /* }}} */
/* {{{ curl_free_slist /* {{{ curl_free_slist */
*/
static void curl_free_slist(zval *el) static void curl_free_slist(zval *el)
{ {
curl_slist_free_all(((struct curl_slist *)Z_PTR_P(el))); curl_slist_free_all(((struct curl_slist *)Z_PTR_P(el)));
} }
/* }}} */ /* }}} */
/* {{{ proto array curl_version() /* {{{ Return cURL version information. */
Return cURL version information. */
PHP_FUNCTION(curl_version) PHP_FUNCTION(curl_version)
{ {
curl_version_info_data *d; curl_version_info_data *d;
@ -1795,8 +1781,7 @@ void init_curl_handle(php_curl *ch)
/* }}} */ /* }}} */
/* {{{ create_certinfo /* {{{ create_certinfo */
*/
static void create_certinfo(struct curl_certinfo *ci, zval *listcode) static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
{ {
int i; int i;
@ -1864,8 +1849,7 @@ static void _php_curl_set_default_options(php_curl *ch)
} }
/* }}} */ /* }}} */
/* {{{ proto CurlHandle curl_init([string url]) /* {{{ Initialize a cURL session */
Initialize a cURL session */
PHP_FUNCTION(curl_init) PHP_FUNCTION(curl_init)
{ {
php_curl *ch; php_curl *ch;
@ -2183,8 +2167,7 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields
} }
/* }}} */ /* }}} */
/* {{{ proto CurlHandle curl_copy_handle(CurlHandle ch) /* {{{ Copy a cURL handle along with all of it's preferences */
Copy a cURL handle along with all of it's preferences */
PHP_FUNCTION(curl_copy_handle) PHP_FUNCTION(curl_copy_handle)
{ {
php_curl *ch; php_curl *ch;
@ -2878,8 +2861,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_setopt(CurlHandle ch, int option, mixed value) /* {{{ Set an option for a cURL transfer */
Set an option for a cURL transfer */
PHP_FUNCTION(curl_setopt) PHP_FUNCTION(curl_setopt)
{ {
zval *zid, *zvalue; zval *zid, *zvalue;
@ -2907,8 +2889,7 @@ PHP_FUNCTION(curl_setopt)
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_setopt_array(CurlHandle ch, array options) /* {{{ Set an array of option for a cURL transfer */
Set an array of option for a cURL transfer */
PHP_FUNCTION(curl_setopt_array) PHP_FUNCTION(curl_setopt_array)
{ {
zval *zid, *arr, *entry; zval *zid, *arr, *entry;
@ -2954,8 +2935,7 @@ void _php_curl_cleanup_handle(php_curl *ch)
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_exec(CurlHandle ch) /* {{{ Perform a cURL session */
Perform a cURL session */
PHP_FUNCTION(curl_exec) PHP_FUNCTION(curl_exec)
{ {
CURLcode error; CURLcode error;
@ -3009,8 +2989,7 @@ PHP_FUNCTION(curl_exec)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed curl_getinfo(CurlHandle ch [, int option]) /* {{{ Get information regarding a specific transfer */
Get information regarding a specific transfer */
PHP_FUNCTION(curl_getinfo) PHP_FUNCTION(curl_getinfo)
{ {
zval *zid; zval *zid;
@ -3263,8 +3242,7 @@ PHP_FUNCTION(curl_getinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto string curl_error(CurlHandle ch) /* {{{ Return a string contain the last error for the current session */
Return a string contain the last error for the current session */
PHP_FUNCTION(curl_error) PHP_FUNCTION(curl_error)
{ {
zval *zid; zval *zid;
@ -3285,8 +3263,7 @@ PHP_FUNCTION(curl_error)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_errno(CurlHandle ch) /* {{{ Return an integer containing the last error number */
Return an integer containing the last error number */
PHP_FUNCTION(curl_errno) PHP_FUNCTION(curl_errno)
{ {
zval *zid; zval *zid;
@ -3302,8 +3279,7 @@ PHP_FUNCTION(curl_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_close(CurlHandle ch) /* {{{ Close a cURL session */
Close a cURL session */
PHP_FUNCTION(curl_close) PHP_FUNCTION(curl_close)
{ {
zval *zid; zval *zid;
@ -3395,8 +3371,7 @@ static void curl_free_obj(zend_object *object)
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_strerror(int code) /* {{{ return string describing error code */
return string describing error code */
PHP_FUNCTION(curl_strerror) PHP_FUNCTION(curl_strerror)
{ {
zend_long code; zend_long code;
@ -3461,8 +3436,7 @@ static void _php_curl_reset_handlers(php_curl *ch)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_reset(CurlHandle ch) /* {{{ Reset all options of a libcurl session handle */
Reset all options of a libcurl session handle */
PHP_FUNCTION(curl_reset) PHP_FUNCTION(curl_reset)
{ {
zval *zid; zval *zid;
@ -3485,8 +3459,7 @@ PHP_FUNCTION(curl_reset)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_escape(CurlHandle ch, string str) /* {{{ URL encodes the given string */
URL encodes the given string */
PHP_FUNCTION(curl_escape) PHP_FUNCTION(curl_escape)
{ {
zend_string *str; zend_string *str;
@ -3514,8 +3487,7 @@ PHP_FUNCTION(curl_escape)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_unescape(CurlHandle ch, string str) /* {{{ URL decodes the given string */
URL decodes the given string */
PHP_FUNCTION(curl_unescape) PHP_FUNCTION(curl_unescape)
{ {
char *out = NULL; char *out = NULL;
@ -3544,8 +3516,7 @@ PHP_FUNCTION(curl_unescape)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_pause(CurlHandle ch, int bitmask) /* {{{ pause and unpause a connection */
pause and unpause a connection */
PHP_FUNCTION(curl_pause) PHP_FUNCTION(curl_pause)
{ {
zend_long bitmask; zend_long bitmask;

33
ext/curl/multi.c
View file

@ -58,8 +58,7 @@ static inline php_curlm *curl_multi_from_obj(zend_object *obj) {
#define Z_CURL_MULTI_P(zv) curl_multi_from_obj(Z_OBJ_P(zv)) #define Z_CURL_MULTI_P(zv) curl_multi_from_obj(Z_OBJ_P(zv))
/* {{{ proto CurlMultiHandle curl_multi_init(void) /* {{{ Returns a new cURL multi handle */
Returns a new cURL multi handle */
PHP_FUNCTION(curl_multi_init) PHP_FUNCTION(curl_multi_init)
{ {
php_curlm *mh; php_curlm *mh;
@ -75,8 +74,7 @@ PHP_FUNCTION(curl_multi_init)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_add_handle(CurlMultiHandle mh, Curl ch) /* {{{ Add a normal cURL handle to a cURL multi handle */
Add a normal cURL handle to a cURL multi handle */
PHP_FUNCTION(curl_multi_add_handle) PHP_FUNCTION(curl_multi_add_handle)
{ {
zval *z_mh; zval *z_mh;
@ -144,8 +142,7 @@ static zval *_php_curl_multi_find_easy_handle(php_curlm *mh, CURL *easy) /* {{{
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_remove_handle(CurlMultiHandle mh, Curl ch) /* {{{ Remove a multi handle from a set of cURL handles */
Remove a multi handle from a set of cURL handles */
PHP_FUNCTION(curl_multi_remove_handle) PHP_FUNCTION(curl_multi_remove_handle)
{ {
zval *z_mh; zval *z_mh;
@ -171,8 +168,7 @@ PHP_FUNCTION(curl_multi_remove_handle)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_select(CurlMultiHandle mh[, double timeout]) /* {{{ Get all the sockets associated with the cURL extension, which can then be "selected" */
Get all the sockets associated with the cURL extension, which can then be "selected" */
PHP_FUNCTION(curl_multi_select) PHP_FUNCTION(curl_multi_select)
{ {
zval *z_mh; zval *z_mh;
@ -199,8 +195,7 @@ PHP_FUNCTION(curl_multi_select)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_exec(CurlMultiHandle mh, int &still_running) /* {{{ Run the sub-connections of the current cURL handle */
Run the sub-connections of the current cURL handle */
PHP_FUNCTION(curl_multi_exec) PHP_FUNCTION(curl_multi_exec)
{ {
zval *z_mh; zval *z_mh;
@ -238,8 +233,7 @@ PHP_FUNCTION(curl_multi_exec)
} }
/* }}} */ /* }}} */
/* {{{ proto string curl_multi_getcontent(CurlHandle ch) /* {{{ Return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set */
Return the content of a cURL handle if CURLOPT_RETURNTRANSFER is set */
PHP_FUNCTION(curl_multi_getcontent) PHP_FUNCTION(curl_multi_getcontent)
{ {
zval *z_ch; zval *z_ch;
@ -263,8 +257,7 @@ PHP_FUNCTION(curl_multi_getcontent)
} }
/* }}} */ /* }}} */
/* {{{ proto array curl_multi_info_read(CurlMultiHandle mh [, int &msgs_in_queue]) /* {{{ Get information about the current transfers */
Get information about the current transfers */
PHP_FUNCTION(curl_multi_info_read) PHP_FUNCTION(curl_multi_info_read)
{ {
zval *z_mh; zval *z_mh;
@ -310,8 +303,7 @@ PHP_FUNCTION(curl_multi_info_read)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_multi_close(CurlMultiHandle mh) /* {{{ Close a set of cURL handles */
Close a set of cURL handles */
PHP_FUNCTION(curl_multi_close) PHP_FUNCTION(curl_multi_close)
{ {
php_curlm *mh; php_curlm *mh;
@ -336,8 +328,7 @@ PHP_FUNCTION(curl_multi_close)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_errno(CurlMultiHandle mh) /* {{{ Return an integer containing the last multi curl error number */
Return an integer containing the last multi curl error number */
PHP_FUNCTION(curl_multi_errno) PHP_FUNCTION(curl_multi_errno)
{ {
zval *z_mh; zval *z_mh;
@ -353,8 +344,7 @@ PHP_FUNCTION(curl_multi_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_multi_strerror(int code) /* {{{ return string describing error code */
return string describing error code */
PHP_FUNCTION(curl_multi_strerror) PHP_FUNCTION(curl_multi_strerror)
{ {
zend_long code; zend_long code;
@ -498,8 +488,7 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue,
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_multi_setopt(CurlMultiHandle mh, int option, mixed value) /* {{{ Set an option for the curl multi handle */
Set an option for the curl multi handle */
PHP_FUNCTION(curl_multi_setopt) PHP_FUNCTION(curl_multi_setopt)
{ {
zval *z_mh, *zvalue; zval *z_mh, *zvalue;

15
ext/curl/share.c
View file

@ -31,8 +31,7 @@
#define SAVE_CURLSH_ERROR(__handle, __err) (__handle)->err.no = (int) __err; #define SAVE_CURLSH_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
/* {{{ proto CurlShareHandle curl_share_init() /* {{{ Initialize a share curl handle */
Initialize a share curl handle */
PHP_FUNCTION(curl_share_init) PHP_FUNCTION(curl_share_init)
{ {
php_curlsh *sh; php_curlsh *sh;
@ -46,8 +45,7 @@ PHP_FUNCTION(curl_share_init)
} }
/* }}} */ /* }}} */
/* {{{ proto void curl_share_close(CurlShareHandle sh) /* {{{ Close a set of cURL handles */
Close a set of cURL handles */
PHP_FUNCTION(curl_share_close) PHP_FUNCTION(curl_share_close)
{ {
zval *z_sh; zval *z_sh;
@ -80,8 +78,7 @@ static int _php_curl_share_setopt(php_curlsh *sh, zend_long option, zval *zvalue
} }
/* }}} */ /* }}} */
/* {{{ proto bool curl_share_setopt(CurlShareHandle sh, int option, mixed value) /* {{{ Set an option for a cURL transfer */
Set an option for a cURL transfer */
PHP_FUNCTION(curl_share_setopt) PHP_FUNCTION(curl_share_setopt)
{ {
zval *z_sh, *zvalue; zval *z_sh, *zvalue;
@ -104,8 +101,7 @@ PHP_FUNCTION(curl_share_setopt)
} }
/* }}} */ /* }}} */
/* {{{ proto int curl_share_errno(CurlShareHandle sh) /* {{{ Return an integer containing the last share curl error number */
Return an integer containing the last share curl error number */
PHP_FUNCTION(curl_share_errno) PHP_FUNCTION(curl_share_errno)
{ {
zval *z_sh; zval *z_sh;
@ -122,8 +118,7 @@ PHP_FUNCTION(curl_share_errno)
/* }}} */ /* }}} */
/* {{{ proto bool curl_share_strerror(int code) /* {{{ return string describing error code */
return string describing error code */
PHP_FUNCTION(curl_share_strerror) PHP_FUNCTION(curl_share_strerror)
{ {
zend_long code; zend_long code;

284
ext/date/php_date.c
View file

@ -823,8 +823,7 @@ PHPAPI zend_string *php_format_date(const char *format, size_t format_len, time_
} }
/* }}} */ /* }}} */
/* {{{ php_idate /* {{{ php_idate */
*/
PHPAPI int php_idate(char format, time_t ts, int localtime) PHPAPI int php_idate(char format, time_t ts, int localtime)
{ {
timelib_time *t; timelib_time *t;
@ -920,24 +919,21 @@ PHPAPI int php_idate(char format, time_t ts, int localtime)
} }
/* }}} */ /* }}} */
/* {{{ proto string date(string format [, int timestamp]) /* {{{ Format a local date/time */
Format a local date/time */
PHP_FUNCTION(date) PHP_FUNCTION(date)
{ {
php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto string gmdate(string format [, int timestamp]) /* {{{ Format a GMT date/time */
Format a GMT date/time */
PHP_FUNCTION(gmdate) PHP_FUNCTION(gmdate)
{ {
php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto int idate(string format [, int timestamp]) /* {{{ Format a local time/date as integer */
Format a local time/date as integer */
PHP_FUNCTION(idate) PHP_FUNCTION(idate)
{ {
zend_string *format; zend_string *format;
@ -1006,8 +1002,7 @@ PHPAPI zend_long php_parse_date(const char *string, zend_long *now)
} }
/* }}} */ /* }}} */
/* {{{ proto int strtotime(string time [, int now ]) /* {{{ Convert string representation of date and time to a timestamp */
Convert string representation of date and time to a timestamp */
PHP_FUNCTION(strtotime) PHP_FUNCTION(strtotime)
{ {
zend_string *times; zend_string *times;
@ -1129,24 +1124,21 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
} }
/* }}} */ /* }}} */
/* {{{ proto int mktime(int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]) /* {{{ Get UNIX timestamp for a date */
Get UNIX timestamp for a date */
PHP_FUNCTION(mktime) PHP_FUNCTION(mktime)
{ {
php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto int gmmktime(int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]) /* {{{ Get UNIX timestamp for a GMT date */
Get UNIX timestamp for a GMT date */
PHP_FUNCTION(gmmktime) PHP_FUNCTION(gmmktime)
{ {
php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool checkdate(int month, int day, int year) /* {{{ Returns true(1) if it is a valid date in gregorian calendar */
Returns true(1) if it is a valid date in gregorian calendar */
PHP_FUNCTION(checkdate) PHP_FUNCTION(checkdate)
{ {
zend_long m, d, y; zend_long m, d, y;
@ -1263,24 +1255,21 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
} }
/* }}} */ /* }}} */
/* {{{ proto string strftime(string format [, int timestamp]) /* {{{ Format a local time/date according to locale settings */
Format a local time/date according to locale settings */
PHP_FUNCTION(strftime) PHP_FUNCTION(strftime)
{ {
php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string gmstrftime(string format [, int timestamp]) /* {{{ Format a GMT/UCT time/date according to locale settings */
Format a GMT/UCT time/date according to locale settings */
PHP_FUNCTION(gmstrftime) PHP_FUNCTION(gmstrftime)
{ {
php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto int time(void) /* {{{ Return current UNIX timestamp */
Return current UNIX timestamp */
PHP_FUNCTION(time) PHP_FUNCTION(time)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -1289,8 +1278,7 @@ PHP_FUNCTION(time)
} }
/* }}} */ /* }}} */
/* {{{ proto array localtime([int timestamp [, bool associative_array]]) /* {{{ Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */
Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */
PHP_FUNCTION(localtime) PHP_FUNCTION(localtime)
{ {
zend_long timestamp; zend_long timestamp;
@ -1343,8 +1331,7 @@ PHP_FUNCTION(localtime)
} }
/* }}} */ /* }}} */
/* {{{ proto array getdate([int timestamp]) /* {{{ Get date/time information */
Get date/time information */
PHP_FUNCTION(getdate) PHP_FUNCTION(getdate)
{ {
zend_long timestamp; zend_long timestamp;
@ -2284,9 +2271,7 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, const char *time_str, size
return 1; return 1;
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_create([string time[, DateTimeZone object]]) /* {{{ Returns new DateTime object */
Returns new DateTime object
*/
PHP_FUNCTION(date_create) PHP_FUNCTION(date_create)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2307,9 +2292,7 @@ PHP_FUNCTION(date_create)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime date_create_immutable([string time[, DateTimeZone object]]) /* {{{ Returns new DateTime object */
Returns new DateTime object
*/
PHP_FUNCTION(date_create_immutable) PHP_FUNCTION(date_create_immutable)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2330,9 +2313,7 @@ PHP_FUNCTION(date_create_immutable)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime date_create_from_format(string format, string time[, DateTimeZone object]) /* {{{ Returns new DateTime object formatted according to the specified format */
Returns new DateTime object formatted according to the specified format
*/
PHP_FUNCTION(date_create_from_format) PHP_FUNCTION(date_create_from_format)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2354,9 +2335,7 @@ PHP_FUNCTION(date_create_from_format)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime date_create_immutable_from_format(string format, string time[, DateTimeZone object]) /* {{{ Returns new DateTime object formatted according to the specified format */
Returns new DateTime object formatted according to the specified format
*/
PHP_FUNCTION(date_create_immutable_from_format) PHP_FUNCTION(date_create_immutable_from_format)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2378,9 +2357,7 @@ PHP_FUNCTION(date_create_immutable_from_format)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime::__construct([string time[, DateTimeZone object]]) /* {{{ Creates new DateTime object */
Creates new DateTime object
*/
PHP_METHOD(DateTime, __construct) PHP_METHOD(DateTime, __construct)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2400,9 +2377,7 @@ PHP_METHOD(DateTime, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::__construct([string time[, DateTimeZone object]]) /* {{{ Creates new DateTimeImmutable object */
Creates new DateTimeImmutable object
*/
PHP_METHOD(DateTimeImmutable, __construct) PHP_METHOD(DateTimeImmutable, __construct)
{ {
zval *timezone_object = NULL; zval *timezone_object = NULL;
@ -2422,9 +2397,7 @@ PHP_METHOD(DateTimeImmutable, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime::createFromImmutable(DateTimeImmutable object) /* {{{ Creates new DateTime object from an existing immutable DateTimeImmutable object. */
Creates new DateTime object from an existing immutable DateTimeImmutable object.
*/
PHP_METHOD(DateTime, createFromImmutable) PHP_METHOD(DateTime, createFromImmutable)
{ {
zval *datetimeimmutable_object = NULL; zval *datetimeimmutable_object = NULL;
@ -2443,9 +2416,7 @@ PHP_METHOD(DateTime, createFromImmutable)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime::createFromInterface(DateTimeInterface object) /* {{{ Creates new DateTime object from an existing DateTimeInterface object. */
Creates new DateTime object from an existing DateTimeInterface object.
*/
PHP_METHOD(DateTime, createFromInterface) PHP_METHOD(DateTime, createFromInterface)
{ {
zval *datetimeinterface_object = NULL; zval *datetimeinterface_object = NULL;
@ -2464,9 +2435,7 @@ PHP_METHOD(DateTime, createFromInterface)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::createFromMutable(DateTime object) /* {{{ Creates new DateTimeImmutable object from an existing mutable DateTime object. */
Creates new DateTimeImmutable object from an existing mutable DateTime object.
*/
PHP_METHOD(DateTimeImmutable, createFromMutable) PHP_METHOD(DateTimeImmutable, createFromMutable)
{ {
zval *datetime_object = NULL; zval *datetime_object = NULL;
@ -2485,9 +2454,7 @@ PHP_METHOD(DateTimeImmutable, createFromMutable)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::createFromInterface(DateTimeInterface object) /* {{{ Creates new DateTimeImmutable object from an existing DateTimeInterface object. */
Creates new DateTimeImmutable object from an existing DateTimeInterface object.
*/
PHP_METHOD(DateTimeImmutable, createFromInterface) PHP_METHOD(DateTimeImmutable, createFromInterface)
{ {
zval *datetimeinterface_object = NULL; zval *datetimeinterface_object = NULL;
@ -2555,8 +2522,7 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht
return 0; return 0;
} /* }}} */ } /* }}} */
/* {{{ proto DateTime::__set_state(array array) /* {{{ */
*/
PHP_METHOD(DateTime, __set_state) PHP_METHOD(DateTime, __set_state)
{ {
php_date_obj *dateobj; php_date_obj *dateobj;
@ -2577,8 +2543,7 @@ PHP_METHOD(DateTime, __set_state)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::__set_state(array array) /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, __set_state) PHP_METHOD(DateTimeImmutable, __set_state)
{ {
php_date_obj *dateobj; php_date_obj *dateobj;
@ -2599,8 +2564,7 @@ PHP_METHOD(DateTimeImmutable, __set_state)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTime::__wakeup() /* {{{ */
*/
PHP_METHOD(DateTime, __wakeup) PHP_METHOD(DateTime, __wakeup)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -2619,8 +2583,7 @@ PHP_METHOD(DateTime, __wakeup)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::__wakeup() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, __wakeup) PHP_METHOD(DateTimeImmutable, __wakeup)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -2660,9 +2623,7 @@ static void zval_from_error_container(zval *z, timelib_error_container *error) /
add_assoc_zval(z, "errors", &element); add_assoc_zval(z, "errors", &element);
} /* }}} */ } /* }}} */
/* {{{ proto array date_get_last_errors() /* {{{ Returns the warnings and errors found while parsing a date/time string. */
Returns the warnings and errors found while parsing a date/time string.
*/
PHP_FUNCTION(date_get_last_errors) PHP_FUNCTION(date_get_last_errors)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -2750,9 +2711,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *
timelib_time_dtor(parsed_time); timelib_time_dtor(parsed_time);
} /* }}} */ } /* }}} */
/* {{{ proto array date_parse(string date) /* {{{ Returns associative array with detailed info about given date */
Returns associative array with detailed info about given date
*/
PHP_FUNCTION(date_parse) PHP_FUNCTION(date_parse)
{ {
zend_string *date; zend_string *date;
@ -2768,9 +2727,7 @@ PHP_FUNCTION(date_parse)
} }
/* }}} */ /* }}} */
/* {{{ proto array date_parse_from_format(string format, string date) /* {{{ Returns associative array with detailed info about given date */
Returns associative array with detailed info about given date
*/
PHP_FUNCTION(date_parse_from_format) PHP_FUNCTION(date_parse_from_format)
{ {
zend_string *date, *format; zend_string *date, *format;
@ -2787,9 +2744,7 @@ PHP_FUNCTION(date_parse_from_format)
} }
/* }}} */ /* }}} */
/* {{{ proto string date_format(DateTimeInterface object, string format) /* {{{ Returns date formatted according to given format */
Returns date formatted according to given format
*/
PHP_FUNCTION(date_format) PHP_FUNCTION(date_format)
{ {
zval *object; zval *object;
@ -2874,9 +2829,7 @@ static int php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{
return 1; return 1;
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_modify(DateTime object, string modify) /* {{{ Alters the timestamp. */
Alters the timestamp.
*/
PHP_FUNCTION(date_modify) PHP_FUNCTION(date_modify)
{ {
zval *object; zval *object;
@ -2895,8 +2848,7 @@ PHP_FUNCTION(date_modify)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::modify() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, modify) PHP_METHOD(DateTimeImmutable, modify)
{ {
zval *object, new_object; zval *object, new_object;
@ -2934,9 +2886,7 @@ static void php_date_add(zval *object, zval *interval, zval *return_value) /* {{
dateobj->time = new_time; dateobj->time = new_time;
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_add(DateTime object, DateInterval interval) /* {{{ Adds an interval to the current date in object. */
Adds an interval to the current date in object.
*/
PHP_FUNCTION(date_add) PHP_FUNCTION(date_add)
{ {
zval *object, *interval; zval *object, *interval;
@ -2951,8 +2901,7 @@ PHP_FUNCTION(date_add)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::add() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, add) PHP_METHOD(DateTimeImmutable, add)
{ {
zval *object, *interval, new_object; zval *object, *interval, new_object;
@ -2990,9 +2939,7 @@ static void php_date_sub(zval *object, zval *interval, zval *return_value) /* {{
dateobj->time = new_time; dateobj->time = new_time;
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_sub(DateTime object, DateInterval interval) /* {{{ Subtracts an interval to the current date in object. */
Subtracts an interval to the current date in object.
*/
PHP_FUNCTION(date_sub) PHP_FUNCTION(date_sub)
{ {
zval *object, *interval; zval *object, *interval;
@ -3007,8 +2954,7 @@ PHP_FUNCTION(date_sub)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::sub() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, sub) PHP_METHOD(DateTimeImmutable, sub)
{ {
zval *object, *interval, new_object; zval *object, *interval, new_object;
@ -3045,9 +2991,7 @@ static void set_timezone_from_timelib_time(php_timezone_obj *tzobj, timelib_time
} }
/* {{{ proto DateTimeZone date_timezone_get(DateTimeInterface object) /* {{{ Return new DateTimeZone object relative to give DateTime */
Return new DateTimeZone object relative to give DateTime
*/
PHP_FUNCTION(date_timezone_get) PHP_FUNCTION(date_timezone_get)
{ {
zval *object; zval *object;
@ -3092,9 +3036,7 @@ static void php_date_timezone_set(zval *object, zval *timezone_object, zval *ret
timelib_unixtime2local(dateobj->time, dateobj->time->sse); timelib_unixtime2local(dateobj->time, dateobj->time->sse);
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_timezone_set(DateTime object, DateTimeZone object) /* {{{ Sets the timezone for the DateTime object. */
Sets the timezone for the DateTime object.
*/
PHP_FUNCTION(date_timezone_set) PHP_FUNCTION(date_timezone_set)
{ {
zval *object; zval *object;
@ -3110,8 +3052,7 @@ PHP_FUNCTION(date_timezone_set)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::setTimezone() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, setTimezone) PHP_METHOD(DateTimeImmutable, setTimezone)
{ {
zval *object, new_object; zval *object, new_object;
@ -3129,9 +3070,7 @@ PHP_METHOD(DateTimeImmutable, setTimezone)
} }
/* }}} */ /* }}} */
/* {{{ proto int date_offset_get(DateTimeInterface object) /* {{{ Returns the DST offset. */
Returns the DST offset.
*/
PHP_FUNCTION(date_offset_get) PHP_FUNCTION(date_offset_get)
{ {
zval *object; zval *object;
@ -3178,9 +3117,7 @@ static void php_date_time_set(zval *object, zend_long h, zend_long i, zend_long
timelib_update_from_sse(dateobj->time); timelib_update_from_sse(dateobj->time);
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_time_set(DateTime object, int hour, int minute[, int second[, int microseconds]]) /* {{{ Sets the time. */
Sets the time.
*/
PHP_FUNCTION(date_time_set) PHP_FUNCTION(date_time_set)
{ {
zval *object; zval *object;
@ -3196,8 +3133,7 @@ PHP_FUNCTION(date_time_set)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::setTime() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, setTime) PHP_METHOD(DateTimeImmutable, setTime)
{ {
zval *object, new_object; zval *object, new_object;
@ -3227,9 +3163,7 @@ static void php_date_date_set(zval *object, zend_long y, zend_long m, zend_long
timelib_update_ts(dateobj->time, NULL); timelib_update_ts(dateobj->time, NULL);
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_date_set(DateTime object, int year, int month, int day) /* {{{ Sets the date. */
Sets the date.
*/
PHP_FUNCTION(date_date_set) PHP_FUNCTION(date_date_set)
{ {
zval *object; zval *object;
@ -3245,8 +3179,7 @@ PHP_FUNCTION(date_date_set)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::setDate() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, setDate) PHP_METHOD(DateTimeImmutable, setDate)
{ {
zval *object, new_object; zval *object, new_object;
@ -3280,9 +3213,7 @@ static void php_date_isodate_set(zval *object, zend_long y, zend_long w, zend_lo
timelib_update_ts(dateobj->time, NULL); timelib_update_ts(dateobj->time, NULL);
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_isodate_set(DateTime object, int year, int week[, int day]) /* {{{ Sets the ISO date. */
Sets the ISO date.
*/
PHP_FUNCTION(date_isodate_set) PHP_FUNCTION(date_isodate_set)
{ {
zval *object; zval *object;
@ -3298,8 +3229,7 @@ PHP_FUNCTION(date_isodate_set)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::setISODate() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, setISODate) PHP_METHOD(DateTimeImmutable, setISODate)
{ {
zval *object, new_object; zval *object, new_object;
@ -3328,9 +3258,7 @@ static void php_date_timestamp_set(zval *object, zend_long timestamp, zval *retu
php_date_set_time_fraction(dateobj->time, 0); php_date_set_time_fraction(dateobj->time, 0);
} /* }}} */ } /* }}} */
/* {{{ proto DateTime date_timestamp_set(DateTime object, int unixTimestamp) /* {{{ Sets the date and time based on an Unix timestamp. */
Sets the date and time based on an Unix timestamp.
*/
PHP_FUNCTION(date_timestamp_set) PHP_FUNCTION(date_timestamp_set)
{ {
zval *object; zval *object;
@ -3346,8 +3274,7 @@ PHP_FUNCTION(date_timestamp_set)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeImmutable::setTimestamp() /* {{{ */
*/
PHP_METHOD(DateTimeImmutable, setTimestamp) PHP_METHOD(DateTimeImmutable, setTimestamp)
{ {
zval *object, new_object; zval *object, new_object;
@ -3365,9 +3292,7 @@ PHP_METHOD(DateTimeImmutable, setTimestamp)
} }
/* }}} */ /* }}} */
/* {{{ proto int date_timestamp_get(DateTimeInterface object) /* {{{ Gets the Unix timestamp. */
Gets the Unix timestamp.
*/
PHP_FUNCTION(date_timestamp_get) PHP_FUNCTION(date_timestamp_get)
{ {
zval *object; zval *object;
@ -3391,9 +3316,7 @@ PHP_FUNCTION(date_timestamp_get)
} }
/* }}} */ /* }}} */
/* {{{ proto DateInterval date_diff(DateTime object [, bool absolute]) /* {{{ Returns the difference between two DateTime objects. */
Returns the difference between two DateTime objects.
*/
PHP_FUNCTION(date_diff) PHP_FUNCTION(date_diff)
{ {
zval *object1, *object2; zval *object1, *object2;
@ -3446,9 +3369,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size
} }
} /* }}} */ } /* }}} */
/* {{{ proto DateTimeZone timezone_open(string timezone) /* {{{ Returns new DateTimeZone object */
Returns new DateTimeZone object
*/
PHP_FUNCTION(timezone_open) PHP_FUNCTION(timezone_open)
{ {
zend_string *tz; zend_string *tz;
@ -3466,9 +3387,7 @@ PHP_FUNCTION(timezone_open)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeZone::__construct(string timezone) /* {{{ Creates new DateTimeZone object. */
Creates new DateTimeZone object.
*/
PHP_METHOD(DateTimeZone, __construct) PHP_METHOD(DateTimeZone, __construct)
{ {
zend_string *tz; zend_string *tz;
@ -3508,8 +3427,7 @@ static int php_date_timezone_initialize_from_hash(zval **return_value, php_timez
return FAILURE; return FAILURE;
} /* }}} */ } /* }}} */
/* {{{ proto DateTimeZone::__set_state(array array) /* {{{ */
* */
PHP_METHOD(DateTimeZone, __set_state) PHP_METHOD(DateTimeZone, __set_state)
{ {
php_timezone_obj *tzobj; php_timezone_obj *tzobj;
@ -3531,8 +3449,7 @@ PHP_METHOD(DateTimeZone, __set_state)
} }
/* }}} */ /* }}} */
/* {{{ proto DateTimeZone::__wakeup() /* {{{ */
* */
PHP_METHOD(DateTimeZone, __wakeup) PHP_METHOD(DateTimeZone, __wakeup)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -3551,9 +3468,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
} }
/* }}} */ /* }}} */
/* {{{ proto string timezone_name_get(DateTimeZone object) /* {{{ Returns the name of the timezone. */
Returns the name of the timezone.
*/
PHP_FUNCTION(timezone_name_get) PHP_FUNCTION(timezone_name_get)
{ {
zval *object; zval *object;
@ -3568,9 +3483,7 @@ PHP_FUNCTION(timezone_name_get)
} }
/* }}} */ /* }}} */
/* {{{ proto string timezone_name_from_abbr(string abbr[, int gmtOffset[, int isdst]]) /* {{{ Returns the timezone name from abbreviation */
Returns the timezone name from abbreviation
*/
PHP_FUNCTION(timezone_name_from_abbr) PHP_FUNCTION(timezone_name_from_abbr)
{ {
zend_string *abbr; zend_string *abbr;
@ -3595,9 +3508,7 @@ PHP_FUNCTION(timezone_name_from_abbr)
} }
/* }}} */ /* }}} */
/* {{{ proto int timezone_offset_get(DateTimeZone object, DateTimeInterface datetime) /* {{{ Returns the timezone offset. */
Returns the timezone offset.
*/
PHP_FUNCTION(timezone_offset_get) PHP_FUNCTION(timezone_offset_get)
{ {
zval *object, *dateobject; zval *object, *dateobject;
@ -3629,9 +3540,7 @@ PHP_FUNCTION(timezone_offset_get)
} }
/* }}} */ /* }}} */
/* {{{ proto array timezone_transitions_get(DateTimeZone object [, int timestamp_begin [, int timestamp_end ]]) /* {{{ Returns numerically indexed array containing associative array for all transitions in the specified range for the timezone. */
Returns numerically indexed array containing associative array for all transitions in the specified range for the timezone.
*/
PHP_FUNCTION(timezone_transitions_get) PHP_FUNCTION(timezone_transitions_get)
{ {
zval *object, element; zval *object, element;
@ -3710,9 +3619,7 @@ PHP_FUNCTION(timezone_transitions_get)
} }
/* }}} */ /* }}} */
/* {{{ proto array timezone_location_get() /* {{{ Returns location information for a timezone, including country code, latitude/longitude and comments */
Returns location information for a timezone, including country code, latitude/longitude and comments
*/
PHP_FUNCTION(timezone_location_get) PHP_FUNCTION(timezone_location_get)
{ {
zval *object; zval *object;
@ -3896,9 +3803,7 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string
} }
/* }}} */ /* }}} */
/* {{{ proto DateInterval::__construct([string interval_spec]) /* {{{ Creates new DateInterval object. */
Creates new DateInterval object.
*/
PHP_METHOD(DateInterval, __construct) PHP_METHOD(DateInterval, __construct)
{ {
zend_string *interval_string = NULL; zend_string *interval_string = NULL;
@ -4001,8 +3906,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
return 0; return 0;
} /* }}} */ } /* }}} */
/* {{{ proto DateInterval::__set_state(array array) /* {{{ */
*/
PHP_METHOD(DateInterval, __set_state) PHP_METHOD(DateInterval, __set_state)
{ {
php_interval_obj *intobj; php_interval_obj *intobj;
@ -4021,8 +3925,7 @@ PHP_METHOD(DateInterval, __set_state)
} }
/* }}} */ /* }}} */
/* {{{ proto DateInterval::__wakeup() /* {{{ */
*/
PHP_METHOD(DateInterval, __wakeup) PHP_METHOD(DateInterval, __wakeup)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -4039,9 +3942,7 @@ PHP_METHOD(DateInterval, __wakeup)
} }
/* }}} */ /* }}} */
/* {{{ proto DateInterval date_interval_create_from_date_string(string time) /* {{{ Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string */
Uses the normal date parsers and sets up a DateInterval from the relative parts of the parsed string
*/
PHP_FUNCTION(date_interval_create_from_date_string) PHP_FUNCTION(date_interval_create_from_date_string)
{ {
zend_string *time_str = NULL; zend_string *time_str = NULL;
@ -4143,9 +4044,7 @@ static zend_string *date_interval_format(char *format, size_t format_len, timeli
} }
/* }}} */ /* }}} */
/* {{{ proto string date_interval_format(DateInterval object, string format) /* {{{ Formats the interval. */
Formats the interval.
*/
PHP_FUNCTION(date_interval_format) PHP_FUNCTION(date_interval_format)
{ {
zval *object; zval *object;
@ -4190,9 +4089,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_
return retval; return retval;
} /* }}} */ } /* }}} */
/* {{{ proto DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end) /* {{{ Creates new DatePeriod object. */
Creates new DatePeriod object.
*/
PHP_METHOD(DatePeriod, __construct) PHP_METHOD(DatePeriod, __construct)
{ {
php_period_obj *dpobj; php_period_obj *dpobj;
@ -4281,9 +4178,7 @@ PHP_METHOD(DatePeriod, __construct)
} }
/* }}} */ /* }}} */
/* {{{ proto DatePeriod::getStartDate() /* {{{ Get start date. */
Get start date.
*/
PHP_METHOD(DatePeriod, getStartDate) PHP_METHOD(DatePeriod, getStartDate)
{ {
php_period_obj *dpobj; php_period_obj *dpobj;
@ -4306,9 +4201,7 @@ PHP_METHOD(DatePeriod, getStartDate)
} }
/* }}} */ /* }}} */
/* {{{ proto DatePeriod::getEndDate() /* {{{ Get end date. */
Get end date.
*/
PHP_METHOD(DatePeriod, getEndDate) PHP_METHOD(DatePeriod, getEndDate)
{ {
php_period_obj *dpobj; php_period_obj *dpobj;
@ -4335,9 +4228,7 @@ PHP_METHOD(DatePeriod, getEndDate)
} }
/* }}} */ /* }}} */
/* {{{ proto DatePeriod::getDateInterval() /* {{{ Get date interval. */
Get date interval.
*/
PHP_METHOD(DatePeriod, getDateInterval) PHP_METHOD(DatePeriod, getDateInterval)
{ {
php_period_obj *dpobj; php_period_obj *dpobj;
@ -4354,9 +4245,7 @@ PHP_METHOD(DatePeriod, getDateInterval)
} }
/* }}} */ /* }}} */
/* {{{ proto int DatePeriod::getRecurrences() /* {{{ Get recurrences. */
Get recurrences.
*/
PHP_METHOD(DatePeriod, getRecurrences) PHP_METHOD(DatePeriod, getRecurrences)
{ {
php_period_obj *dpobj; php_period_obj *dpobj;
@ -4396,9 +4285,7 @@ static int check_id_allowed(char *id, zend_long what) /* {{{ */
return 0; return 0;
} /* }}} */ } /* }}} */
/* {{{ proto array timezone_identifiers_list([long what[, string country]]) /* {{{ Returns numerically index array with all timezone identifiers. */
Returns numerically index array with all timezone identifiers.
*/
PHP_FUNCTION(timezone_identifiers_list) PHP_FUNCTION(timezone_identifiers_list)
{ {
const timelib_tzdb *tzdb; const timelib_tzdb *tzdb;
@ -4437,9 +4324,7 @@ PHP_FUNCTION(timezone_identifiers_list)
} }
/* }}} */ /* }}} */
/* {{{ proto string timezone_version_get() /* {{{ Returns the Olson database version number. */
Returns the Olson database version number.
*/
PHP_FUNCTION(timezone_version_get) PHP_FUNCTION(timezone_version_get)
{ {
const timelib_tzdb *tzdb; const timelib_tzdb *tzdb;
@ -4451,9 +4336,7 @@ PHP_FUNCTION(timezone_version_get)
} }
/* }}} */ /* }}} */
/* {{{ proto array timezone_abbreviations_list() /* {{{ Returns associative array containing dst, offset and the timezone name */
Returns associative array containing dst, offset and the timezone name
*/
PHP_FUNCTION(timezone_abbreviations_list) PHP_FUNCTION(timezone_abbreviations_list)
{ {
const timelib_tz_lookup_table *table, *entry; const timelib_tz_lookup_table *table, *entry;
@ -4488,8 +4371,7 @@ PHP_FUNCTION(timezone_abbreviations_list)
} }
/* }}} */ /* }}} */
/* {{{ proto bool date_default_timezone_set(string timezone_identifier) /* {{{ Sets the default timezone used by all date/time functions in a script */
Sets the default timezone used by all date/time functions in a script */
PHP_FUNCTION(date_default_timezone_set) PHP_FUNCTION(date_default_timezone_set)
{ {
char *zone; char *zone;
@ -4512,8 +4394,7 @@ PHP_FUNCTION(date_default_timezone_set)
} }
/* }}} */ /* }}} */
/* {{{ proto string date_default_timezone_get() /* {{{ Gets the default timezone used by all date/time functions in a script */
Gets the default timezone used by all date/time functions in a script */
PHP_FUNCTION(date_default_timezone_get) PHP_FUNCTION(date_default_timezone_get)
{ {
timelib_tzinfo *default_tz; timelib_tzinfo *default_tz;
@ -4613,24 +4494,21 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
} }
/* }}} */ /* }}} */
/* {{{ proto mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) /* {{{ Returns time of sunrise for a given day and location */
Returns time of sunrise for a given day and location */
PHP_FUNCTION(date_sunrise) PHP_FUNCTION(date_sunrise)
{ {
php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) /* {{{ Returns time of sunset for a given day and location */
Returns time of sunset for a given day and location */
PHP_FUNCTION(date_sunset) PHP_FUNCTION(date_sunset)
{ {
php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto array date_sun_info(int time, float latitude, float longitude) /* {{{ Returns an array with information about sun set/rise and twilight begin/end */
Returns an array with information about sun set/rise and twilight begin/end */
PHP_FUNCTION(date_sun_info) PHP_FUNCTION(date_sun_info)
{ {
zend_long time; zend_long time;
@ -4887,8 +4765,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash
return 1; return 1;
} /* }}} */ } /* }}} */
/* {{{ proto DatePeriod::__set_state(array array) /* {{{ */
*/
PHP_METHOD(DatePeriod, __set_state) PHP_METHOD(DatePeriod, __set_state)
{ {
php_period_obj *period_obj; php_period_obj *period_obj;
@ -4909,8 +4786,7 @@ PHP_METHOD(DatePeriod, __set_state)
} }
/* }}} */ /* }}} */
/* {{{ proto DatePeriod::__wakeup() /* {{{ */
*/
PHP_METHOD(DatePeriod, __wakeup) PHP_METHOD(DatePeriod, __wakeup)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;

75
ext/dba/dba.c
View file

@ -319,8 +319,7 @@ PHPAPI dba_handler *dba_get_handler(const char* handler_name)
*/ */
/* }}} */ /* }}} */
/* {{{ dba_close /* {{{ dba_close */
*/
static void dba_close(dba_info *info) static void dba_close(dba_info *info)
{ {
if (info->hnd) { if (info->hnd) {
@ -350,8 +349,7 @@ static void dba_close(dba_info *info)
} }
/* }}} */ /* }}} */
/* {{{ dba_close_rsrc /* {{{ dba_close_rsrc */
*/
static void dba_close_rsrc(zend_resource *rsrc) static void dba_close_rsrc(zend_resource *rsrc)
{ {
dba_info *info = (dba_info *)rsrc->ptr; dba_info *info = (dba_info *)rsrc->ptr;
@ -385,8 +383,7 @@ static void dba_close_pe_rsrc(zend_resource *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
ZEND_INI_MH(OnUpdateDefaultHandler) ZEND_INI_MH(OnUpdateDefaultHandler)
{ {
dba_handler *hptr; dba_handler *hptr;
@ -411,8 +408,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(dba) static PHP_GINIT_FUNCTION(dba)
{ {
#if defined(COMPILE_DL_DBA) && defined(ZTS) #if defined(COMPILE_DL_DBA) && defined(ZTS)
@ -423,8 +419,7 @@ static PHP_GINIT_FUNCTION(dba)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(dba) PHP_MINIT_FUNCTION(dba)
{ {
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -434,8 +429,7 @@ PHP_MINIT_FUNCTION(dba)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(dba) PHP_MSHUTDOWN_FUNCTION(dba)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -445,8 +439,7 @@ PHP_MSHUTDOWN_FUNCTION(dba)
#include "zend_smart_str.h" #include "zend_smart_str.h"
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(dba) PHP_MINFO_FUNCTION(dba)
{ {
dba_handler *hptr; dba_handler *hptr;
@ -471,8 +464,7 @@ PHP_MINFO_FUNCTION(dba)
} }
/* }}} */ /* }}} */
/* {{{ php_dba_update /* {{{ php_dba_update */
*/
static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
{ {
size_t val_len; size_t val_len;
@ -508,8 +500,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
#define FREENOW if(args) {int i; for (i=0; i<ac; i++) { zval_ptr_dtor(&args[i]); } efree(args);} if(key) efree(key) #define FREENOW if(args) {int i; for (i=0; i<ac; i++) { zval_ptr_dtor(&args[i]); } efree(args);} if(key) efree(key)
/* {{{ php_find_dbm /* {{{ php_find_dbm */
*/
dba_info *php_dba_find(const char* path) dba_info *php_dba_find(const char* path)
{ {
zend_resource *le; zend_resource *le;
@ -533,8 +524,7 @@ dba_info *php_dba_find(const char* path)
} }
/* }}} */ /* }}} */
/* {{{ php_dba_open /* {{{ php_dba_open */
*/
static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
zval *args = NULL; zval *args = NULL;
@ -918,24 +908,21 @@ restart:
/* }}} */ /* }}} */
#undef FREENOW #undef FREENOW
/* {{{ proto resource dba_popen(string path, string mode [, string handlername, string ...]) /* {{{ Opens path using the specified handler in mode persistently */
Opens path using the specified handler in mode persistently */
PHP_FUNCTION(dba_popen) PHP_FUNCTION(dba_popen)
{ {
php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto resource dba_open(string path, string mode [, string handlername, string ...]) /* {{{ Opens path using the specified handler in mode*/
Opens path using the specified handler in mode*/
PHP_FUNCTION(dba_open) PHP_FUNCTION(dba_open)
{ {
php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_dba_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto void dba_close(resource handle) /* {{{ Closes database */
Closes database */
PHP_FUNCTION(dba_close) PHP_FUNCTION(dba_close)
{ {
zval *id; zval *id;
@ -951,8 +938,7 @@ PHP_FUNCTION(dba_close)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_exists(string key, resource handle) /* {{{ Checks, if the specified key exists */
Checks, if the specified key exists */
PHP_FUNCTION(dba_exists) PHP_FUNCTION(dba_exists)
{ {
DBA_ID_GET2; DBA_ID_GET2;
@ -966,8 +952,7 @@ PHP_FUNCTION(dba_exists)
} }
/* }}} */ /* }}} */
/* {{{ proto string dba_fetch(string key, [int skip ,] resource handle) /* {{{ Fetches the data associated with key */
Fetches the data associated with key */
PHP_FUNCTION(dba_fetch) PHP_FUNCTION(dba_fetch)
{ {
char *val; char *val;
@ -1009,8 +994,7 @@ PHP_FUNCTION(dba_fetch)
} }
/* }}} */ /* }}} */
/* {{{ proto array|false dba_key_split(string key) /* {{{ Splits an inifile key into an array of the form array(0=>group,1=>value_name) but returns false if input is false or null */
Splits an inifile key into an array of the form array(0=>group,1=>value_name) but returns false if input is false or null */
PHP_FUNCTION(dba_key_split) PHP_FUNCTION(dba_key_split)
{ {
zval *zkey; zval *zkey;
@ -1039,8 +1023,7 @@ PHP_FUNCTION(dba_key_split)
} }
/* }}} */ /* }}} */
/* {{{ proto string dba_firstkey(resource handle) /* {{{ Resets the internal key pointer and returns the first key */
Resets the internal key pointer and returns the first key */
PHP_FUNCTION(dba_firstkey) PHP_FUNCTION(dba_firstkey)
{ {
char *fkey; char *fkey;
@ -1066,8 +1049,7 @@ PHP_FUNCTION(dba_firstkey)
} }
/* }}} */ /* }}} */
/* {{{ proto string dba_nextkey(resource handle) /* {{{ Returns the next key */
Returns the next key */
PHP_FUNCTION(dba_nextkey) PHP_FUNCTION(dba_nextkey)
{ {
char *nkey; char *nkey;
@ -1093,8 +1075,7 @@ PHP_FUNCTION(dba_nextkey)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_delete(string key, resource handle) /* {{{ Deletes the entry associated with key
Deletes the entry associated with key
If inifile: remove all other key lines */ If inifile: remove all other key lines */
PHP_FUNCTION(dba_delete) PHP_FUNCTION(dba_delete)
{ {
@ -1112,8 +1093,7 @@ PHP_FUNCTION(dba_delete)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_insert(string key, string value, resource handle) /* {{{ If not inifile: Insert value as key, return false, if key exists already
If not inifile: Insert value as key, return false, if key exists already
If inifile: Add vakue as key (next instance of key) */ If inifile: Add vakue as key (next instance of key) */
PHP_FUNCTION(dba_insert) PHP_FUNCTION(dba_insert)
{ {
@ -1121,8 +1101,7 @@ PHP_FUNCTION(dba_insert)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_replace(string key, string value, resource handle) /* {{{ Inserts value as key, replaces key, if key exists already
Inserts value as key, replaces key, if key exists already
If inifile: remove all other key lines */ If inifile: remove all other key lines */
PHP_FUNCTION(dba_replace) PHP_FUNCTION(dba_replace)
{ {
@ -1130,8 +1109,7 @@ PHP_FUNCTION(dba_replace)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_optimize(resource handle) /* {{{ Optimizes (e.g. clean up, vacuum) database */
Optimizes (e.g. clean up, vacuum) database */
PHP_FUNCTION(dba_optimize) PHP_FUNCTION(dba_optimize)
{ {
zval *id; zval *id;
@ -1153,8 +1131,7 @@ PHP_FUNCTION(dba_optimize)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dba_sync(resource handle) /* {{{ Synchronizes database */
Synchronizes database */
PHP_FUNCTION(dba_sync) PHP_FUNCTION(dba_sync)
{ {
zval *id; zval *id;
@ -1174,8 +1151,7 @@ PHP_FUNCTION(dba_sync)
} }
/* }}} */ /* }}} */
/* {{{ proto array dba_handlers([bool full_info]) /* {{{ List configured database handlers */
List configured database handlers */
PHP_FUNCTION(dba_handlers) PHP_FUNCTION(dba_handlers)
{ {
dba_handler *hptr; dba_handler *hptr;
@ -1200,8 +1176,7 @@ PHP_FUNCTION(dba_handlers)
} }
/* }}} */ /* }}} */
/* {{{ proto array dba_list() /* {{{ List opened databases */
List opened databases */
PHP_FUNCTION(dba_list) PHP_FUNCTION(dba_list)
{ {
zend_ulong numitems, i; zend_ulong numitems, i;

18
ext/dba/libflatfile/flatfile.c
View file

@ -43,8 +43,7 @@
* ret = 1 key already exists - nothing done * ret = 1 key already exists - nothing done
*/ */
/* {{{ flatfile_store /* {{{ flatfile_store */
*/
int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode) { int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode) {
if (mode == FLATFILE_INSERT) { if (mode == FLATFILE_INSERT) {
if (flatfile_findkey(dba, key_datum)) { if (flatfile_findkey(dba, key_datum)) {
@ -79,8 +78,7 @@ int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode)
} }
/* }}} */ /* }}} */
/* {{{ flatfile_fetch /* {{{ flatfile_fetch */
*/
datum flatfile_fetch(flatfile *dba, datum key_datum) { datum flatfile_fetch(flatfile *dba, datum key_datum) {
datum value_datum = {NULL, 0}; datum value_datum = {NULL, 0};
char buf[16]; char buf[16];
@ -99,8 +97,7 @@ datum flatfile_fetch(flatfile *dba, datum key_datum) {
} }
/* }}} */ /* }}} */
/* {{{ flatfile_delete /* {{{ flatfile_delete */
*/
int flatfile_delete(flatfile *dba, datum key_datum) { int flatfile_delete(flatfile *dba, datum key_datum) {
char *key = key_datum.dptr; char *key = key_datum.dptr;
size_t size = key_datum.dsize; size_t size = key_datum.dsize;
@ -151,8 +148,7 @@ int flatfile_delete(flatfile *dba, datum key_datum) {
} }
/* }}} */ /* }}} */
/* {{{ flatfile_findkey /* {{{ flatfile_findkey */
*/
int flatfile_findkey(flatfile *dba, datum key_datum) { int flatfile_findkey(flatfile *dba, datum key_datum) {
size_t buf_size = FLATFILE_BLOCK_SIZE; size_t buf_size = FLATFILE_BLOCK_SIZE;
char *buf = emalloc(buf_size); char *buf = emalloc(buf_size);
@ -194,8 +190,7 @@ int flatfile_findkey(flatfile *dba, datum key_datum) {
} }
/* }}} */ /* }}} */
/* {{{ flatfile_firstkey /* {{{ flatfile_firstkey */
*/
datum flatfile_firstkey(flatfile *dba) { datum flatfile_firstkey(flatfile *dba) {
datum res; datum res;
size_t num; size_t num;
@ -237,8 +232,7 @@ datum flatfile_firstkey(flatfile *dba) {
} }
/* }}} */ /* }}} */
/* {{{ flatfile_nextkey /* {{{ flatfile_nextkey */
*/
datum flatfile_nextkey(flatfile *dba) { datum flatfile_nextkey(flatfile *dba) {
datum res; datum res;
size_t num; size_t num;

36
ext/dba/libinifile/inifile.c
View file

@ -160,8 +160,7 @@ static char *etrim(const char *str)
} }
/* }}} */ /* }}} */
/* {{{ inifile_findkey /* {{{ inifile_findkey */
*/
static int inifile_read(inifile *dba, line_type *ln) { static int inifile_read(inifile *dba, line_type *ln) {
char *fline; char *fline;
char *pos; char *pos;
@ -238,8 +237,7 @@ static int inifile_key_cmp(const key_type *k1, const key_type *k2)
} }
/* }}} */ /* }}} */
/* {{{ inifile_fetch /* {{{ inifile_fetch */
*/
val_type inifile_fetch(inifile *dba, const key_type *key, int skip) { val_type inifile_fetch(inifile *dba, const key_type *key, int skip) {
line_type ln = {{NULL,NULL},{NULL},0}; line_type ln = {{NULL,NULL},{NULL},0};
val_type val; val_type val;
@ -282,8 +280,7 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip) {
} }
/* }}} */ /* }}} */
/* {{{ inifile_firstkey /* {{{ inifile_firstkey */
*/
int inifile_firstkey(inifile *dba) { int inifile_firstkey(inifile *dba) {
inifile_line_free(&dba->curr); inifile_line_free(&dba->curr);
dba->curr.pos = 0; dba->curr.pos = 0;
@ -291,8 +288,7 @@ int inifile_firstkey(inifile *dba) {
} }
/* }}} */ /* }}} */
/* {{{ inifile_nextkey /* {{{ inifile_nextkey */
*/
int inifile_nextkey(inifile *dba) { int inifile_nextkey(inifile *dba) {
line_type ln = {{NULL,NULL},{NULL},0}; line_type ln = {{NULL,NULL},{NULL},0};
@ -306,8 +302,7 @@ int inifile_nextkey(inifile *dba) {
} }
/* }}} */ /* }}} */
/* {{{ inifile_truncate /* {{{ inifile_truncate */
*/
static int inifile_truncate(inifile *dba, size_t size) static int inifile_truncate(inifile *dba, size_t size)
{ {
int res; int res;
@ -380,8 +375,7 @@ static int inifile_next_group(inifile *dba, const key_type *key, size_t *pos_grp
} }
/* }}} */ /* }}} */
/* {{{ inifile_copy_to /* {{{ inifile_copy_to */
*/
static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifile **ini_copy) static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifile **ini_copy)
{ {
php_stream *fp; php_stream *fp;
@ -458,8 +452,7 @@ static int inifile_filter(inifile *dba, inifile *from, const key_type *key, zend
} }
/* }}} */ /* }}} */
/* {{{ inifile_delete_replace_append /* {{{ inifile_delete_replace_append */
*/
static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append, zend_bool *found) static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append, zend_bool *found)
{ {
size_t pos_grp_start=0, pos_grp_next; size_t pos_grp_start=0, pos_grp_next;
@ -561,40 +554,35 @@ static int inifile_delete_replace_append(inifile *dba, const key_type *key, cons
} }
/* }}} */ /* }}} */
/* {{{ inifile_delete /* {{{ inifile_delete */
*/
int inifile_delete(inifile *dba, const key_type *key) int inifile_delete(inifile *dba, const key_type *key)
{ {
return inifile_delete_replace_append(dba, key, NULL, 0, NULL); return inifile_delete_replace_append(dba, key, NULL, 0, NULL);
} }
/* }}} */ /* }}} */
/* {{{ inifile_delete_ex /* {{{ inifile_delete_ex */
*/
int inifile_delete_ex(inifile *dba, const key_type *key, zend_bool *found) int inifile_delete_ex(inifile *dba, const key_type *key, zend_bool *found)
{ {
return inifile_delete_replace_append(dba, key, NULL, 0, found); return inifile_delete_replace_append(dba, key, NULL, 0, found);
} }
/* }}} */ /* }}} */
/* {{{ inifile_relace /* {{{ inifile_relace */
*/
int inifile_replace(inifile *dba, const key_type *key, const val_type *value) int inifile_replace(inifile *dba, const key_type *key, const val_type *value)
{ {
return inifile_delete_replace_append(dba, key, value, 0, NULL); return inifile_delete_replace_append(dba, key, value, 0, NULL);
} }
/* }}} */ /* }}} */
/* {{{ inifile_replace_ex /* {{{ inifile_replace_ex */
*/
int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *value, zend_bool *found) int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *value, zend_bool *found)
{ {
return inifile_delete_replace_append(dba, key, value, 0, found); return inifile_delete_replace_append(dba, key, value, 0, found);
} }
/* }}} */ /* }}} */
/* {{{ inifile_append /* {{{ inifile_append */
*/
int inifile_append(inifile *dba, const key_type *key, const val_type *value) int inifile_append(inifile *dba, const key_type *key, const val_type *value)
{ {
return inifile_delete_replace_append(dba, key, value, 1, NULL); return inifile_delete_replace_append(dba, key, value, 1, NULL);

5
ext/dom/attr.c
View file

@ -32,7 +32,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMAttr::__construct(string name, [string value]) */ /* {{{ */
PHP_METHOD(DOMAttr, __construct) PHP_METHOD(DOMAttr, __construct)
{ {
xmlAttrPtr nodep = NULL; xmlAttrPtr nodep = NULL;
@ -202,8 +202,7 @@ int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
/* }}} */ /* }}} */
/* {{{ proto bool domattr::isId() /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMAttr, isId) PHP_METHOD(DOMAttr, isId)

2
ext/dom/cdatasection.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMCdataSection::__construct(string value); */ /* {{{ */
PHP_METHOD(DOMCdataSection, __construct) PHP_METHOD(DOMCdataSection, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;

15
ext/dom/characterdata.c
View file

@ -108,8 +108,7 @@ int dom_characterdata_length_read(dom_object *obj, zval *retval)
/* }}} */ /* }}} */
/* {{{ proto string dom_characterdata_substring_data(int offset, int count); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
Since: Since:
*/ */
PHP_METHOD(DOMCharacterData, substringData) PHP_METHOD(DOMCharacterData, substringData)
@ -158,8 +157,7 @@ PHP_METHOD(DOMCharacterData, substringData)
} }
/* }}} end dom_characterdata_substring_data */ /* }}} end dom_characterdata_substring_data */
/* {{{ proto void dom_characterdata_append_data(string arg); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
Since: Since:
*/ */
PHP_METHOD(DOMCharacterData, appendData) PHP_METHOD(DOMCharacterData, appendData)
@ -181,8 +179,7 @@ PHP_METHOD(DOMCharacterData, appendData)
} }
/* }}} end dom_characterdata_append_data */ /* }}} end dom_characterdata_append_data */
/* {{{ proto void dom_characterdata_insert_data(int offset, string arg); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
Since: Since:
*/ */
PHP_METHOD(DOMCharacterData, insertData) PHP_METHOD(DOMCharacterData, insertData)
@ -231,8 +228,7 @@ PHP_METHOD(DOMCharacterData, insertData)
} }
/* }}} end dom_characterdata_insert_data */ /* }}} end dom_characterdata_insert_data */
/* {{{ proto void dom_characterdata_delete_data(int offset, int count); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
Since: Since:
*/ */
PHP_METHOD(DOMCharacterData, deleteData) PHP_METHOD(DOMCharacterData, deleteData)
@ -287,8 +283,7 @@ PHP_METHOD(DOMCharacterData, deleteData)
} }
/* }}} end dom_characterdata_delete_data */ /* }}} end dom_characterdata_delete_data */
/* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
Since: Since:
*/ */
PHP_METHOD(DOMCharacterData, replaceData) PHP_METHOD(DOMCharacterData, replaceData)

2
ext/dom/comment.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMComment::__construct([string value]); */ /* {{{ */
PHP_METHOD(DOMComment, __construct) PHP_METHOD(DOMComment, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;

103
ext/dom/document.c
View file

@ -505,8 +505,7 @@ int dom_document_config_read(dom_object *obj, zval *retval)
/* }}} */ /* }}} */
/* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createElement) PHP_METHOD(DOMDocument, createElement)
@ -540,8 +539,7 @@ PHP_METHOD(DOMDocument, createElement)
} }
/* }}} end dom_document_create_element */ /* }}} end dom_document_create_element */
/* {{{ proto DOMDocumentFragment dom_document_create_document_fragment() /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createDocumentFragment) PHP_METHOD(DOMDocument, createDocumentFragment)
@ -568,8 +566,7 @@ PHP_METHOD(DOMDocument, createDocumentFragment)
} }
/* }}} end dom_document_create_document_fragment */ /* }}} end dom_document_create_document_fragment */
/* {{{ proto DOMText dom_document_create_text_node(string data) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createTextNode) PHP_METHOD(DOMDocument, createTextNode)
@ -598,8 +595,7 @@ PHP_METHOD(DOMDocument, createTextNode)
} }
/* }}} end dom_document_create_text_node */ /* }}} end dom_document_create_text_node */
/* {{{ proto DOMComment dom_document_create_comment(string data) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createComment) PHP_METHOD(DOMDocument, createComment)
@ -628,8 +624,7 @@ PHP_METHOD(DOMDocument, createComment)
} }
/* }}} end dom_document_create_comment */ /* }}} end dom_document_create_comment */
/* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createCDATASection) PHP_METHOD(DOMDocument, createCDATASection)
@ -658,8 +653,7 @@ PHP_METHOD(DOMDocument, createCDATASection)
} }
/* }}} end dom_document_create_cdatasection */ /* }}} end dom_document_create_cdatasection */
/* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createProcessingInstruction) PHP_METHOD(DOMDocument, createProcessingInstruction)
@ -695,8 +689,7 @@ PHP_METHOD(DOMDocument, createProcessingInstruction)
} }
/* }}} end dom_document_create_processing_instruction */ /* }}} end dom_document_create_processing_instruction */
/* {{{ proto DOMAttr dom_document_create_attribute(string name) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createAttribute) PHP_METHOD(DOMDocument, createAttribute)
@ -731,8 +724,7 @@ PHP_METHOD(DOMDocument, createAttribute)
} }
/* }}} end dom_document_create_attribute */ /* }}} end dom_document_create_attribute */
/* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
Since: Since:
*/ */
PHP_METHOD(DOMDocument, createEntityReference) PHP_METHOD(DOMDocument, createEntityReference)
@ -766,8 +758,7 @@ PHP_METHOD(DOMDocument, createEntityReference)
} }
/* }}} end dom_document_create_entity_reference */ /* }}} end dom_document_create_entity_reference */
/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
Since: Since:
*/ */
PHP_METHOD(DOMDocument, getElementsByTagName) PHP_METHOD(DOMDocument, getElementsByTagName)
@ -793,8 +784,7 @@ PHP_METHOD(DOMDocument, getElementsByTagName)
} }
/* }}} end dom_document_get_elements_by_tag_name */ /* }}} end dom_document_get_elements_by_tag_name */
/* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, bool deep) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMDocument, importNode) PHP_METHOD(DOMDocument, importNode)
@ -852,8 +842,7 @@ PHP_METHOD(DOMDocument, importNode)
} }
/* }}} end dom_document_import_node */ /* }}} end dom_document_import_node */
/* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMDocument, createElementNS) PHP_METHOD(DOMDocument, createElementNS)
@ -917,8 +906,7 @@ PHP_METHOD(DOMDocument, createElementNS)
} }
/* }}} end dom_document_create_element_ns */ /* }}} end dom_document_create_element_ns */
/* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMDocument, createAttributeNS) PHP_METHOD(DOMDocument, createAttributeNS)
@ -984,8 +972,7 @@ PHP_METHOD(DOMDocument, createAttributeNS)
} }
/* }}} end dom_document_create_attribute_ns */ /* }}} end dom_document_create_attribute_ns */
/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMDocument, getElementsByTagNameNS) PHP_METHOD(DOMDocument, getElementsByTagNameNS)
@ -1012,8 +999,7 @@ PHP_METHOD(DOMDocument, getElementsByTagNameNS)
} }
/* }}} end dom_document_get_elements_by_tag_name_ns */ /* }}} end dom_document_get_elements_by_tag_name_ns */
/* {{{ proto DOMElement dom_document_get_element_by_id(string elementId) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMDocument, getElementById) PHP_METHOD(DOMDocument, getElementById)
@ -1044,8 +1030,7 @@ PHP_METHOD(DOMDocument, getElementById)
} }
/* }}} end dom_document_get_element_by_id */ /* }}} end dom_document_get_element_by_id */
/* {{{ proto DOMNode dom_document_adopt_node(DOMNode source) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMDocument, adoptNode) PHP_METHOD(DOMDocument, adoptNode)
@ -1060,8 +1045,7 @@ PHP_METHOD(DOMDocument, adoptNode)
} }
/* }}} end dom_document_adopt_node */ /* }}} end dom_document_adopt_node */
/* {{{ proto void dom_document_normalize_document() /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMDocument, normalizeDocument) PHP_METHOD(DOMDocument, normalizeDocument)
@ -1081,7 +1065,7 @@ PHP_METHOD(DOMDocument, normalizeDocument)
} }
/* }}} end dom_document_normalize_document */ /* }}} end dom_document_normalize_document */
/* {{{ proto DOMDocument::__construct([string version], [string encoding]); */ /* {{{ */
PHP_METHOD(DOMDocument, __construct) PHP_METHOD(DOMDocument, __construct)
{ {
xmlDoc *docp = NULL, *olddoc; xmlDoc *docp = NULL, *olddoc;
@ -1366,8 +1350,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
} }
/* }}} end dom_parser_document */ /* }}} end dom_parser_document */
/* {{{ proto DOMNode dom_document_load(string source [, int options]) /* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMDocument, load) PHP_METHOD(DOMDocument, load)
@ -1376,8 +1359,7 @@ PHP_METHOD(DOMDocument, load)
} }
/* }}} end dom_document_load */ /* }}} end dom_document_load */
/* {{{ proto DOMNode dom_document_loadxml(string source [, int options]) /* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMDocument, loadXML) PHP_METHOD(DOMDocument, loadXML)
@ -1386,9 +1368,7 @@ PHP_METHOD(DOMDocument, loadXML)
} }
/* }}} end dom_document_loadxml */ /* }}} end dom_document_loadxml */
/* {{{ proto int dom_document_save(string file) /* {{{ Convenience method to save to file */
Convenience method to save to file
*/
PHP_METHOD(DOMDocument, save) PHP_METHOD(DOMDocument, save)
{ {
zval *id; zval *id;
@ -1431,8 +1411,7 @@ PHP_METHOD(DOMDocument, save)
} }
/* }}} end dom_document_save */ /* }}} end dom_document_save */
/* {{{ proto string dom_document_savexml([node n]) /* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMDocument, saveXML) PHP_METHOD(DOMDocument, saveXML)
@ -1544,8 +1523,7 @@ static void php_dom_remove_xinclude_nodes(xmlNodePtr cur) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto int dom_document_xinclude([int options]) /* {{{ Substitutues xincludes in a DomDocument */
Substitutues xincludes in a DomDocument */
PHP_METHOD(DOMDocument, xinclude) PHP_METHOD(DOMDocument, xinclude)
{ {
zval *id; zval *id;
@ -1590,9 +1568,7 @@ PHP_METHOD(DOMDocument, xinclude)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dom_document_validate() /* {{{ Since: DOM extended */
Since: DOM extended
*/
PHP_METHOD(DOMDocument, validate) PHP_METHOD(DOMDocument, validate)
{ {
zval *id; zval *id;
@ -1714,14 +1690,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
} }
/* }}} */ /* }}} */
/* {{{ proto bool dom_document_schema_validate_file(string filename, int flags); */ /* {{{ */
PHP_METHOD(DOMDocument, schemaValidate) PHP_METHOD(DOMDocument, schemaValidate)
{ {
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
} }
/* }}} end dom_document_schema_validate_file */ /* }}} end dom_document_schema_validate_file */
/* {{{ proto bool dom_document_schema_validate(string source, int flags); */ /* {{{ */
PHP_METHOD(DOMDocument, schemaValidateSource) PHP_METHOD(DOMDocument, schemaValidateSource)
{ {
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
@ -1808,14 +1784,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
} }
/* }}} */ /* }}} */
/* {{{ proto bool dom_document_relaxNG_validate_file(string filename); */ /* {{{ */
PHP_METHOD(DOMDocument, relaxNGValidate) PHP_METHOD(DOMDocument, relaxNGValidate)
{ {
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
} }
/* }}} end dom_document_relaxNG_validate_file */ /* }}} end dom_document_relaxNG_validate_file */
/* {{{ proto bool dom_document_relaxNG_validate_xml(string source); */ /* {{{ */
PHP_METHOD(DOMDocument, relaxNGValidateSource) PHP_METHOD(DOMDocument, relaxNGValidateSource)
{ {
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
@ -1920,27 +1896,21 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto DOMNode dom_document_load_html_file(string source) /* {{{ Since: DOM extended */
Since: DOM extended
*/
PHP_METHOD(DOMDocument, loadHTMLFile) PHP_METHOD(DOMDocument, loadHTMLFile)
{ {
dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
} }
/* }}} end dom_document_load_html_file */ /* }}} end dom_document_load_html_file */
/* {{{ proto DOMNode dom_document_load_html(string source) /* {{{ Since: DOM extended */
Since: DOM extended
*/
PHP_METHOD(DOMDocument, loadHTML) PHP_METHOD(DOMDocument, loadHTML)
{ {
dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); dom_load_html(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
} }
/* }}} end dom_document_load_html */ /* }}} end dom_document_load_html */
/* {{{ proto int dom_document_save_html_file(string file) /* {{{ Convenience method to save to file as html */
Convenience method to save to file as html
*/
PHP_METHOD(DOMDocument, saveHTMLFile) PHP_METHOD(DOMDocument, saveHTMLFile)
{ {
zval *id; zval *id;
@ -1978,9 +1948,7 @@ PHP_METHOD(DOMDocument, saveHTMLFile)
} }
/* }}} end dom_document_save_html_file */ /* }}} end dom_document_save_html_file */
/* {{{ proto string dom_document_save_html() /* {{{ Convenience method to output as html */
Convenience method to output as html
*/
PHP_METHOD(DOMDocument, saveHTML) PHP_METHOD(DOMDocument, saveHTML)
{ {
zval *id, *nodep = NULL; zval *id, *nodep = NULL;
@ -2067,8 +2035,7 @@ PHP_METHOD(DOMDocument, saveHTML)
#endif /* defined(LIBXML_HTML_ENABLED) */ #endif /* defined(LIBXML_HTML_ENABLED) */
/* {{{ proto bool DOMDocument::registerNodeClass(string baseclass, string extendedclass) /* {{{ Register extended class used to create base node type */
Register extended class used to create base node type */
PHP_METHOD(DOMDocument, registerNodeClass) PHP_METHOD(DOMDocument, registerNodeClass)
{ {
zval *id; zval *id;
@ -2091,8 +2058,7 @@ PHP_METHOD(DOMDocument, registerNodeClass)
} }
/* }}} */ /* }}} */
/* {{{ proto void domdocument::append(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append
URL: https://dom.spec.whatwg.org/#dom-parentnode-append
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMDocument, append) PHP_METHOD(DOMDocument, append)
@ -2113,8 +2079,7 @@ PHP_METHOD(DOMDocument, append)
} }
/* }}} */ /* }}} */
/* {{{ proto void domdocument::prepend(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMDocument, prepend) PHP_METHOD(DOMDocument, prepend)

10
ext/dom/documentfragment.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMDocumentFragment::__construct() */ /* {{{ */
PHP_METHOD(DOMDocumentFragment, __construct) PHP_METHOD(DOMDocumentFragment, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;
@ -91,7 +91,7 @@ static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto void DOMDocumentFragment::appendXML(string data) */ /* {{{ */
PHP_METHOD(DOMDocumentFragment, appendXML) { PHP_METHOD(DOMDocumentFragment, appendXML) {
zval *id; zval *id;
xmlNode *nodep; xmlNode *nodep;
@ -130,8 +130,7 @@ PHP_METHOD(DOMDocumentFragment, appendXML) {
} }
/* }}} */ /* }}} */
/* {{{ proto void domdocumentfragment::append(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append
URL: https://dom.spec.whatwg.org/#dom-parentnode-append
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMDocumentFragment, append) PHP_METHOD(DOMDocumentFragment, append)
@ -152,8 +151,7 @@ PHP_METHOD(DOMDocumentFragment, append)
} }
/* }}} */ /* }}} */
/* {{{ proto void domdocumentfragment::prepend(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMDocumentFragment, prepend) PHP_METHOD(DOMDocumentFragment, prepend)

12
ext/dom/domimplementation.c
View file

@ -30,8 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto bool dom_domimplementation_has_feature(string feature, string version); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7
Since: Since:
*/ */
PHP_METHOD(DOMImplementation, hasFeature) PHP_METHOD(DOMImplementation, hasFeature)
@ -51,8 +50,7 @@ PHP_METHOD(DOMImplementation, hasFeature)
} }
/* }}} end dom_domimplementation_has_feature */ /* }}} end dom_domimplementation_has_feature */
/* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMImplementation, createDocumentType) PHP_METHOD(DOMImplementation, createDocumentType)
@ -113,8 +111,7 @@ PHP_METHOD(DOMImplementation, createDocumentType)
} }
/* }}} end dom_domimplementation_create_document_type */ /* }}} end dom_domimplementation_create_document_type */
/* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMImplementation, createDocument) PHP_METHOD(DOMImplementation, createDocument)
@ -218,8 +215,7 @@ PHP_METHOD(DOMImplementation, createDocument)
} }
/* }}} end dom_domimplementation_create_document */ /* }}} end dom_domimplementation_create_document */
/* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMImplementation, getFeature) PHP_METHOD(DOMImplementation, getFeature)

68
ext/dom/element.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMElement::__construct(string name, [string value], [string uri]) */ /* {{{ */
PHP_METHOD(DOMElement, __construct) PHP_METHOD(DOMElement, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;
@ -193,8 +193,7 @@ static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{
} }
/* }}} */ /* }}} */
/* {{{ proto string dom_element_get_attribute(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
Since: Since:
*/ */
PHP_METHOD(DOMElement, getAttribute) PHP_METHOD(DOMElement, getAttribute)
@ -237,8 +236,7 @@ PHP_METHOD(DOMElement, getAttribute)
} }
/* }}} end dom_element_get_attribute */ /* }}} end dom_element_get_attribute */
/* {{{ proto void dom_element_set_attribute(string name, string value); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
Since: Since:
*/ */
PHP_METHOD(DOMElement, setAttribute) PHP_METHOD(DOMElement, setAttribute)
@ -305,8 +303,7 @@ PHP_METHOD(DOMElement, setAttribute)
} }
/* }}} end dom_element_set_attribute */ /* }}} end dom_element_set_attribute */
/* {{{ proto void dom_element_remove_attribute(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
Since: Since:
*/ */
PHP_METHOD(DOMElement, removeAttribute) PHP_METHOD(DOMElement, removeAttribute)
@ -354,8 +351,7 @@ PHP_METHOD(DOMElement, removeAttribute)
} }
/* }}} end dom_element_remove_attribute */ /* }}} end dom_element_remove_attribute */
/* {{{ proto DOMAttr dom_element_get_attribute_node(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
Since: Since:
*/ */
PHP_METHOD(DOMElement, getAttributeNode) PHP_METHOD(DOMElement, getAttributeNode)
@ -402,8 +398,7 @@ PHP_METHOD(DOMElement, getAttributeNode)
} }
/* }}} end dom_element_get_attribute_node */ /* }}} end dom_element_get_attribute_node */
/* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
Since: Since:
*/ */
PHP_METHOD(DOMElement, setAttributeNode) PHP_METHOD(DOMElement, setAttributeNode)
@ -469,8 +464,7 @@ PHP_METHOD(DOMElement, setAttributeNode)
} }
/* }}} end dom_element_set_attribute_node */ /* }}} end dom_element_set_attribute_node */
/* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
Since: Since:
*/ */
PHP_METHOD(DOMElement, removeAttributeNode) PHP_METHOD(DOMElement, removeAttributeNode)
@ -507,8 +501,7 @@ PHP_METHOD(DOMElement, removeAttributeNode)
} }
/* }}} end dom_element_remove_attribute_node */ /* }}} end dom_element_remove_attribute_node */
/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
Since: Since:
*/ */
PHP_METHOD(DOMElement, getElementsByTagName) PHP_METHOD(DOMElement, getElementsByTagName)
@ -534,8 +527,7 @@ PHP_METHOD(DOMElement, getElementsByTagName)
} }
/* }}} end dom_element_get_elements_by_tag_name */ /* }}} end dom_element_get_elements_by_tag_name */
/* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, getAttributeNS) PHP_METHOD(DOMElement, getAttributeNS)
@ -615,8 +607,7 @@ static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /*
} }
/* }}} */ /* }}} */
/* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, setAttributeNS) PHP_METHOD(DOMElement, setAttributeNS)
@ -744,8 +735,7 @@ PHP_METHOD(DOMElement, setAttributeNS)
} }
/* }}} end dom_element_set_attribute_ns */ /* }}} end dom_element_set_attribute_ns */
/* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, removeAttributeNS) PHP_METHOD(DOMElement, removeAttributeNS)
@ -802,8 +792,7 @@ PHP_METHOD(DOMElement, removeAttributeNS)
} }
/* }}} end dom_element_remove_attribute_ns */ /* }}} end dom_element_remove_attribute_ns */
/* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, getAttributeNodeNS) PHP_METHOD(DOMElement, getAttributeNodeNS)
@ -858,8 +847,7 @@ PHP_METHOD(DOMElement, getAttributeNodeNS)
} }
/* }}} end dom_element_get_attribute_node_ns */ /* }}} end dom_element_get_attribute_node_ns */
/* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, setAttributeNodeNS) PHP_METHOD(DOMElement, setAttributeNodeNS)
@ -932,8 +920,7 @@ PHP_METHOD(DOMElement, setAttributeNodeNS)
} }
/* }}} end dom_element_set_attribute_node_ns */ /* }}} end dom_element_set_attribute_node_ns */
/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, getElementsByTagNameNS) PHP_METHOD(DOMElement, getElementsByTagNameNS)
@ -961,8 +948,7 @@ PHP_METHOD(DOMElement, getElementsByTagNameNS)
} }
/* }}} end dom_element_get_elements_by_tag_name_ns */ /* }}} end dom_element_get_elements_by_tag_name_ns */
/* {{{ proto bool dom_element_has_attribute(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, hasAttribute) PHP_METHOD(DOMElement, hasAttribute)
@ -990,8 +976,7 @@ PHP_METHOD(DOMElement, hasAttribute)
} }
/* }}} end dom_element_has_attribute */ /* }}} end dom_element_has_attribute */
/* {{{ proto bool dom_element_has_attribute_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMElement, hasAttributeNS) PHP_METHOD(DOMElement, hasAttributeNS)
@ -1048,8 +1033,7 @@ static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto void dom_element_set_id_attribute(string name, bool isId); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMElement, setIdAttribute) PHP_METHOD(DOMElement, setIdAttribute)
@ -1085,8 +1069,7 @@ PHP_METHOD(DOMElement, setIdAttribute)
} }
/* }}} end dom_element_set_id_attribute */ /* }}} end dom_element_set_id_attribute */
/* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, bool isId); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMElement, setIdAttributeNS) PHP_METHOD(DOMElement, setIdAttributeNS)
@ -1122,8 +1105,7 @@ PHP_METHOD(DOMElement, setIdAttributeNS)
} }
/* }}} end dom_element_set_id_attribute_ns */ /* }}} end dom_element_set_id_attribute_ns */
/* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, bool isId); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMElement, setIdAttributeNode) PHP_METHOD(DOMElement, setIdAttributeNode)
@ -1158,8 +1140,7 @@ PHP_METHOD(DOMElement, setIdAttributeNode)
} }
/* }}} end dom_element_set_id_attribute_node */ /* }}} end dom_element_set_id_attribute_node */
/* {{{ proto void DOMElement::remove(); /* {{{ URL:
URL:
Since: Since:
*/ */
PHP_METHOD(DOMElement, remove) PHP_METHOD(DOMElement, remove)
@ -1213,8 +1194,7 @@ PHP_METHOD(DOMElement, before)
dom_parent_node_before(intern, args, argc); dom_parent_node_before(intern, args, argc);
} }
/* {{{ proto void domelement::append(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-append
URL: https://dom.spec.whatwg.org/#dom-parentnode-append
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMElement, append) PHP_METHOD(DOMElement, append)
@ -1235,8 +1215,7 @@ PHP_METHOD(DOMElement, append)
} }
/* }}} end DOMElement::append */ /* }}} end DOMElement::append */
/* {{{ proto void domelement::prepend(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMElement, prepend) PHP_METHOD(DOMElement, prepend)
@ -1257,8 +1236,7 @@ PHP_METHOD(DOMElement, prepend)
} }
/* }}} end DOMElement::prepend */ /* }}} end DOMElement::prepend */
/* {{{ proto void domelement::replaceWith(string|DOMNode ...$nodes) /* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
Since: DOM Living Standard (DOM4) Since: DOM Living Standard (DOM4)
*/ */
PHP_METHOD(DOMElement, replaceWith) PHP_METHOD(DOMElement, replaceWith)

2
ext/dom/entityreference.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMEntityReference::__construct(string name) */ /* {{{ */
PHP_METHOD(DOMEntityReference, __construct) PHP_METHOD(DOMEntityReference, __construct)
{ {
xmlNode *node; xmlNode *node;

12
ext/dom/namednodemap.c
View file

@ -72,8 +72,7 @@ int dom_namednodemap_length_read(dom_object *obj, zval *retval)
/* }}} */ /* }}} */
/* {{{ proto DOMNode dom_namednodemap_get_named_item(string name); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
Since: Since:
*/ */
PHP_METHOD(DOMNamedNodeMap, getNamedItem) PHP_METHOD(DOMNamedNodeMap, getNamedItem)
@ -128,8 +127,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItem)
} }
/* }}} end dom_namednodemap_get_named_item */ /* }}} end dom_namednodemap_get_named_item */
/* {{{ proto DOMNode dom_namednodemap_item(int index); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
Since: Since:
*/ */
PHP_METHOD(DOMNamedNodeMap, item) PHP_METHOD(DOMNamedNodeMap, item)
@ -192,8 +190,7 @@ PHP_METHOD(DOMNamedNodeMap, item)
} }
/* }}} end dom_namednodemap_item */ /* }}} end dom_namednodemap_item */
/* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMNamedNodeMap, getNamedItemNS) PHP_METHOD(DOMNamedNodeMap, getNamedItemNS)
@ -248,8 +245,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItemNS)
} }
/* }}} end dom_namednodemap_get_named_item_ns */ /* }}} end dom_namednodemap_get_named_item_ns */
/* {{{ proto int|bool dom_namednodemap_count(); /* {{{ */
*/
PHP_METHOD(DOMNamedNodeMap, count) PHP_METHOD(DOMNamedNodeMap, count)
{ {
zval *id; zval *id;

51
ext/dom/node.c
View file

@ -831,8 +831,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib,
} }
/* }}} */ /* }}} */
/* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
Since: Since:
*/ */
PHP_METHOD(DOMNode, insertBefore) PHP_METHOD(DOMNode, insertBefore)
@ -993,8 +992,7 @@ PHP_METHOD(DOMNode, insertBefore)
} }
/* }}} end dom_node_insert_before */ /* }}} end dom_node_insert_before */
/* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307
Since: Since:
*/ */
PHP_METHOD(DOMNode, replaceChild) PHP_METHOD(DOMNode, replaceChild)
@ -1082,8 +1080,7 @@ PHP_METHOD(DOMNode, replaceChild)
} }
/* }}} end dom_node_replace_child */ /* }}} end dom_node_replace_child */
/* {{{ proto DomNode dom_node_remove_child(DomNode oldChild); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066
Since: Since:
*/ */
PHP_METHOD(DOMNode, removeChild) PHP_METHOD(DOMNode, removeChild)
@ -1134,8 +1131,7 @@ PHP_METHOD(DOMNode, removeChild)
} }
/* }}} end dom_node_remove_child */ /* }}} end dom_node_remove_child */
/* {{{ proto DomNode dom_node_append_child(DomNode newChild); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107
Since: Since:
*/ */
PHP_METHOD(DOMNode, appendChild) PHP_METHOD(DOMNode, appendChild)
@ -1236,8 +1232,7 @@ PHP_METHOD(DOMNode, appendChild)
} }
/* }}} end dom_node_append_child */ /* }}} end dom_node_append_child */
/* {{{ proto bool dom_node_has_child_nodes(); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187
Since: Since:
*/ */
PHP_METHOD(DOMNode, hasChildNodes) PHP_METHOD(DOMNode, hasChildNodes)
@ -1265,8 +1260,7 @@ PHP_METHOD(DOMNode, hasChildNodes)
} }
/* }}} end dom_node_has_child_nodes */ /* }}} end dom_node_has_child_nodes */
/* {{{ proto DomNode dom_node_clone_node(bool deep); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4
Since: Since:
*/ */
PHP_METHOD(DOMNode, cloneNode) PHP_METHOD(DOMNode, cloneNode)
@ -1327,8 +1321,7 @@ PHP_METHOD(DOMNode, cloneNode)
} }
/* }}} end dom_node_clone_node */ /* }}} end dom_node_clone_node */
/* {{{ proto void dom_node_normalize(); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize
Since: Since:
*/ */
PHP_METHOD(DOMNode, normalize) PHP_METHOD(DOMNode, normalize)
@ -1349,8 +1342,7 @@ PHP_METHOD(DOMNode, normalize)
} }
/* }}} end dom_node_normalize */ /* }}} end dom_node_normalize */
/* {{{ proto bool dom_node_is_supported(string feature, string version); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMNode, isSupported) PHP_METHOD(DOMNode, isSupported)
@ -1370,8 +1362,7 @@ PHP_METHOD(DOMNode, isSupported)
} }
/* }}} end dom_node_is_supported */ /* }}} end dom_node_is_supported */
/* {{{ proto bool dom_node_has_attributes(); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs
Since: DOM Level 2 Since: DOM Level 2
*/ */
PHP_METHOD(DOMNode, hasAttributes) PHP_METHOD(DOMNode, hasAttributes)
@ -1398,8 +1389,7 @@ PHP_METHOD(DOMNode, hasAttributes)
} }
/* }}} end dom_node_has_attributes */ /* }}} end dom_node_has_attributes */
/* {{{ proto bool dom_node_is_same_node(DomNode other); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMNode, isSameNode) PHP_METHOD(DOMNode, isSameNode)
@ -1425,8 +1415,7 @@ PHP_METHOD(DOMNode, isSameNode)
} }
/* }}} end dom_node_is_same_node */ /* }}} end dom_node_is_same_node */
/* {{{ proto string dom_node_lookup_prefix(string namespaceURI); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMNode, lookupPrefix) PHP_METHOD(DOMNode, lookupPrefix)
@ -1477,8 +1466,7 @@ PHP_METHOD(DOMNode, lookupPrefix)
} }
/* }}} end dom_node_lookup_prefix */ /* }}} end dom_node_lookup_prefix */
/* {{{ proto bool dom_node_is_default_namespace(string namespaceURI); /* {{{ URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace
URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMNode, isDefaultNamespace) PHP_METHOD(DOMNode, isDefaultNamespace)
@ -1511,8 +1499,7 @@ PHP_METHOD(DOMNode, isDefaultNamespace)
} }
/* }}} end dom_node_is_default_namespace */ /* }}} end dom_node_is_default_namespace */
/* {{{ proto string dom_node_lookup_namespace_uri(string prefix); /* {{{ URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI
URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMNode, lookupNamespaceURI) PHP_METHOD(DOMNode, lookupNamespaceURI)
@ -1721,24 +1708,21 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
} }
/* }}} */ /* }}} */
/* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) /* {{{ Canonicalize nodes to a string */
Canonicalize nodes to a string */
PHP_METHOD(DOMNode, C14N) PHP_METHOD(DOMNode, C14N)
{ {
dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) /* {{{ Canonicalize nodes to a file */
Canonicalize nodes to a file */
PHP_METHOD(DOMNode, C14NFile) PHP_METHOD(DOMNode, C14NFile)
{ {
dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto string|null DOMNode::getNodePath() /* {{{ Gets an xpath for a node */
Gets an xpath for a node */
PHP_METHOD(DOMNode, getNodePath) PHP_METHOD(DOMNode, getNodePath)
{ {
zval *id; zval *id;
@ -1762,8 +1746,7 @@ PHP_METHOD(DOMNode, getNodePath)
} }
/* }}} */ /* }}} */
/* {{{ proto int DOMNode::getLineNo() /* {{{ Gets line number for a node */
Gets line number for a node */
PHP_METHOD(DOMNode, getLineNo) PHP_METHOD(DOMNode, getLineNo)
{ {
zval *id; zval *id;

6
ext/dom/nodelist.c
View file

@ -82,8 +82,7 @@ int dom_nodelist_length_read(dom_object *obj, zval *retval)
} }
/* {{{ proto int|bool dom_nodelist_count(); /* {{{ */
*/
PHP_METHOD(DOMNodeList, count) PHP_METHOD(DOMNodeList, count)
{ {
zval *id; zval *id;
@ -103,8 +102,7 @@ PHP_METHOD(DOMNodeList, count)
/* }}} */ /* }}} */
/* {{{ proto DOMNode dom_nodelist_item(int index); /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
Since: Since:
*/ */
PHP_METHOD(DOMNodeList, item) PHP_METHOD(DOMNodeList, item)

3
ext/dom/php_dom.c
View file

@ -448,8 +448,7 @@ void *php_dom_export_node(zval *object) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto somNode dom_import_simplexml(sxeobject node) /* {{{ Get a simplexml_element object from dom to allow for processing */
Get a simplexml_element object from dom to allow for processing */
PHP_FUNCTION(dom_import_simplexml) PHP_FUNCTION(dom_import_simplexml)
{ {
zval *node; zval *node;

2
ext/dom/processinginstruction.c
View file

@ -30,7 +30,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMProcessingInstruction::__construct(string name, [string value]); */ /* {{{ */
PHP_METHOD(DOMProcessingInstruction, __construct) PHP_METHOD(DOMProcessingInstruction, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;

8
ext/dom/text.c
View file

@ -31,7 +31,7 @@
* Since: * Since:
*/ */
/* {{{ proto DOMText::__construct([string value]); */ /* {{{ */
PHP_METHOD(DOMText, __construct) PHP_METHOD(DOMText, __construct)
{ {
xmlNodePtr nodep = NULL, oldnode = NULL; xmlNodePtr nodep = NULL, oldnode = NULL;
@ -101,8 +101,7 @@ int dom_text_whole_text_read(dom_object *obj, zval *retval)
/* }}} */ /* }}} */
/* {{{ proto DOMText dom_text_split_text(int offset) /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D
Since: Since:
*/ */
PHP_METHOD(DOMText, splitText) PHP_METHOD(DOMText, splitText)
@ -163,8 +162,7 @@ PHP_METHOD(DOMText, splitText)
} }
/* }}} end dom_text_split_text */ /* }}} end dom_text_split_text */
/* {{{ proto bool dom_text_is_whitespace_in_element_content() /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent
Since: DOM Level 3 Since: DOM Level 3
*/ */
PHP_METHOD(DOMText, isWhitespaceInElementContent) PHP_METHOD(DOMText, isWhitespaceInElementContent)

10
ext/dom/xpath.c
View file

@ -209,7 +209,7 @@ static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int
} }
/* }}} */ /* }}} */
/* {{{ proto DOMXPath::__construct(DOMDocument doc) U */ /* {{{ */
PHP_METHOD(DOMXPath, __construct) PHP_METHOD(DOMXPath, __construct)
{ {
zval *doc; zval *doc;
@ -290,7 +290,7 @@ int dom_xpath_register_node_ns_write(dom_object *obj, zval *newval)
} }
/* }}} */ /* }}} */
/* {{{ proto bool dom_xpath_register_ns(string prefix, string uri) */ /* {{{ */
PHP_METHOD(DOMXPath, registerNamespace) PHP_METHOD(DOMXPath, registerNamespace)
{ {
zval *id; zval *id;
@ -475,21 +475,21 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context [, bool registerNodeNS]]) */ /* {{{ */
PHP_METHOD(DOMXPath, query) PHP_METHOD(DOMXPath, query)
{ {
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY); php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY);
} }
/* }}} end dom_xpath_query */ /* }}} end dom_xpath_query */
/* {{{ proto mixed dom_xpath_evaluate(string expr [,DOMNode context [, bool registerNodeNS]]) */ /* {{{ */
PHP_METHOD(DOMXPath, evaluate) PHP_METHOD(DOMXPath, evaluate)
{ {
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE); php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE);
} }
/* }}} end dom_xpath_evaluate */ /* }}} end dom_xpath_evaluate */
/* {{{ proto void dom_xpath_register_php_functions() */ /* {{{ */
PHP_METHOD(DOMXPath, registerPhpFunctions) PHP_METHOD(DOMXPath, registerPhpFunctions)
{ {
zval *id = ZEND_THIS; zval *id = ZEND_THIS;

75
ext/enchant/enchant.c
View file

@ -82,8 +82,7 @@ static zend_object *enchant_dict_create_object(zend_class_entry *class_type) {
#define PHP_ENCHANT_MYSPELL 1 #define PHP_ENCHANT_MYSPELL 1
#define PHP_ENCHANT_ISPELL 2 #define PHP_ENCHANT_ISPELL 2
/* {{{ enchant_module_entry /* {{{ enchant_module_entry */
*/
zend_module_entry enchant_module_entry = { zend_module_entry enchant_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"enchant", "enchant",
@ -184,8 +183,7 @@ static void php_enchant_dict_free(zend_object *object) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(enchant) PHP_MINIT_FUNCTION(enchant)
{ {
zend_class_entry bce, dce; zend_class_entry bce, dce;
@ -223,8 +221,7 @@ PHP_MINIT_FUNCTION(enchant)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(enchant) PHP_MSHUTDOWN_FUNCTION(enchant)
{ {
return SUCCESS; return SUCCESS;
@ -240,8 +237,7 @@ static void __enumerate_providers_fn (const char * const name,
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(enchant) PHP_MINFO_FUNCTION(enchant)
{ {
EnchantBroker *pbroker; EnchantBroker *pbroker;
@ -277,8 +273,7 @@ PHP_MINFO_FUNCTION(enchant)
RETURN_THROWS(); \ RETURN_THROWS(); \
} }
/* {{{ proto resource enchant_broker_init() /* {{{ create a new broker object capable of requesting */
create a new broker object capable of requesting */
PHP_FUNCTION(enchant_broker_init) PHP_FUNCTION(enchant_broker_init)
{ {
enchant_broker *broker; enchant_broker *broker;
@ -300,8 +295,7 @@ PHP_FUNCTION(enchant_broker_init)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_broker_free(resource broker) /* {{{ Destroys the broker object and its dictionaries */
Destroys the broker object and its dictionaries */
PHP_FUNCTION(enchant_broker_free) PHP_FUNCTION(enchant_broker_free)
{ {
zval *broker; zval *broker;
@ -324,8 +318,7 @@ PHP_FUNCTION(enchant_broker_free)
} }
/* }}} */ /* }}} */
/* {{{ proto string enchant_broker_get_error(resource broker) /* {{{ Returns the last error of the broker */
Returns the last error of the broker */
PHP_FUNCTION(enchant_broker_get_error) PHP_FUNCTION(enchant_broker_get_error)
{ {
zval *broker; zval *broker;
@ -346,8 +339,7 @@ PHP_FUNCTION(enchant_broker_get_error)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_broker_set_dict_path(resource broker, int dict_type, string value) /* {{{ Set the directory path for a given backend, works with ispell and myspell */
Set the directory path for a given backend, works with ispell and myspell */
PHP_FUNCTION(enchant_broker_set_dict_path) PHP_FUNCTION(enchant_broker_set_dict_path)
{ {
zval *broker; zval *broker;
@ -388,8 +380,7 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
/* }}} */ /* }}} */
/* {{{ proto string enchant_broker_get_dict_path(resource broker, int dict_type) /* {{{ Get the directory path for a given backend, works with ispell and myspell */
Get the directory path for a given backend, works with ispell and myspell */
PHP_FUNCTION(enchant_broker_get_dict_path) PHP_FUNCTION(enchant_broker_get_dict_path)
{ {
zval *broker; zval *broker;
@ -429,8 +420,7 @@ PHP_FUNCTION(enchant_broker_get_dict_path)
} }
/* }}} */ /* }}} */
/* {{{ proto array enchant_broker_list_dicts(resource broker) /* {{{ Lists the dictionaries available for the given broker */
Lists the dictionaries available for the given broker */
PHP_FUNCTION(enchant_broker_list_dicts) PHP_FUNCTION(enchant_broker_list_dicts)
{ {
zval *broker; zval *broker;
@ -447,8 +437,7 @@ PHP_FUNCTION(enchant_broker_list_dicts)
} }
/* }}} */ /* }}} */
/* {{{ proto resource enchant_broker_request_dict(resource broker, string tag) /* {{{ create a new dictionary using tag, the non-empty language tag you wish to request
create a new dictionary using tag, the non-empty language tag you wish to request
a dictionary for ("en_US", "de_DE", ...) */ a dictionary for ("en_US", "de_DE", ...) */
PHP_FUNCTION(enchant_broker_request_dict) PHP_FUNCTION(enchant_broker_request_dict)
{ {
@ -484,8 +473,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
} }
/* }}} */ /* }}} */
/* {{{ proto resource enchant_broker_request_pwl_dict(resource broker, string filename) /* {{{ creates a dictionary using a PWL file. A PWL file is personal word file one word per line. It must exist before the call.*/
creates a dictionary using a PWL file. A PWL file is personal word file one word per line. It must exist before the call.*/
PHP_FUNCTION(enchant_broker_request_pwl_dict) PHP_FUNCTION(enchant_broker_request_pwl_dict)
{ {
zval *broker; zval *broker;
@ -519,8 +507,7 @@ PHP_FUNCTION(enchant_broker_request_pwl_dict)
} }
/* }}} */ /* }}} */
/* {{{ proto resource enchant_broker_free_dict(resource dict) /* {{{ Free the dictionary resource */
Free the dictionary resource */
PHP_FUNCTION(enchant_broker_free_dict) PHP_FUNCTION(enchant_broker_free_dict)
{ {
zval *dict; zval *dict;
@ -547,8 +534,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag) /* {{{ Whether a dictionary exists or not. Using non-empty tag */
Whether a dictionary exists or not. Using non-empty tag */
PHP_FUNCTION(enchant_broker_dict_exists) PHP_FUNCTION(enchant_broker_dict_exists)
{ {
zval *broker; zval *broker;
@ -566,8 +552,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_broker_set_ordering(resource broker, string tag, string ordering) /* {{{ Declares a preference of dictionaries to use for the language
Declares a preference of dictionaries to use for the language
described/referred to by 'tag'. The ordering is a comma delimited described/referred to by 'tag'. The ordering is a comma delimited
list of provider names. As a special exception, the "*" tag can list of provider names. As a special exception, the "*" tag can
be used as a language tag to declare a default ordering for any be used as a language tag to declare a default ordering for any
@ -593,8 +578,7 @@ PHP_FUNCTION(enchant_broker_set_ordering)
} }
/* }}} */ /* }}} */
/* {{{ proto array enchant_broker_describe(resource broker) /* {{{ Enumerates the Enchant providers and tells you some rudimentary information about them. The same info is provided through phpinfo() */
Enumerates the Enchant providers and tells you some rudimentary information about them. The same info is provided through phpinfo() */
PHP_FUNCTION(enchant_broker_describe) PHP_FUNCTION(enchant_broker_describe)
{ {
EnchantBrokerDescribeFn describetozval = enumerate_providers_fn; EnchantBrokerDescribeFn describetozval = enumerate_providers_fn;
@ -612,8 +596,7 @@ PHP_FUNCTION(enchant_broker_describe)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_dict_quick_check(resource dict, string word [, array &suggestions]) /* {{{ If the word is correctly spelled return true, otherwise return false, if suggestions variable
If the word is correctly spelled return true, otherwise return false, if suggestions variable
is provided, fill it with spelling alternatives. */ is provided, fill it with spelling alternatives. */
PHP_FUNCTION(enchant_dict_quick_check) PHP_FUNCTION(enchant_dict_quick_check)
{ {
@ -659,8 +642,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_dict_check(resource dict, string word) /* {{{ If the word is correctly spelled return true, otherwise return false */
If the word is correctly spelled return true, otherwise return false */
PHP_FUNCTION(enchant_dict_check) PHP_FUNCTION(enchant_dict_check)
{ {
zval *dict; zval *dict;
@ -678,8 +660,7 @@ PHP_FUNCTION(enchant_dict_check)
} }
/* }}} */ /* }}} */
/* {{{ proto array enchant_dict_suggest(resource dict, string word) /* {{{ Will return a list of values if any of those pre-conditions are not met.*/
Will return a list of values if any of those pre-conditions are not met.*/
PHP_FUNCTION(enchant_dict_suggest) PHP_FUNCTION(enchant_dict_suggest)
{ {
zval *dict; zval *dict;
@ -709,8 +690,7 @@ PHP_FUNCTION(enchant_dict_suggest)
} }
/* }}} */ /* }}} */
/* {{{ proto void enchant_dict_add(resource dict, string word) /* {{{ add 'word' to personal word list */
add 'word' to personal word list */
PHP_FUNCTION(enchant_dict_add) PHP_FUNCTION(enchant_dict_add)
{ {
zval *dict; zval *dict;
@ -728,8 +708,7 @@ PHP_FUNCTION(enchant_dict_add)
} }
/* }}} */ /* }}} */
/* {{{ proto void enchant_dict_add_to_session(resource dict, string word) /* {{{ add 'word' to this spell-checking session */
add 'word' to this spell-checking session */
PHP_FUNCTION(enchant_dict_add_to_session) PHP_FUNCTION(enchant_dict_add_to_session)
{ {
zval *dict; zval *dict;
@ -747,8 +726,7 @@ PHP_FUNCTION(enchant_dict_add_to_session)
} }
/* }}} */ /* }}} */
/* {{{ proto bool enchant_dict_is_added(resource dict, string word) /* {{{ whether or not 'word' exists in this spelling-session */
whether or not 'word' exists in this spelling-session */
PHP_FUNCTION(enchant_dict_is_added) PHP_FUNCTION(enchant_dict_is_added)
{ {
zval *dict; zval *dict;
@ -766,8 +744,7 @@ PHP_FUNCTION(enchant_dict_is_added)
} }
/* }}} */ /* }}} */
/* {{{ proto void enchant_dict_store_replacement(resource dict, string mis, string cor) /* {{{ add a correction for 'mis' using 'cor'.
add a correction for 'mis' using 'cor'.
Notes that you replaced @mis with @cor, so it's possibly more likely Notes that you replaced @mis with @cor, so it's possibly more likely
that future occurrences of @mis will be replaced with @cor. So it might that future occurrences of @mis will be replaced with @cor. So it might
bump @cor up in the suggestion list.*/ bump @cor up in the suggestion list.*/
@ -789,8 +766,7 @@ PHP_FUNCTION(enchant_dict_store_replacement)
} }
/* }}} */ /* }}} */
/* {{{ proto string enchant_dict_get_error(resource dict) /* {{{ Returns the last error of the current spelling-session */
Returns the last error of the current spelling-session */
PHP_FUNCTION(enchant_dict_get_error) PHP_FUNCTION(enchant_dict_get_error)
{ {
zval *dict; zval *dict;
@ -812,8 +788,7 @@ PHP_FUNCTION(enchant_dict_get_error)
} }
/* }}} */ /* }}} */
/* {{{ proto array enchant_dict_describe(resource dict) /* {{{ Describes an individual dictionary 'dict' */
Describes an individual dictionary 'dict' */
PHP_FUNCTION(enchant_dict_describe) PHP_FUNCTION(enchant_dict_describe)
{ {
zval *dict; zval *dict;

51
ext/exif/exif.c
View file

@ -64,8 +64,7 @@ typedef unsigned char uchar;
#define MAX_IFD_NESTING_LEVEL 150 #define MAX_IFD_NESTING_LEVEL 150
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(exif) PHP_MINFO_FUNCTION(exif)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -103,8 +102,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
ZEND_TSRMLS_CACHE_DEFINE() ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
ZEND_INI_MH(OnUpdateEncode) ZEND_INI_MH(OnUpdateEncode)
{ {
@ -146,8 +144,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(exif) static PHP_GINIT_FUNCTION(exif)
{ {
#if defined(COMPILE_DL_EXIF) && defined(ZTS) #if defined(COMPILE_DL_EXIF) && defined(ZTS)
@ -163,8 +160,7 @@ static PHP_GINIT_FUNCTION(exif)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION(exif) /* {{{ PHP_MINIT_FUNCTION(exif) */
*/
PHP_MINIT_FUNCTION(exif) PHP_MINIT_FUNCTION(exif)
{ {
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -177,8 +173,7 @@ PHP_MINIT_FUNCTION(exif)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(exif) PHP_MSHUTDOWN_FUNCTION(exif)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -198,8 +193,7 @@ static const zend_module_dep exif_module_deps[] = {
}; };
/* }}} */ /* }}} */
/* {{{ exif_module_entry /* {{{ exif_module_entry */
*/
zend_module_entry exif_module_entry = { zend_module_entry exif_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
exif_module_deps, exif_module_deps,
@ -236,8 +230,7 @@ static size_t php_strnlen(char* str, size_t maxlen) {
} }
/* }}} */ /* }}} */
/* {{{ error messages /* {{{ error messages */
*/
static const char * EXIF_ERROR_FILEEOF = "Unexpected end of file reached"; static const char * EXIF_ERROR_FILEEOF = "Unexpected end of file reached";
static const char * EXIF_ERROR_CORRUPT = "File structure corrupted"; static const char * EXIF_ERROR_CORRUPT = "File structure corrupted";
static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of file reached"; static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of file reached";
@ -506,8 +499,7 @@ static char *exif_get_tagformat(int format)
/* }}} */ /* }}} */
/* {{{ TabTable[] /* {{{ TabTable[] */
*/
typedef const struct { typedef const struct {
unsigned short Tag; unsigned short Tag;
char *Desc; char *Desc;
@ -1752,8 +1744,7 @@ static size_t exif_convert_any_to_int(void *value, int format, int motorola_inte
} }
/* }}} */ /* }}} */
/* {{{ struct image_info_value, image_info_list /* {{{ struct image_info_value, image_info_list */
*/
#ifndef WORD #ifndef WORD
#define WORD unsigned short #define WORD unsigned short
#endif #endif
@ -2023,8 +2014,7 @@ static void exif_error_docref(const char *docref EXIFERR_DC, image_info_type *Im
} }
/* }}} */ /* }}} */
/* {{{ jpeg_sof_info /* {{{ jpeg_sof_info */
*/
typedef struct { typedef struct {
int bits_per_sample; int bits_per_sample;
size_t width; size_t width;
@ -2752,8 +2742,7 @@ static char * exif_get_markername(int marker)
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto string exif_tagname(int index) /* {{{ Get headername for index or false if not defined */
Get headername for index or false if not defined */
PHP_FUNCTION(exif_tagname) PHP_FUNCTION(exif_tagname)
{ {
zend_long tag; zend_long tag;
@ -4341,8 +4330,7 @@ static bool exif_discard_imageinfo(image_info_type *ImageInfo)
} }
/* }}} */ /* }}} */
/* {{{ exif_read_from_impl /* {{{ exif_read_from_impl */
*/
static bool exif_read_from_impl(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all) static bool exif_read_from_impl(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all)
{ {
bool ret; bool ret;
@ -4404,8 +4392,7 @@ static bool exif_read_from_impl(image_info_type *ImageInfo, php_stream *stream,
} }
/* }}} */ /* }}} */
/* {{{ exif_read_from_stream /* {{{ exif_read_from_stream */
*/
static bool exif_read_from_stream(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all) static bool exif_read_from_stream(image_info_type *ImageInfo, php_stream *stream, int read_thumbnail, int read_all)
{ {
bool ret; bool ret;
@ -4425,8 +4412,7 @@ static bool exif_read_from_stream(image_info_type *ImageInfo, php_stream *stream
} }
/* }}} */ /* }}} */
/* {{{ exif_read_from_file /* {{{ exif_read_from_file */
*/
static bool exif_read_from_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all) static bool exif_read_from_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all)
{ {
bool ret; bool ret;
@ -4450,8 +4436,7 @@ static bool exif_read_from_file(image_info_type *ImageInfo, char *FileName, int
} }
/* }}} */ /* }}} */
/* {{{ proto array exif_read_data(mixed stream [, string sections_needed [, bool sub_arrays[, bool read_thumbnail]]]) /* {{{ Reads header data from an image and optionally reads the internal thumbnails */
Reads header data from an image and optionally reads the internal thumbnails */
PHP_FUNCTION(exif_read_data) PHP_FUNCTION(exif_read_data)
{ {
zend_string *z_sections_needed = NULL; zend_string *z_sections_needed = NULL;
@ -4654,8 +4639,7 @@ PHP_FUNCTION(exif_read_data)
} }
/* }}} */ /* }}} */
/* {{{ proto string exif_thumbnail(string filename [, &width, &height [, &imagetype]]) /* {{{ Reads the embedded thumbnail */
Reads the embedded thumbnail */
PHP_FUNCTION(exif_thumbnail) PHP_FUNCTION(exif_thumbnail)
{ {
bool ret; bool ret;
@ -4738,8 +4722,7 @@ PHP_FUNCTION(exif_thumbnail)
} }
/* }}} */ /* }}} */
/* {{{ proto int exif_imagetype(string imagefile) /* {{{ Get the type of an image */
Get the type of an image */
PHP_FUNCTION(exif_imagetype) PHP_FUNCTION(exif_imagetype)
{ {
char *imagefile; char *imagefile;

27
ext/ext_skel.php
View file

@ -18,16 +18,14 @@
/* $Id$ */ /* $Id$ */
/* {{{ error /* {{{ error */
*/
function error($message) { function error($message) {
printf('Error: %s%s', $message, PHP_EOL); printf('Error: %s%s', $message, PHP_EOL);
exit; exit;
} }
/* }}} */ /* }}} */
/* {{{ print_help /* {{{ print_help */
*/
function print_help() { function print_help() {
if (PHP_OS_FAMILY != 'Windows') { if (PHP_OS_FAMILY != 'Windows') {
$file_prefix = './'; $file_prefix = './';
@ -118,8 +116,7 @@ HELP;
} }
/* }}} */ /* }}} */
/* {{{ task /* {{{ task */
*/
function task($label, $callback) { function task($label, $callback) {
printf('%s... ', $label); printf('%s... ', $label);
@ -129,8 +126,7 @@ function task($label, $callback) {
} }
/* }}} */ /* }}} */
/* {{{ print_success /* {{{ print_success */
*/
function print_success() { function print_success() {
global $options; global $options;
@ -154,8 +150,7 @@ function print_success() {
} }
/* }}} */ /* }}} */
/* {{{ process_args /* {{{ process_args */
*/
function process_args($argv, $argc) { function process_args($argv, $argc) {
$options = [ $options = [
'unix' => true, 'unix' => true,
@ -237,8 +232,7 @@ function process_args($argv, $argc) {
} }
/* }}} */ /* }}} */
/* {{{ process_source_tags /* {{{ process_source_tags */
*/
function process_source_tags($file, $short_name) { function process_source_tags($file, $short_name) {
global $options; global $options;
@ -294,8 +288,7 @@ HEADER;
} }
/* }}} */ /* }}} */
/* {{{ copy_config_scripts /* {{{ copy_config_scripts */
*/
function copy_config_scripts() { function copy_config_scripts() {
global $options; global $options;
@ -323,8 +316,7 @@ function copy_config_scripts() {
} }
/* }}} */ /* }}} */
/* {{{ copy_sources /* {{{ copy_sources */
*/
function copy_sources() { function copy_sources() {
global $options; global $options;
@ -345,8 +337,7 @@ function copy_sources() {
} }
/* }}} */ /* }}} */
/* {{{ copy_tests /* {{{ copy_tests */
*/
function copy_tests() { function copy_tests() {
global $options; global $options;

18
ext/ffi/ffi.c
View file

@ -4861,8 +4861,7 @@ static int zend_ffi_preload(char *preload) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ ZEND_MINIT_FUNCTION /* {{{ ZEND_MINIT_FUNCTION */
*/
ZEND_MINIT_FUNCTION(ffi) ZEND_MINIT_FUNCTION(ffi)
{ {
zend_class_entry ce; zend_class_entry ce;
@ -5033,8 +5032,7 @@ ZEND_MINIT_FUNCTION(ffi)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_RSHUTDOWN_FUNCTION /* {{{ ZEND_RSHUTDOWN_FUNCTION */
*/
ZEND_RSHUTDOWN_FUNCTION(ffi) ZEND_RSHUTDOWN_FUNCTION(ffi)
{ {
if (FFI_G(callbacks)) { if (FFI_G(callbacks)) {
@ -5054,8 +5052,7 @@ ZEND_RSHUTDOWN_FUNCTION(ffi)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_MINFO_FUNCTION /* {{{ ZEND_MINFO_FUNCTION */
*/
ZEND_MINFO_FUNCTION(ffi) ZEND_MINFO_FUNCTION(ffi)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -5130,8 +5127,7 @@ const struct {
{"__gnuc_va_list", &zend_ffi_type_ptr}, {"__gnuc_va_list", &zend_ffi_type_ptr},
}; };
/* {{{ ZEND_GINIT_FUNCTION /* {{{ ZEND_GINIT_FUNCTION */
*/
static ZEND_GINIT_FUNCTION(ffi) static ZEND_GINIT_FUNCTION(ffi)
{ {
size_t i; size_t i;
@ -5147,8 +5143,7 @@ static ZEND_GINIT_FUNCTION(ffi)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_GINIT_FUNCTION /* {{{ ZEND_GINIT_FUNCTION */
*/
static ZEND_GSHUTDOWN_FUNCTION(ffi) static ZEND_GSHUTDOWN_FUNCTION(ffi)
{ {
if (ffi_globals->scopes) { if (ffi_globals->scopes) {
@ -5159,8 +5154,7 @@ static ZEND_GSHUTDOWN_FUNCTION(ffi)
} }
/* }}} */ /* }}} */
/* {{{ ffi_module_entry /* {{{ ffi_module_entry */
*/
zend_module_entry ffi_module_entry = { zend_module_entry ffi_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"FFI", /* Extension name */ "FFI", /* Extension name */

33
ext/fileinfo/fileinfo.c
View file

@ -76,8 +76,7 @@ static inline finfo_object *php_finfo_fetch_object(zend_object *obj) {
} \ } \
} }
/* {{{ finfo_objects_free /* {{{ finfo_objects_free */
*/
static void finfo_objects_free(zend_object *object) static void finfo_objects_free(zend_object *object)
{ {
finfo_object *intern = php_finfo_fetch_object(object); finfo_object *intern = php_finfo_fetch_object(object);
@ -91,8 +90,7 @@ static void finfo_objects_free(zend_object *object)
} }
/* }}} */ /* }}} */
/* {{{ finfo_objects_new /* {{{ finfo_objects_new */
*/
PHP_FILEINFO_API zend_object *finfo_objects_new(zend_class_entry *class_type) PHP_FILEINFO_API zend_object *finfo_objects_new(zend_class_entry *class_type)
{ {
finfo_object *intern; finfo_object *intern;
@ -129,8 +127,7 @@ void finfo_resource_destructor(zend_resource *rsrc) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(finfo) PHP_MINIT_FUNCTION(finfo)
{ {
zend_class_entry _finfo_class_entry; zend_class_entry _finfo_class_entry;
@ -169,8 +166,7 @@ PHP_MINIT_FUNCTION(finfo)
} }
/* }}} */ /* }}} */
/* {{{ fileinfo_module_entry /* {{{ fileinfo_module_entry */
*/
zend_module_entry fileinfo_module_entry = { zend_module_entry fileinfo_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"fileinfo", "fileinfo",
@ -189,8 +185,7 @@ zend_module_entry fileinfo_module_entry = {
ZEND_GET_MODULE(fileinfo) ZEND_GET_MODULE(fileinfo)
#endif #endif
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(fileinfo) PHP_MINFO_FUNCTION(fileinfo)
{ {
char magic_ver[5]; char magic_ver[5];
@ -205,8 +200,7 @@ PHP_MINFO_FUNCTION(fileinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto resource finfo_open([int options [, string arg]]) /* {{{ Create a new fileinfo resource. */
Create a new fileinfo resource. */
PHP_FUNCTION(finfo_open) PHP_FUNCTION(finfo_open)
{ {
zend_long options = MAGIC_NONE; zend_long options = MAGIC_NONE;
@ -297,8 +291,7 @@ PHP_FUNCTION(finfo_open)
} }
/* }}} */ /* }}} */
/* {{{ proto resource finfo_close(resource finfo) /* {{{ Close fileinfo resource. */
Close fileinfo resource. */
PHP_FUNCTION(finfo_close) PHP_FUNCTION(finfo_close)
{ {
php_fileinfo *finfo; php_fileinfo *finfo;
@ -318,8 +311,7 @@ PHP_FUNCTION(finfo_close)
} }
/* }}} */ /* }}} */
/* {{{ proto bool finfo_set_flags(resource finfo, int options) /* {{{ Set libmagic configuration options. */
Set libmagic configuration options. */
PHP_FUNCTION(finfo_set_flags) PHP_FUNCTION(finfo_set_flags)
{ {
zend_long options; zend_long options;
@ -518,24 +510,21 @@ clean:
} }
/* }}} */ /* }}} */
/* {{{ proto string finfo_file(resource finfo, char *file_name [, int options [, resource context]]) /* {{{ Return information about a file. */
Return information about a file. */
PHP_FUNCTION(finfo_file) PHP_FUNCTION(finfo_file)
{ {
_php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_FILE, 0); _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_FILE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) /* {{{ Return information about a string buffer. */
Return information about a string buffer. */
PHP_FUNCTION(finfo_buffer) PHP_FUNCTION(finfo_buffer)
{ {
_php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_BUFFER, 0); _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_BUFFER, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string mime_content_type(string filename|resource stream) /* {{{ Return content-type for file */
Return content-type for file */
PHP_FUNCTION(mime_content_type) PHP_FUNCTION(mime_content_type)
{ {
_php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1, 1); _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1, 1);

44
ext/filter/filter.c
View file

@ -78,8 +78,7 @@ static const filter_list_entry filter_list[] = {
static unsigned int php_sapi_filter(int arg, const char *var, char **val, size_t val_len, size_t *new_val_len); static unsigned int php_sapi_filter(int arg, const char *var, char **val, size_t val_len, size_t *new_val_len);
static unsigned int php_sapi_filter_init(void); static unsigned int php_sapi_filter_init(void);
/* {{{ filter_module_entry /* {{{ filter_module_entry */
*/
zend_module_entry filter_module_entry = { zend_module_entry filter_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"filter", "filter",
@ -117,8 +116,7 @@ static PHP_INI_MH(UpdateDefaultFilter) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
static PHP_INI_MH(OnUpdateFlags) static PHP_INI_MH(OnUpdateFlags)
{ {
if (!new_value) { if (!new_value) {
@ -154,8 +152,7 @@ ZEND_TSRMLS_CACHE_UPDATE();
#define PARSE_REQUEST 99 #define PARSE_REQUEST 99
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(filter) PHP_MINIT_FUNCTION(filter)
{ {
ZEND_INIT_MODULE_GLOBALS(filter, php_filter_init_globals, NULL); ZEND_INIT_MODULE_GLOBALS(filter, php_filter_init_globals, NULL);
@ -237,8 +234,7 @@ PHP_MINIT_FUNCTION(filter)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(filter) PHP_MSHUTDOWN_FUNCTION(filter)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -247,8 +243,7 @@ PHP_MSHUTDOWN_FUNCTION(filter)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION /* {{{ PHP_RSHUTDOWN_FUNCTION */
*/
#define VAR_ARRAY_COPY_DTOR(a) \ #define VAR_ARRAY_COPY_DTOR(a) \
if (!Z_ISUNDEF(IF_G(a))) { \ if (!Z_ISUNDEF(IF_G(a))) { \
zval_ptr_dtor(&IF_G(a)); \ zval_ptr_dtor(&IF_G(a)); \
@ -269,8 +264,7 @@ PHP_RSHUTDOWN_FUNCTION(filter)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(filter) PHP_MINFO_FUNCTION(filter)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -506,9 +500,7 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto mixed filter_has_var(constant type, string variable_name) /* {{{ Returns true if the variable with the name 'name' exists in source. */
* Returns true if the variable with the name 'name' exists in source.
*/
PHP_FUNCTION(filter_has_var) PHP_FUNCTION(filter_has_var)
{ {
zend_long arg; zend_long arg;
@ -649,9 +641,7 @@ static void php_filter_array_handler(zval *input, zval *op, zval *return_value,
} }
/* }}} */ /* }}} */
/* {{{ proto mixed filter_input(constant type, string variable_name [, int filter [, mixed options]]) /* {{{ Returns the filtered variable 'name'* from source `type`. */
* Returns the filtered variable 'name'* from source `type`.
*/
PHP_FUNCTION(filter_input) PHP_FUNCTION(filter_input)
{ {
zend_long fetch_from, filter = FILTER_DEFAULT; zend_long fetch_from, filter = FILTER_DEFAULT;
@ -705,9 +695,7 @@ PHP_FUNCTION(filter_input)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed filter_var(mixed variable [, int filter [, mixed options]]) /* {{{ Returns the filtered version of the variable. */
* Returns the filtered version of the variable.
*/
PHP_FUNCTION(filter_var) PHP_FUNCTION(filter_var)
{ {
zend_long filter = FILTER_DEFAULT; zend_long filter = FILTER_DEFAULT;
@ -727,9 +715,7 @@ PHP_FUNCTION(filter_var)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed filter_input_array(constant type, [, mixed options [, bool add_empty]]]) /* {{{ Returns an array with all arguments defined in 'definition'. */
* Returns an array with all arguments defined in 'definition'.
*/
PHP_FUNCTION(filter_input_array) PHP_FUNCTION(filter_input_array)
{ {
zend_long fetch_from; zend_long fetch_from;
@ -773,9 +759,7 @@ PHP_FUNCTION(filter_input_array)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed filter_var_array(array data, [, mixed options [, bool add_empty]]]) /* {{{ Returns an array with all arguments defined in 'definition'. */
* Returns an array with all arguments defined in 'definition'.
*/
PHP_FUNCTION(filter_var_array) PHP_FUNCTION(filter_var_array)
{ {
zval *array_input = NULL, *op = NULL; zval *array_input = NULL, *op = NULL;
@ -793,8 +777,7 @@ PHP_FUNCTION(filter_var_array)
} }
/* }}} */ /* }}} */
/* {{{ proto filter_list() /* {{{ Returns a list of all supported filters */
* Returns a list of all supported filters */
PHP_FUNCTION(filter_list) PHP_FUNCTION(filter_list)
{ {
int i, size = sizeof(filter_list) / sizeof(filter_list_entry); int i, size = sizeof(filter_list) / sizeof(filter_list_entry);
@ -810,8 +793,7 @@ PHP_FUNCTION(filter_list)
} }
/* }}} */ /* }}} */
/* {{{ proto filter_id(string filtername) /* {{{ Returns the filter ID belonging to a named filter */
* Returns the filter ID belonging to a named filter */
PHP_FUNCTION(filter_id) PHP_FUNCTION(filter_id)
{ {
int i; int i;

141
ext/ftp/ftp.c
View file

@ -109,8 +109,7 @@ union ipbox {
unsigned char c[8]; unsigned char c[8];
}; };
/* {{{ ftp_open /* {{{ ftp_open */
*/
ftpbuf_t* ftpbuf_t*
ftp_open(const char *host, short port, zend_long timeout_sec) ftp_open(const char *host, short port, zend_long timeout_sec)
{ {
@ -158,8 +157,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_close /* {{{ ftp_close */
*/
ftpbuf_t* ftpbuf_t*
ftp_close(ftpbuf_t *ftp) ftp_close(ftpbuf_t *ftp)
{ {
@ -186,8 +184,7 @@ ftp_close(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_gc /* {{{ ftp_gc */
*/
void void
ftp_gc(ftpbuf_t *ftp) ftp_gc(ftpbuf_t *ftp)
{ {
@ -205,8 +202,7 @@ ftp_gc(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_quit /* {{{ ftp_quit */
*/
int int
ftp_quit(ftpbuf_t *ftp) ftp_quit(ftpbuf_t *ftp)
{ {
@ -230,8 +226,7 @@ ftp_quit(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_login /* {{{ ftp_login */
*/
int int
ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pass, const size_t pass_len) ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pass, const size_t pass_len)
{ {
@ -379,8 +374,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa
} }
/* }}} */ /* }}} */
/* {{{ ftp_reinit /* {{{ ftp_reinit */
*/
int int
ftp_reinit(ftpbuf_t *ftp) ftp_reinit(ftpbuf_t *ftp)
{ {
@ -403,8 +397,7 @@ ftp_reinit(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_syst /* {{{ ftp_syst */
*/
const char* const char*
ftp_syst(ftpbuf_t *ftp) ftp_syst(ftpbuf_t *ftp)
{ {
@ -439,8 +432,7 @@ ftp_syst(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_pwd /* {{{ ftp_pwd */
*/
const char* const char*
ftp_pwd(ftpbuf_t *ftp) ftp_pwd(ftpbuf_t *ftp)
{ {
@ -473,8 +465,7 @@ ftp_pwd(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_exec /* {{{ ftp_exec */
*/
int int
ftp_exec(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) ftp_exec(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
{ {
@ -492,8 +483,7 @@ ftp_exec(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_raw /* {{{ ftp_raw */
*/
void void
ftp_raw(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, zval *return_value) ftp_raw(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, zval *return_value)
{ {
@ -513,8 +503,7 @@ ftp_raw(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, zval *return_value
} }
/* }}} */ /* }}} */
/* {{{ ftp_chdir /* {{{ ftp_chdir */
*/
int int
ftp_chdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) ftp_chdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
{ {
@ -537,8 +526,7 @@ ftp_chdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_cdup /* {{{ ftp_cdup */
*/
int int
ftp_cdup(ftpbuf_t *ftp) ftp_cdup(ftpbuf_t *ftp)
{ {
@ -561,8 +549,7 @@ ftp_cdup(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_mkdir /* {{{ ftp_mkdir */
*/
zend_string* zend_string*
ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
{ {
@ -593,8 +580,7 @@ ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_rmdir /* {{{ ftp_rmdir */
*/
int int
ftp_rmdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len) ftp_rmdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
{ {
@ -611,8 +597,7 @@ ftp_rmdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_chmod /* {{{ ftp_chmod */
*/
int int
ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len) ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len)
{ {
@ -644,8 +629,7 @@ ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filenam
} }
/* }}} */ /* }}} */
/* {{{ ftp_alloc /* {{{ ftp_alloc */
*/
int int
ftp_alloc(ftpbuf_t *ftp, const zend_long size, zend_string **response) ftp_alloc(ftpbuf_t *ftp, const zend_long size, zend_string **response)
{ {
@ -682,8 +666,7 @@ ftp_alloc(ftpbuf_t *ftp, const zend_long size, zend_string **response)
} }
/* }}} */ /* }}} */
/* {{{ ftp_nlist /* {{{ ftp_nlist */
*/
char** char**
ftp_nlist(ftpbuf_t *ftp, const char *path, const size_t path_len) ftp_nlist(ftpbuf_t *ftp, const char *path, const size_t path_len)
{ {
@ -691,8 +674,7 @@ ftp_nlist(ftpbuf_t *ftp, const char *path, const size_t path_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_list /* {{{ ftp_list */
*/
char** char**
ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive) ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive)
{ {
@ -700,8 +682,7 @@ ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive)
} }
/* }}} */ /* }}} */
/* {{{ ftp_mlsd /* {{{ ftp_mlsd */
*/
char** char**
ftp_mlsd(ftpbuf_t *ftp, const char *path, const size_t path_len) ftp_mlsd(ftpbuf_t *ftp, const char *path, const size_t path_len)
{ {
@ -709,8 +690,7 @@ ftp_mlsd(ftpbuf_t *ftp, const char *path, const size_t path_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_mlsd_parse_line /* {{{ ftp_mlsd_parse_line */
*/
int int
ftp_mlsd_parse_line(HashTable *ht, const char *input) { ftp_mlsd_parse_line(HashTable *ht, const char *input) {
@ -754,8 +734,7 @@ ftp_mlsd_parse_line(HashTable *ht, const char *input) {
} }
/* }}} */ /* }}} */
/* {{{ ftp_type /* {{{ ftp_type */
*/
int int
ftp_type(ftpbuf_t *ftp, ftptype_t type) ftp_type(ftpbuf_t *ftp, ftptype_t type)
{ {
@ -786,8 +765,7 @@ ftp_type(ftpbuf_t *ftp, ftptype_t type)
} }
/* }}} */ /* }}} */
/* {{{ ftp_pasv /* {{{ ftp_pasv */
*/
int int
ftp_pasv(ftpbuf_t *ftp, int pasv) ftp_pasv(ftpbuf_t *ftp, int pasv)
{ {
@ -880,8 +858,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv)
} }
/* }}} */ /* }}} */
/* {{{ ftp_get /* {{{ ftp_get */
*/
int int
ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos) ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos)
{ {
@ -976,8 +953,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_put /* {{{ ftp_put */
*/
int int
ftp_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos) ftp_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos)
{ {
@ -1059,8 +1035,7 @@ bail:
/* }}} */ /* }}} */
/* {{{ ftp_append /* {{{ ftp_append */
*/
int int
ftp_append(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type) ftp_append(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type)
{ {
@ -1126,8 +1101,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_size /* {{{ ftp_size */
*/
zend_long zend_long
ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len) ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
{ {
@ -1150,8 +1124,7 @@ ftp_size(ftpbuf_t *ftp, const char *path, const size_t path_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_mdtm /* {{{ ftp_mdtm */
*/
time_t time_t
ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len) ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len)
{ {
@ -1198,8 +1171,7 @@ ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_delete /* {{{ ftp_delete */
*/
int int
ftp_delete(ftpbuf_t *ftp, const char *path, const size_t path_len) ftp_delete(ftpbuf_t *ftp, const char *path, const size_t path_len)
{ {
@ -1217,8 +1189,7 @@ ftp_delete(ftpbuf_t *ftp, const char *path, const size_t path_len)
} }
/* }}} */ /* }}} */
/* {{{ ftp_rename /* {{{ ftp_rename */
*/
int int
ftp_rename(ftpbuf_t *ftp, const char *src, const size_t src_len, const char *dest, const size_t dest_len) ftp_rename(ftpbuf_t *ftp, const char *src, const size_t src_len, const char *dest, const size_t dest_len)
{ {
@ -1241,8 +1212,7 @@ ftp_rename(ftpbuf_t *ftp, const char *src, const size_t src_len, const char *des
} }
/* }}} */ /* }}} */
/* {{{ ftp_site /* {{{ ftp_site */
*/
int int
ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len) ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
{ {
@ -1262,8 +1232,7 @@ ftp_site(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len)
/* static functions */ /* static functions */
/* {{{ ftp_putcmd /* {{{ ftp_putcmd */
*/
int int
ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *args, const size_t args_len) ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *args, const size_t args_len)
{ {
@ -1303,8 +1272,7 @@ ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *arg
} }
/* }}} */ /* }}} */
/* {{{ ftp_readline /* {{{ ftp_readline */
*/
int int
ftp_readline(ftpbuf_t *ftp) ftp_readline(ftpbuf_t *ftp)
{ {
@ -1355,8 +1323,7 @@ ftp_readline(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
/* {{{ ftp_getresp /* {{{ ftp_getresp */
*/
int int
ftp_getresp(ftpbuf_t *ftp) ftp_getresp(ftpbuf_t *ftp)
{ {
@ -1451,8 +1418,7 @@ int single_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t size) {
#endif #endif
} }
/* {{{ my_send /* {{{ my_send */
*/
int int
my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
{ {
@ -1489,8 +1455,7 @@ my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
} }
/* }}} */ /* }}} */
/* {{{ my_recv /* {{{ my_recv */
*/
int int
my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
{ {
@ -1570,8 +1535,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
} }
/* }}} */ /* }}} */
/* {{{ data_available /* {{{ data_available */
*/
int int
data_available(ftpbuf_t *ftp, php_socket_t s) data_available(ftpbuf_t *ftp, php_socket_t s)
{ {
@ -1594,8 +1558,7 @@ data_available(ftpbuf_t *ftp, php_socket_t s)
return 1; return 1;
} }
/* }}} */ /* }}} */
/* {{{ data_writeable /* {{{ data_writeable */
*/
int int
data_writeable(ftpbuf_t *ftp, php_socket_t s) data_writeable(ftpbuf_t *ftp, php_socket_t s)
{ {
@ -1619,8 +1582,7 @@ data_writeable(ftpbuf_t *ftp, php_socket_t s)
} }
/* }}} */ /* }}} */
/* {{{ my_accept /* {{{ my_accept */
*/
int int
my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrlen) my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrlen)
{ {
@ -1644,8 +1606,7 @@ my_accept(ftpbuf_t *ftp, php_socket_t s, struct sockaddr *addr, socklen_t *addrl
} }
/* }}} */ /* }}} */
/* {{{ ftp_getdata /* {{{ ftp_getdata */
*/
databuf_t* databuf_t*
ftp_getdata(ftpbuf_t *ftp) ftp_getdata(ftpbuf_t *ftp)
{ {
@ -1775,8 +1736,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ data_accept /* {{{ data_accept */
*/
databuf_t* databuf_t*
data_accept(databuf_t *data, ftpbuf_t *ftp) data_accept(databuf_t *data, ftpbuf_t *ftp)
{ {
@ -1888,8 +1848,7 @@ data_accepted:
} }
/* }}} */ /* }}} */
/* {{{ ftp_ssl_shutdown /* {{{ ftp_ssl_shutdown */
*/
#ifdef HAVE_FTP_SSL #ifdef HAVE_FTP_SSL
static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) { static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
/* In TLS 1.3 it's common to receive session tickets after the handshake has completed. We need to train /* In TLS 1.3 it's common to receive session tickets after the handshake has completed. We need to train
@ -1946,8 +1905,7 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
#endif #endif
/* }}} */ /* }}} */
/* {{{ data_close /* {{{ data_close */
*/
databuf_t* databuf_t*
data_close(ftpbuf_t *ftp, databuf_t *data) data_close(ftpbuf_t *ftp, databuf_t *data)
{ {
@ -1982,8 +1940,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data)
} }
/* }}} */ /* }}} */
/* {{{ ftp_genlist /* {{{ ftp_genlist */
*/
char** char**
ftp_genlist(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *path, const size_t path_len) ftp_genlist(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *path, const size_t path_len)
{ {
@ -2087,8 +2044,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_nb_get /* {{{ ftp_nb_get */
*/
int int
ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos) ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, const size_t path_len, ftptype_t type, zend_long resumepos)
{ {
@ -2145,8 +2101,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_nb_continue_read /* {{{ ftp_nb_continue_read */
*/
int int
ftp_nb_continue_read(ftpbuf_t *ftp) ftp_nb_continue_read(ftpbuf_t *ftp)
{ {
@ -2208,8 +2163,7 @@ bail:
} }
/* }}} */ /* }}} */
/* {{{ ftp_nb_put /* {{{ ftp_nb_put */
*/
int int
ftp_nb_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos) ftp_nb_put(ftpbuf_t *ftp, const char *path, const size_t path_len, php_stream *instream, ftptype_t type, zend_long startpos)
{ {
@ -2262,8 +2216,7 @@ bail:
/* }}} */ /* }}} */
/* {{{ ftp_nb_continue_write /* {{{ ftp_nb_continue_write */
*/
int int
ftp_nb_continue_write(ftpbuf_t *ftp) ftp_nb_continue_write(ftpbuf_t *ftp)
{ {

105
ext/ftp/php_ftp.c
View file

@ -112,8 +112,7 @@ PHP_MINFO_FUNCTION(ftp)
} }
/* {{{ proto resource ftp_connect(string host [, int port [, int timeout]]) /* {{{ Opens a FTP stream */
Opens a FTP stream */
PHP_FUNCTION(ftp_connect) PHP_FUNCTION(ftp_connect)
{ {
ftpbuf_t *ftp; ftpbuf_t *ftp;
@ -149,8 +148,7 @@ PHP_FUNCTION(ftp_connect)
/* }}} */ /* }}} */
#ifdef HAVE_FTP_SSL #ifdef HAVE_FTP_SSL
/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout]]) /* {{{ Opens a FTP-SSL stream */
Opens a FTP-SSL stream */
PHP_FUNCTION(ftp_ssl_connect) PHP_FUNCTION(ftp_ssl_connect)
{ {
ftpbuf_t *ftp; ftpbuf_t *ftp;
@ -184,8 +182,7 @@ PHP_FUNCTION(ftp_ssl_connect)
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto bool ftp_login(resource stream, string username, string password) /* {{{ Logs into the FTP server */
Logs into the FTP server */
PHP_FUNCTION(ftp_login) PHP_FUNCTION(ftp_login)
{ {
zval *z_ftp; zval *z_ftp;
@ -211,8 +208,7 @@ PHP_FUNCTION(ftp_login)
} }
/* }}} */ /* }}} */
/* {{{ proto string ftp_pwd(resource stream) /* {{{ Returns the present working directory */
Returns the present working directory */
PHP_FUNCTION(ftp_pwd) PHP_FUNCTION(ftp_pwd)
{ {
zval *z_ftp; zval *z_ftp;
@ -236,8 +232,7 @@ PHP_FUNCTION(ftp_pwd)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_cdup(resource stream) /* {{{ Changes to the parent directory */
Changes to the parent directory */
PHP_FUNCTION(ftp_cdup) PHP_FUNCTION(ftp_cdup)
{ {
zval *z_ftp; zval *z_ftp;
@ -260,8 +255,7 @@ PHP_FUNCTION(ftp_cdup)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_chdir(resource stream, string directory) /* {{{ Changes directories */
Changes directories */
PHP_FUNCTION(ftp_chdir) PHP_FUNCTION(ftp_chdir)
{ {
zval *z_ftp; zval *z_ftp;
@ -287,8 +281,7 @@ PHP_FUNCTION(ftp_chdir)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_exec(resource stream, string command) /* {{{ Requests execution of a program on the FTP server */
Requests execution of a program on the FTP server */
PHP_FUNCTION(ftp_exec) PHP_FUNCTION(ftp_exec)
{ {
zval *z_ftp; zval *z_ftp;
@ -314,8 +307,7 @@ PHP_FUNCTION(ftp_exec)
} }
/* }}} */ /* }}} */
/* {{{ proto array ftp_raw(resource stream, string command) /* {{{ Sends a literal command to the FTP server */
Sends a literal command to the FTP server */
PHP_FUNCTION(ftp_raw) PHP_FUNCTION(ftp_raw)
{ {
zval *z_ftp; zval *z_ftp;
@ -336,8 +328,7 @@ PHP_FUNCTION(ftp_raw)
} }
/* }}} */ /* }}} */
/* {{{ proto string ftp_mkdir(resource stream, string directory) /* {{{ Creates a directory and returns the absolute path for the new directory or false on error */
Creates a directory and returns the absolute path for the new directory or false on error */
PHP_FUNCTION(ftp_mkdir) PHP_FUNCTION(ftp_mkdir)
{ {
zval *z_ftp; zval *z_ftp;
@ -364,8 +355,7 @@ PHP_FUNCTION(ftp_mkdir)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_rmdir(resource stream, string directory) /* {{{ Removes a directory */
Removes a directory */
PHP_FUNCTION(ftp_rmdir) PHP_FUNCTION(ftp_rmdir)
{ {
zval *z_ftp; zval *z_ftp;
@ -391,8 +381,7 @@ PHP_FUNCTION(ftp_rmdir)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_chmod(resource stream, int mode, string filename) /* {{{ Sets permissions on a file */
Sets permissions on a file */
PHP_FUNCTION(ftp_chmod) PHP_FUNCTION(ftp_chmod)
{ {
zval *z_ftp; zval *z_ftp;
@ -418,8 +407,7 @@ PHP_FUNCTION(ftp_chmod)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_alloc(resource stream, int size[, &response]) /* {{{ Attempt to allocate space on the remote FTP server */
Attempt to allocate space on the remote FTP server */
PHP_FUNCTION(ftp_alloc) PHP_FUNCTION(ftp_alloc)
{ {
zval *z_ftp, *zresponse = NULL; zval *z_ftp, *zresponse = NULL;
@ -449,8 +437,7 @@ PHP_FUNCTION(ftp_alloc)
} }
/* }}} */ /* }}} */
/* {{{ proto array ftp_nlist(resource stream, string directory) /* {{{ Returns an array of filenames in the given directory */
Returns an array of filenames in the given directory */
PHP_FUNCTION(ftp_nlist) PHP_FUNCTION(ftp_nlist)
{ {
zval *z_ftp; zval *z_ftp;
@ -479,8 +466,7 @@ PHP_FUNCTION(ftp_nlist)
} }
/* }}} */ /* }}} */
/* {{{ proto array ftp_rawlist(resource stream, string directory [, bool recursive]) /* {{{ Returns a detailed listing of a directory as an array of output lines */
Returns a detailed listing of a directory as an array of output lines */
PHP_FUNCTION(ftp_rawlist) PHP_FUNCTION(ftp_rawlist)
{ {
zval *z_ftp; zval *z_ftp;
@ -510,8 +496,7 @@ PHP_FUNCTION(ftp_rawlist)
} }
/* }}} */ /* }}} */
/* {{{ proto array ftp_mlsd(resource stream, string directory) /* {{{ Returns a detailed listing of a directory as an array of parsed output lines */
Returns a detailed listing of a directory as an array of parsed output lines */
PHP_FUNCTION(ftp_mlsd) PHP_FUNCTION(ftp_mlsd)
{ {
zval *z_ftp; zval *z_ftp;
@ -547,8 +532,7 @@ PHP_FUNCTION(ftp_mlsd)
} }
/* }}} */ /* }}} */
/* {{{ proto string ftp_systype(resource stream) /* {{{ Returns the system type identifier */
Returns the system type identifier */
PHP_FUNCTION(ftp_systype) PHP_FUNCTION(ftp_systype)
{ {
zval *z_ftp; zval *z_ftp;
@ -572,8 +556,7 @@ PHP_FUNCTION(ftp_systype)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_fget(resource stream, resource fp, string remote_file, [, int mode [, int resumepos]]) /* {{{ Retrieves a file from the FTP server and writes it to an open file */
Retrieves a file from the FTP server and writes it to an open file */
PHP_FUNCTION(ftp_fget) PHP_FUNCTION(ftp_fget)
{ {
zval *z_ftp, *z_file; zval *z_ftp, *z_file;
@ -618,8 +601,7 @@ PHP_FUNCTION(ftp_fget)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_fget(resource stream, resource fp, string remote_file [, int mode [, int resumepos]]) /* {{{ Retrieves a file from the FTP server asynchronly and writes it to an open file */
Retrieves a file from the FTP server asynchronly and writes it to an open file */
PHP_FUNCTION(ftp_nb_fget) PHP_FUNCTION(ftp_nb_fget)
{ {
zval *z_ftp, *z_file; zval *z_ftp, *z_file;
@ -668,8 +650,7 @@ PHP_FUNCTION(ftp_nb_fget)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_pasv(resource stream, bool pasv) /* {{{ Turns passive mode on or off */
Turns passive mode on or off */
PHP_FUNCTION(ftp_pasv) PHP_FUNCTION(ftp_pasv)
{ {
zval *z_ftp; zval *z_ftp;
@ -692,8 +673,7 @@ PHP_FUNCTION(ftp_pasv)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_get(resource stream, string local_file, string remote_file [, int mode [, int resume_pos]]) /* {{{ Retrieves a file from the FTP server and writes it to a local file */
Retrieves a file from the FTP server and writes it to a local file */
PHP_FUNCTION(ftp_get) PHP_FUNCTION(ftp_get)
{ {
zval *z_ftp; zval *z_ftp;
@ -757,8 +737,7 @@ PHP_FUNCTION(ftp_get)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_get(resource stream, string local_file, string remote_file, [, int mode [, int resume_pos]]) /* {{{ Retrieves a file from the FTP server nbhronly and writes it to a local file */
Retrieves a file from the FTP server nbhronly and writes it to a local file */
PHP_FUNCTION(ftp_nb_get) PHP_FUNCTION(ftp_nb_get)
{ {
zval *z_ftp; zval *z_ftp;
@ -830,8 +809,7 @@ PHP_FUNCTION(ftp_nb_get)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_continue(resource stream) /* {{{ Continues retrieving/sending a file nbronously */
Continues retrieving/sending a file nbronously */
PHP_FUNCTION(ftp_nb_continue) PHP_FUNCTION(ftp_nb_continue)
{ {
zval *z_ftp; zval *z_ftp;
@ -870,8 +848,7 @@ PHP_FUNCTION(ftp_nb_continue)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]]) /* {{{ Stores a file from an open file to the FTP server */
Stores a file from an open file to the FTP server */
PHP_FUNCTION(ftp_fput) PHP_FUNCTION(ftp_fput)
{ {
zval *z_ftp, *z_file; zval *z_ftp, *z_file;
@ -919,8 +896,7 @@ PHP_FUNCTION(ftp_fput)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]]) /* {{{ Stores a file from an open file to the FTP server nbronly */
Stores a file from an open file to the FTP server nbronly */
PHP_FUNCTION(ftp_nb_fput) PHP_FUNCTION(ftp_nb_fput)
{ {
zval *z_ftp, *z_file; zval *z_ftp, *z_file;
@ -974,8 +950,7 @@ PHP_FUNCTION(ftp_nb_fput)
/* }}} */ /* }}} */
/* {{{ proto bool ftp_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]]) /* {{{ Stores a file on the FTP server */
Stores a file on the FTP server */
PHP_FUNCTION(ftp_put) PHP_FUNCTION(ftp_put)
{ {
zval *z_ftp; zval *z_ftp;
@ -1028,8 +1003,7 @@ PHP_FUNCTION(ftp_put)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_append(resource stream, string remote_file, string local_file [, int mode]) /* {{{ Append content of a file a another file on the FTP server */
Append content of a file a another file on the FTP server */
PHP_FUNCTION(ftp_append) PHP_FUNCTION(ftp_append)
{ {
zval *z_ftp; zval *z_ftp;
@ -1064,8 +1038,7 @@ PHP_FUNCTION(ftp_append)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]]) /* {{{ Stores a file on the FTP server */
Stores a file on the FTP server */
PHP_FUNCTION(ftp_nb_put) PHP_FUNCTION(ftp_nb_put)
{ {
zval *z_ftp; zval *z_ftp;
@ -1126,8 +1099,7 @@ PHP_FUNCTION(ftp_nb_put)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_size(resource stream, string filename) /* {{{ Returns the size of the file, or -1 on error */
Returns the size of the file, or -1 on error */
PHP_FUNCTION(ftp_size) PHP_FUNCTION(ftp_size)
{ {
zval *z_ftp; zval *z_ftp;
@ -1148,8 +1120,7 @@ PHP_FUNCTION(ftp_size)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_mdtm(resource stream, string filename) /* {{{ Returns the last modification time of the file, or -1 on error */
Returns the last modification time of the file, or -1 on error */
PHP_FUNCTION(ftp_mdtm) PHP_FUNCTION(ftp_mdtm)
{ {
zval *z_ftp; zval *z_ftp;
@ -1170,8 +1141,7 @@ PHP_FUNCTION(ftp_mdtm)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_rename(resource stream, string src, string dest) /* {{{ Renames the given file to a new path */
Renames the given file to a new path */
PHP_FUNCTION(ftp_rename) PHP_FUNCTION(ftp_rename)
{ {
zval *z_ftp; zval *z_ftp;
@ -1197,8 +1167,7 @@ PHP_FUNCTION(ftp_rename)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_delete(resource stream, string file) /* {{{ Deletes a file */
Deletes a file */
PHP_FUNCTION(ftp_delete) PHP_FUNCTION(ftp_delete)
{ {
zval *z_ftp; zval *z_ftp;
@ -1224,8 +1193,7 @@ PHP_FUNCTION(ftp_delete)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_site(resource stream, string cmd) /* {{{ Sends a SITE command to the server */
Sends a SITE command to the server */
PHP_FUNCTION(ftp_site) PHP_FUNCTION(ftp_site)
{ {
zval *z_ftp; zval *z_ftp;
@ -1251,8 +1219,7 @@ PHP_FUNCTION(ftp_site)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_close(resource stream) /* {{{ Closes the FTP stream */
Closes the FTP stream */
PHP_FUNCTION(ftp_close) PHP_FUNCTION(ftp_close)
{ {
zval *z_ftp; zval *z_ftp;
@ -1272,8 +1239,7 @@ PHP_FUNCTION(ftp_close)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_set_option(resource stream, int option, mixed value) /* {{{ Sets an FTP option */
Sets an FTP option */
PHP_FUNCTION(ftp_set_option) PHP_FUNCTION(ftp_set_option)
{ {
zval *z_ftp, *z_value; zval *z_ftp, *z_value;
@ -1328,8 +1294,7 @@ PHP_FUNCTION(ftp_set_option)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed ftp_get_option(resource stream, int option) /* {{{ Gets an FTP option */
Gets an FTP option */
PHP_FUNCTION(ftp_get_option) PHP_FUNCTION(ftp_get_option)
{ {
zval *z_ftp; zval *z_ftp;

357
ext/gd/gd.c
View file

File diff suppressed because it is too large Load diff

27
ext/gettext/gettext.c
View file

@ -68,8 +68,7 @@ PHP_MINFO_FUNCTION(php_gettext)
php_info_print_table_end(); php_info_print_table_end();
} }
/* {{{ proto string textdomain(string domain) /* {{{ Set the textdomain to "domain". Returns the current domain */
Set the textdomain to "domain". Returns the current domain */
PHP_FUNCTION(textdomain) PHP_FUNCTION(textdomain)
{ {
char *domain = NULL, *domain_name, *retval; char *domain = NULL, *domain_name, *retval;
@ -93,8 +92,7 @@ PHP_FUNCTION(textdomain)
} }
/* }}} */ /* }}} */
/* {{{ proto string gettext(string msgid) /* {{{ Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */
Return the translation of msgid for the current domain, or msgid unaltered if a translation does not exist */
PHP_FUNCTION(gettext) PHP_FUNCTION(gettext)
{ {
char *msgstr; char *msgstr;
@ -115,8 +113,7 @@ PHP_FUNCTION(gettext)
} }
/* }}} */ /* }}} */
/* {{{ proto string dgettext(string domain_name, string msgid) /* {{{ Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist */
Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist */
PHP_FUNCTION(dgettext) PHP_FUNCTION(dgettext)
{ {
char *msgstr; char *msgstr;
@ -139,8 +136,7 @@ PHP_FUNCTION(dgettext)
} }
/* }}} */ /* }}} */
/* {{{ proto string dcgettext(string domain_name, string msgid, int category) /* {{{ Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist */
Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist */
PHP_FUNCTION(dcgettext) PHP_FUNCTION(dcgettext)
{ {
char *msgstr; char *msgstr;
@ -164,8 +160,7 @@ PHP_FUNCTION(dcgettext)
} }
/* }}} */ /* }}} */
/* {{{ proto string bindtextdomain(string domain_name, string dir) /* {{{ Bind to the text domain domain_name, looking for translations in dir. Returns the current domain */
Bind to the text domain domain_name, looking for translations in dir. Returns the current domain */
PHP_FUNCTION(bindtextdomain) PHP_FUNCTION(bindtextdomain)
{ {
char *domain, *dir; char *domain, *dir;
@ -198,8 +193,7 @@ PHP_FUNCTION(bindtextdomain)
/* }}} */ /* }}} */
#ifdef HAVE_NGETTEXT #ifdef HAVE_NGETTEXT
/* {{{ proto string ngettext(string MSGID1, string MSGID2, int N) /* {{{ Plural version of gettext() */
Plural version of gettext() */
PHP_FUNCTION(ngettext) PHP_FUNCTION(ngettext)
{ {
char *msgid1, *msgid2, *msgstr; char *msgid1, *msgid2, *msgstr;
@ -222,8 +216,7 @@ PHP_FUNCTION(ngettext)
#endif #endif
#ifdef HAVE_DNGETTEXT #ifdef HAVE_DNGETTEXT
/* {{{ proto string dngettext(string domain, string msgid1, string msgid2, int count) /* {{{ Plural version of dgettext() */
Plural version of dgettext() */
PHP_FUNCTION(dngettext) PHP_FUNCTION(dngettext)
{ {
char *domain, *msgid1, *msgid2, *msgstr = NULL; char *domain, *msgid1, *msgid2, *msgstr = NULL;
@ -248,8 +241,7 @@ PHP_FUNCTION(dngettext)
#endif #endif
#ifdef HAVE_DCNGETTEXT #ifdef HAVE_DCNGETTEXT
/* {{{ proto string dcngettext(string domain, string msgid1, string msgid2, int n, int category) /* {{{ Plural version of dcgettext() */
Plural version of dcgettext() */
PHP_FUNCTION(dcngettext) PHP_FUNCTION(dcngettext)
{ {
char *domain, *msgid1, *msgid2, *msgstr = NULL; char *domain, *msgid1, *msgid2, *msgstr = NULL;
@ -277,8 +269,7 @@ PHP_FUNCTION(dcngettext)
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
/* {{{ proto string bind_textdomain_codeset(string domain, string codeset) /* {{{ Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */
Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */
PHP_FUNCTION(bind_textdomain_codeset) PHP_FUNCTION(bind_textdomain_codeset)
{ {
char *domain, *codeset, *retval = NULL; char *domain, *codeset, *retval = NULL;

180
ext/gmp/gmp.c
View file

@ -38,8 +38,7 @@
ZEND_DECLARE_MODULE_GLOBALS(gmp) ZEND_DECLARE_MODULE_GLOBALS(gmp)
static ZEND_GINIT_FUNCTION(gmp); static ZEND_GINIT_FUNCTION(gmp);
/* {{{ gmp_module_entry /* {{{ gmp_module_entry */
*/
zend_module_entry gmp_module_entry = { zend_module_entry gmp_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"gmp", "gmp",
@ -508,8 +507,7 @@ exit:
} }
/* }}} */ /* }}} */
/* {{{ ZEND_GINIT_FUNCTION /* {{{ ZEND_GINIT_FUNCTION */
*/
static ZEND_GINIT_FUNCTION(gmp) static ZEND_GINIT_FUNCTION(gmp)
{ {
#if defined(COMPILE_DL_GMP) && defined(ZTS) #if defined(COMPILE_DL_GMP) && defined(ZTS)
@ -519,8 +517,7 @@ static ZEND_GINIT_FUNCTION(gmp)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_MINIT_FUNCTION /* {{{ ZEND_MINIT_FUNCTION */
*/
ZEND_MINIT_FUNCTION(gmp) ZEND_MINIT_FUNCTION(gmp)
{ {
zend_class_entry tmp_ce; zend_class_entry tmp_ce;
@ -557,8 +554,7 @@ ZEND_MINIT_FUNCTION(gmp)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_RSHUTDOWN_FUNCTION /* {{{ ZEND_RSHUTDOWN_FUNCTION */
*/
ZEND_MODULE_DEACTIVATE_D(gmp) ZEND_MODULE_DEACTIVATE_D(gmp)
{ {
if (GMPG(rand_initialized)) { if (GMPG(rand_initialized)) {
@ -570,8 +566,7 @@ ZEND_MODULE_DEACTIVATE_D(gmp)
} }
/* }}} */ /* }}} */
/* {{{ ZEND_MINFO_FUNCTION /* {{{ ZEND_MINFO_FUNCTION */
*/
ZEND_MODULE_INFO_D(gmp) ZEND_MODULE_INFO_D(gmp)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -787,8 +782,7 @@ static inline void gmp_zval_binary_ui_op2(zval *return_value, zval *a_arg, zval
} }
/* }}} */ /* }}} */
/* {{{ _gmp_binary_ui_op /* {{{ _gmp_binary_ui_op */
*/
static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op_t gmp_op, gmp_binary_ui_op_t gmp_ui_op, int check_b_zero) static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op_t gmp_op, gmp_binary_ui_op_t gmp_ui_op, int check_b_zero)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -803,8 +797,7 @@ static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op
/* Unary operations */ /* Unary operations */
/* {{{ gmp_zval_unary_op /* {{{ gmp_zval_unary_op */
*/
static inline void gmp_zval_unary_op(zval *return_value, zval *a_arg, gmp_unary_op_t gmp_op) static inline void gmp_zval_unary_op(zval *return_value, zval *a_arg, gmp_unary_op_t gmp_op)
{ {
mpz_ptr gmpnum_a, gmpnum_result; mpz_ptr gmpnum_a, gmpnum_result;
@ -819,8 +812,7 @@ static inline void gmp_zval_unary_op(zval *return_value, zval *a_arg, gmp_unary_
} }
/* }}} */ /* }}} */
/* {{{ gmp_zval_unary_ui_op /* {{{ gmp_zval_unary_ui_op */
*/
static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_unary_ui_op_t gmp_op) static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_unary_ui_op_t gmp_op)
{ {
mpz_ptr gmpnum_result; mpz_ptr gmpnum_result;
@ -830,8 +822,7 @@ static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_una
} }
/* }}} */ /* }}} */
/* {{{ _gmp_unary_op /* {{{ _gmp_unary_op */
*/
static inline void _gmp_unary_op(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_op_t gmp_op) static inline void _gmp_unary_op(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_op_t gmp_op)
{ {
zval *a_arg; zval *a_arg;
@ -844,8 +835,7 @@ static inline void _gmp_unary_op(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_op_t gm
} }
/* }}} */ /* }}} */
/* {{{ _gmp_unary_opl /* {{{ _gmp_unary_opl */
*/
static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t gmp_op) static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t gmp_op)
{ {
zval *a_arg; zval *a_arg;
@ -862,8 +852,7 @@ static inline void _gmp_unary_opl(INTERNAL_FUNCTION_PARAMETERS, gmp_unary_opl_t
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_init(mixed number [, int base]) /* {{{ Initializes GMP number */
Initializes GMP number */
ZEND_FUNCTION(gmp_init) ZEND_FUNCTION(gmp_init)
{ {
zval *number_arg; zval *number_arg;
@ -929,8 +918,7 @@ int gmp_import_export_validate(zend_long size, zend_long options, int *order, in
return SUCCESS; return SUCCESS;
} }
/* {{{ proto GMP gmp_import(string data [, int word_size = 1, int options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN]) /* {{{ Imports a GMP number from a binary string */
Imports a GMP number from a binary string */
ZEND_FUNCTION(gmp_import) ZEND_FUNCTION(gmp_import)
{ {
char *data; char *data;
@ -960,8 +948,7 @@ ZEND_FUNCTION(gmp_import)
} }
/* }}} */ /* }}} */
/* {{{ proto string gmp_export(GMP gmpnumber [, int word_size = 1, int options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN]) /* {{{ Exports a GMP number to a binary string */
Exports a GMP number to a binary string */
ZEND_FUNCTION(gmp_export) ZEND_FUNCTION(gmp_export)
{ {
zval *gmpnumber_arg; zval *gmpnumber_arg;
@ -998,8 +985,7 @@ ZEND_FUNCTION(gmp_export)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_intval(mixed gmpnumber) /* {{{ Gets signed long value of GMP number */
Gets signed long value of GMP number */
ZEND_FUNCTION(gmp_intval) ZEND_FUNCTION(gmp_intval)
{ {
zval *gmpnumber_arg; zval *gmpnumber_arg;
@ -1016,8 +1002,7 @@ ZEND_FUNCTION(gmp_intval)
} }
/* }}} */ /* }}} */
/* {{{ proto string gmp_strval(mixed gmpnumber [, int base]) /* {{{ Gets string representation of GMP number */
Gets string representation of GMP number */
ZEND_FUNCTION(gmp_strval) ZEND_FUNCTION(gmp_strval)
{ {
zval *gmpnumber_arg; zval *gmpnumber_arg;
@ -1044,32 +1029,28 @@ ZEND_FUNCTION(gmp_strval)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_add(mixed a, mixed b) /* {{{ Add a and b */
Add a and b */
ZEND_FUNCTION(gmp_add) ZEND_FUNCTION(gmp_add)
{ {
gmp_binary_ui_op(mpz_add, mpz_add_ui); gmp_binary_ui_op(mpz_add, mpz_add_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_sub(mixed a, mixed b) /* {{{ Subtract b from a */
Subtract b from a */
ZEND_FUNCTION(gmp_sub) ZEND_FUNCTION(gmp_sub)
{ {
gmp_binary_ui_op(mpz_sub, mpz_sub_ui); gmp_binary_ui_op(mpz_sub, mpz_sub_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_mul(mixed a, mixed b) /* {{{ Multiply a and b */
Multiply a and b */
ZEND_FUNCTION(gmp_mul) ZEND_FUNCTION(gmp_mul)
{ {
gmp_binary_ui_op(mpz_mul, mpz_mul_ui); gmp_binary_ui_op(mpz_mul, mpz_mul_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto array gmp_div_qr(mixed a, mixed b [, int round]) /* {{{ Divide a by b, returns quotient and reminder */
Divide a by b, returns quotient and reminder */
ZEND_FUNCTION(gmp_div_qr) ZEND_FUNCTION(gmp_div_qr)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1096,8 +1077,7 @@ ZEND_FUNCTION(gmp_div_qr)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_div_r(mixed a, mixed b [, int round]) /* {{{ Divide a by b, returns reminder only */
Divide a by b, returns reminder only */
ZEND_FUNCTION(gmp_div_r) ZEND_FUNCTION(gmp_div_r)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1124,8 +1104,7 @@ ZEND_FUNCTION(gmp_div_r)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_div_q(mixed a, mixed b [, int round]) /* {{{ Divide a by b, returns quotient only */
Divide a by b, returns quotient only */
ZEND_FUNCTION(gmp_div_q) ZEND_FUNCTION(gmp_div_q)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1153,40 +1132,35 @@ ZEND_FUNCTION(gmp_div_q)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_mod(mixed a, mixed b) /* {{{ Computes a modulo b */
Computes a modulo b */
ZEND_FUNCTION(gmp_mod) ZEND_FUNCTION(gmp_mod)
{ {
gmp_binary_ui_op_no_zero(mpz_mod, gmp_mpz_mod_ui); gmp_binary_ui_op_no_zero(mpz_mod, gmp_mpz_mod_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_divexact(mixed a, mixed b) /* {{{ Divide a by b using exact division algorithm */
Divide a by b using exact division algorithm */
ZEND_FUNCTION(gmp_divexact) ZEND_FUNCTION(gmp_divexact)
{ {
gmp_binary_ui_op_no_zero(mpz_divexact, NULL); gmp_binary_ui_op_no_zero(mpz_divexact, NULL);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_neg(mixed a) /* {{{ Negates a number */
Negates a number */
ZEND_FUNCTION(gmp_neg) ZEND_FUNCTION(gmp_neg)
{ {
gmp_unary_op(mpz_neg); gmp_unary_op(mpz_neg);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_abs(mixed a) /* {{{ Calculates absolute value */
Calculates absolute value */
ZEND_FUNCTION(gmp_abs) ZEND_FUNCTION(gmp_abs)
{ {
gmp_unary_op(mpz_abs); gmp_unary_op(mpz_abs);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_fact(int a) /* {{{ Calculates factorial function */
Calculates factorial function */
ZEND_FUNCTION(gmp_fact) ZEND_FUNCTION(gmp_fact)
{ {
zval *a_arg; zval *a_arg;
@ -1221,8 +1195,7 @@ ZEND_FUNCTION(gmp_fact)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_binomial(mixed n, int k) /* {{{ Calculates binomial coefficient */
* Calculates binomial coefficient */
ZEND_FUNCTION(gmp_binomial) ZEND_FUNCTION(gmp_binomial)
{ {
zval *n_arg; zval *n_arg;
@ -1251,8 +1224,7 @@ ZEND_FUNCTION(gmp_binomial)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_pow(mixed base, int exp) /* {{{ Raise base to power exp */
Raise base to power exp */
ZEND_FUNCTION(gmp_pow) ZEND_FUNCTION(gmp_pow)
{ {
zval *base_arg; zval *base_arg;
@ -1282,8 +1254,7 @@ ZEND_FUNCTION(gmp_pow)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_powm(mixed base, mixed exp, mixed mod) /* {{{ Raise base to power exp and take result modulo mod */
Raise base to power exp and take result modulo mod */
ZEND_FUNCTION(gmp_powm) ZEND_FUNCTION(gmp_powm)
{ {
zval *base_arg, *exp_arg, *mod_arg; zval *base_arg, *exp_arg, *mod_arg;
@ -1332,8 +1303,7 @@ ZEND_FUNCTION(gmp_powm)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_sqrt(mixed a) /* {{{ Takes integer part of square root of a */
Takes integer part of square root of a */
ZEND_FUNCTION(gmp_sqrt) ZEND_FUNCTION(gmp_sqrt)
{ {
zval *a_arg; zval *a_arg;
@ -1358,8 +1328,7 @@ ZEND_FUNCTION(gmp_sqrt)
} }
/* }}} */ /* }}} */
/* {{{ proto array gmp_sqrtrem(mixed a) /* {{{ Square root with remainder */
Square root with remainder */
ZEND_FUNCTION(gmp_sqrtrem) ZEND_FUNCTION(gmp_sqrtrem)
{ {
zval *a_arg; zval *a_arg;
@ -1391,8 +1360,7 @@ ZEND_FUNCTION(gmp_sqrtrem)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_root(mixed a, int nth) /* {{{ Takes integer part of nth root */
Takes integer part of nth root */
ZEND_FUNCTION(gmp_root) ZEND_FUNCTION(gmp_root)
{ {
zval *a_arg; zval *a_arg;
@ -1423,8 +1391,7 @@ ZEND_FUNCTION(gmp_root)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_rootrem(mixed a, int nth) /* {{{ Calculates integer part of nth root and remainder */
Calculates integer part of nth root and remainder */
ZEND_FUNCTION(gmp_rootrem) ZEND_FUNCTION(gmp_rootrem)
{ {
zval *a_arg; zval *a_arg;
@ -1471,8 +1438,7 @@ ZEND_FUNCTION(gmp_rootrem)
} }
/* }}} */ /* }}} */
/* {{{ proto bool gmp_perfect_square(mixed a) /* {{{ Checks if a is an exact square */
Checks if a is an exact square */
ZEND_FUNCTION(gmp_perfect_square) ZEND_FUNCTION(gmp_perfect_square)
{ {
zval *a_arg; zval *a_arg;
@ -1490,8 +1456,7 @@ ZEND_FUNCTION(gmp_perfect_square)
} }
/* }}} */ /* }}} */
/* {{{ proto bool gmp_perfect_power(mixed a) /* {{{ Checks if a is a perfect power */
Checks if a is a perfect power */
ZEND_FUNCTION(gmp_perfect_power) ZEND_FUNCTION(gmp_perfect_power)
{ {
zval *a_arg; zval *a_arg;
@ -1509,8 +1474,7 @@ ZEND_FUNCTION(gmp_perfect_power)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_prob_prime(mixed a[, int reps]) /* {{{ Checks if a is "probably prime" */
Checks if a is "probably prime" */
ZEND_FUNCTION(gmp_prob_prime) ZEND_FUNCTION(gmp_prob_prime)
{ {
zval *gmpnumber_arg; zval *gmpnumber_arg;
@ -1529,24 +1493,21 @@ ZEND_FUNCTION(gmp_prob_prime)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_gcd(mixed a, mixed b) /* {{{ Computes greatest common denominator (gcd) of a and b */
Computes greatest common denominator (gcd) of a and b */
ZEND_FUNCTION(gmp_gcd) ZEND_FUNCTION(gmp_gcd)
{ {
gmp_binary_ui_op(mpz_gcd, gmp_mpz_gcd_ui); gmp_binary_ui_op(mpz_gcd, gmp_mpz_gcd_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_lcm(mixed a, mixed b) /* {{{ Computes least common multiple (lcm) of a and b */
Computes least common multiple (lcm) of a and b */
ZEND_FUNCTION(gmp_lcm) ZEND_FUNCTION(gmp_lcm)
{ {
gmp_binary_ui_op(mpz_lcm, mpz_lcm_ui); gmp_binary_ui_op(mpz_lcm, mpz_lcm_ui);
} }
/* }}} */ /* }}} */
/* {{{ proto array gmp_gcdext(mixed a, mixed b) /* {{{ Computes G, S, and T, such that AS + BT = G = `gcd' (A, B) */
Computes G, S, and T, such that AS + BT = G = `gcd' (A, B) */
ZEND_FUNCTION(gmp_gcdext) ZEND_FUNCTION(gmp_gcdext)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1576,8 +1537,7 @@ ZEND_FUNCTION(gmp_gcdext)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_invert(mixed a, mixed b) /* {{{ Computes the inverse of a modulo b */
Computes the inverse of a modulo b */
ZEND_FUNCTION(gmp_invert) ZEND_FUNCTION(gmp_invert)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1603,8 +1563,7 @@ ZEND_FUNCTION(gmp_invert)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_jacobi(mixed a, mixed b) /* {{{ Computes Jacobi symbol */
Computes Jacobi symbol */
ZEND_FUNCTION(gmp_jacobi) ZEND_FUNCTION(gmp_jacobi)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1625,8 +1584,7 @@ ZEND_FUNCTION(gmp_jacobi)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_legendre(mixed a, mixed b) /* {{{ Computes Legendre symbol */
Computes Legendre symbol */
ZEND_FUNCTION(gmp_legendre) ZEND_FUNCTION(gmp_legendre)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1647,8 +1605,7 @@ ZEND_FUNCTION(gmp_legendre)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_kronecker(mixed a, mixed b) /* {{{ Computes the Kronecker symbol */
Computes the Kronecker symbol */
ZEND_FUNCTION(gmp_kronecker) ZEND_FUNCTION(gmp_kronecker)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1691,8 +1648,7 @@ ZEND_FUNCTION(gmp_kronecker)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_cmp(mixed a, mixed b) /* {{{ Compares two numbers */
Compares two numbers */
ZEND_FUNCTION(gmp_cmp) ZEND_FUNCTION(gmp_cmp)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -1705,8 +1661,7 @@ ZEND_FUNCTION(gmp_cmp)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_sign(mixed a) /* {{{ Gets the sign of the number */
Gets the sign of the number */
ZEND_FUNCTION(gmp_sign) ZEND_FUNCTION(gmp_sign)
{ {
/* Can't use gmp_unary_opl here, because mpz_sgn is a macro */ /* Can't use gmp_unary_opl here, because mpz_sgn is a macro */
@ -1737,8 +1692,7 @@ static void gmp_init_random(void)
} }
} }
/* {{{ proto GMP gmp_random_seed(mixed seed) /* {{{ Seed the RNG */
Seed the RNG */
ZEND_FUNCTION(gmp_random_seed) ZEND_FUNCTION(gmp_random_seed)
{ {
zval *seed; zval *seed;
@ -1765,8 +1719,7 @@ ZEND_FUNCTION(gmp_random_seed)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_random_bits(int bits) /* {{{ Gets a random number in the range 0 to (2 ** n) - 1 */
Gets a random number in the range 0 to (2 ** n) - 1 */
ZEND_FUNCTION(gmp_random_bits) ZEND_FUNCTION(gmp_random_bits)
{ {
zend_long bits; zend_long bits;
@ -1788,8 +1741,7 @@ ZEND_FUNCTION(gmp_random_bits)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_random_range(mixed min, mixed max) /* {{{ Gets a random number in the range min to max */
Gets a random number in the range min to max */
ZEND_FUNCTION(gmp_random_range) ZEND_FUNCTION(gmp_random_range)
{ {
zval *min_arg, *max_arg; zval *min_arg, *max_arg;
@ -1856,48 +1808,42 @@ ZEND_FUNCTION(gmp_random_range)
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_and(mixed a, mixed b) /* {{{ Calculates logical AND of a and b */
Calculates logical AND of a and b */
ZEND_FUNCTION(gmp_and) ZEND_FUNCTION(gmp_and)
{ {
gmp_binary_op(mpz_and); gmp_binary_op(mpz_and);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_or(mixed a, mixed b) /* {{{ Calculates logical OR of a and b */
Calculates logical OR of a and b */
ZEND_FUNCTION(gmp_or) ZEND_FUNCTION(gmp_or)
{ {
gmp_binary_op(mpz_ior); gmp_binary_op(mpz_ior);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_com(mixed a) /* {{{ Calculates one's complement of a */
Calculates one's complement of a */
ZEND_FUNCTION(gmp_com) ZEND_FUNCTION(gmp_com)
{ {
gmp_unary_op(mpz_com); gmp_unary_op(mpz_com);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_nextprime(mixed a) /* {{{ Finds next prime of a */
Finds next prime of a */
ZEND_FUNCTION(gmp_nextprime) ZEND_FUNCTION(gmp_nextprime)
{ {
gmp_unary_op(mpz_nextprime); gmp_unary_op(mpz_nextprime);
} }
/* }}} */ /* }}} */
/* {{{ proto GMP gmp_xor(mixed a, mixed b) /* {{{ Calculates logical exclusive OR of a and b */
Calculates logical exclusive OR of a and b */
ZEND_FUNCTION(gmp_xor) ZEND_FUNCTION(gmp_xor)
{ {
gmp_binary_op(mpz_xor); gmp_binary_op(mpz_xor);
} }
/* }}} */ /* }}} */
/* {{{ proto void gmp_setbit(GMP a, int index[, bool set_clear]) /* {{{ Sets or clear bit in a */
Sets or clear bit in a */
ZEND_FUNCTION(gmp_setbit) ZEND_FUNCTION(gmp_setbit)
{ {
zval *a_arg; zval *a_arg;
@ -1928,8 +1874,7 @@ ZEND_FUNCTION(gmp_setbit)
} }
/* }}} */ /* }}} */
/* {{{ proto void gmp_clrbit(GMP a, int index) /* {{{ Clears bit in a */
Clears bit in a */
ZEND_FUNCTION(gmp_clrbit) ZEND_FUNCTION(gmp_clrbit)
{ {
zval *a_arg; zval *a_arg;
@ -1950,8 +1895,7 @@ ZEND_FUNCTION(gmp_clrbit)
} }
/* }}} */ /* }}} */
/* {{{ proto bool gmp_testbit(mixed a, int index) /* {{{ Tests if bit is set in a */
Tests if bit is set in a */
ZEND_FUNCTION(gmp_testbit) ZEND_FUNCTION(gmp_testbit)
{ {
zval *a_arg; zval *a_arg;
@ -1974,16 +1918,14 @@ ZEND_FUNCTION(gmp_testbit)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_popcount(mixed a) /* {{{ Calculates the population count of a */
Calculates the population count of a */
ZEND_FUNCTION(gmp_popcount) ZEND_FUNCTION(gmp_popcount)
{ {
gmp_unary_opl(mpz_popcount); gmp_unary_opl(mpz_popcount);
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_hamdist(mixed a, mixed b) /* {{{ Calculates hamming distance between a and b */
Calculates hamming distance between a and b */
ZEND_FUNCTION(gmp_hamdist) ZEND_FUNCTION(gmp_hamdist)
{ {
zval *a_arg, *b_arg; zval *a_arg, *b_arg;
@ -2004,8 +1946,7 @@ ZEND_FUNCTION(gmp_hamdist)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_scan0(mixed a, int start) /* {{{ Finds first zero bit */
Finds first zero bit */
ZEND_FUNCTION(gmp_scan0) ZEND_FUNCTION(gmp_scan0)
{ {
zval *a_arg; zval *a_arg;
@ -2029,8 +1970,7 @@ ZEND_FUNCTION(gmp_scan0)
} }
/* }}} */ /* }}} */
/* {{{ proto int gmp_scan1(mixed a, int start) /* {{{ Finds first non-zero bit */
Finds first non-zero bit */
ZEND_FUNCTION(gmp_scan1) ZEND_FUNCTION(gmp_scan1)
{ {
zval *a_arg; zval *a_arg;

81
ext/hash/hash.c
View file

@ -416,8 +416,7 @@ static void php_hash_do_hash(INTERNAL_FUNCTION_PARAMETERS, int isfilename, zend_
} }
/* }}} */ /* }}} */
/* {{{ proto string hash(string algo, string data[, bool raw_output = false]) /* {{{ Generate a hash of a given input string
Generate a hash of a given input string
Returns lowercase hexits by default */ Returns lowercase hexits by default */
PHP_FUNCTION(hash) PHP_FUNCTION(hash)
{ {
@ -425,8 +424,7 @@ PHP_FUNCTION(hash)
} }
/* }}} */ /* }}} */
/* {{{ proto string hash_file(string algo, string filename[, bool raw_output = false]) /* {{{ Generate a hash of a given file
Generate a hash of a given file
Returns lowercase hexits by default */ Returns lowercase hexits by default */
PHP_FUNCTION(hash_file) PHP_FUNCTION(hash_file)
{ {
@ -554,8 +552,7 @@ static void php_hash_do_hash_hmac(INTERNAL_FUNCTION_PARAMETERS, int isfilename,
} }
/* }}} */ /* }}} */
/* {{{ proto string hash_hmac(string algo, string data, string key[, bool raw_output = false]) /* {{{ Generate a hash of a given input string with a key using HMAC
Generate a hash of a given input string with a key using HMAC
Returns lowercase hexits by default */ Returns lowercase hexits by default */
PHP_FUNCTION(hash_hmac) PHP_FUNCTION(hash_hmac)
{ {
@ -563,8 +560,7 @@ PHP_FUNCTION(hash_hmac)
} }
/* }}} */ /* }}} */
/* {{{ proto string hash_hmac_file(string algo, string filename, string key[, bool raw_output = false]) /* {{{ Generate a hash of a given file with a key using HMAC
Generate a hash of a given file with a key using HMAC
Returns lowercase hexits by default */ Returns lowercase hexits by default */
PHP_FUNCTION(hash_hmac_file) PHP_FUNCTION(hash_hmac_file)
{ {
@ -572,8 +568,7 @@ PHP_FUNCTION(hash_hmac_file)
} }
/* }}} */ /* }}} */
/* {{{ proto HashContext hash_init(string algo[, int options, string key]) /* {{{ Initialize a hashing context */
Initialize a hashing context */
PHP_FUNCTION(hash_init) PHP_FUNCTION(hash_init)
{ {
zend_string *algo, *key = NULL; zend_string *algo, *key = NULL;
@ -649,8 +644,7 @@ PHP_FUNCTION(hash_init)
} \ } \
} }
/* {{{ proto bool hash_update(HashContext context, string data) /* {{{ Pump data into the hashing algorithm */
Pump data into the hashing algorithm */
PHP_FUNCTION(hash_update) PHP_FUNCTION(hash_update)
{ {
zval *zhash; zval *zhash;
@ -669,8 +663,7 @@ PHP_FUNCTION(hash_update)
} }
/* }}} */ /* }}} */
/* {{{ proto int hash_update_stream(HashContext context, resource handle[, int length]) /* {{{ Pump data into the hashing algorithm from an open stream */
Pump data into the hashing algorithm from an open stream */
PHP_FUNCTION(hash_update_stream) PHP_FUNCTION(hash_update_stream)
{ {
zval *zhash, *zstream; zval *zhash, *zstream;
@ -707,8 +700,7 @@ PHP_FUNCTION(hash_update_stream)
} }
/* }}} */ /* }}} */
/* {{{ proto bool hash_update_file(HashContext context, string filename[, resource context]) /* {{{ Pump data into the hashing algorithm from a file */
Pump data into the hashing algorithm from a file */
PHP_FUNCTION(hash_update_file) PHP_FUNCTION(hash_update_file)
{ {
zval *zhash, *zcontext = NULL; zval *zhash, *zcontext = NULL;
@ -742,8 +734,7 @@ PHP_FUNCTION(hash_update_file)
} }
/* }}} */ /* }}} */
/* {{{ proto string hash_final(HashContext context[, bool raw_output=false]) /* {{{ Output resulting digest */
Output resulting digest */
PHP_FUNCTION(hash_final) PHP_FUNCTION(hash_final)
{ {
zval *zhash; zval *zhash;
@ -801,8 +792,7 @@ PHP_FUNCTION(hash_final)
} }
/* }}} */ /* }}} */
/* {{{ proto HashContext hash_copy(HashContext context) /* {{{ Copy hash object */
Copy hash object */
PHP_FUNCTION(hash_copy) PHP_FUNCTION(hash_copy)
{ {
zval *zhash; zval *zhash;
@ -822,8 +812,7 @@ PHP_FUNCTION(hash_copy)
} }
/* }}} */ /* }}} */
/* {{{ proto array hash_algos(void) /* {{{ Return a list of registered hashing algorithms */
Return a list of registered hashing algorithms */
PHP_FUNCTION(hash_algos) PHP_FUNCTION(hash_algos)
{ {
zend_string *str; zend_string *str;
@ -839,8 +828,7 @@ PHP_FUNCTION(hash_algos)
} }
/* }}} */ /* }}} */
/* {{{ proto array hash_hmac_algos(void) /* {{{ Return a list of registered hashing algorithms suitable for hash_hmac() */
Return a list of registered hashing algorithms suitable for hash_hmac() */
PHP_FUNCTION(hash_hmac_algos) PHP_FUNCTION(hash_hmac_algos)
{ {
zend_string *str; zend_string *str;
@ -859,8 +847,7 @@ PHP_FUNCTION(hash_hmac_algos)
} }
/* }}} */ /* }}} */
/* {{{ proto string hash_hkdf(string algo, string ikm [, int length = 0, string info = '', string salt = '']) /* {{{ RFC5869 HMAC-based key derivation function */
RFC5869 HMAC-based key derivation function */
PHP_FUNCTION(hash_hkdf) PHP_FUNCTION(hash_hkdf)
{ {
zend_string *returnval, *ikm, *algo, *info = NULL, *salt = NULL; zend_string *returnval, *ikm, *algo, *info = NULL, *salt = NULL;
@ -952,8 +939,7 @@ PHP_FUNCTION(hash_hkdf)
RETURN_STR(returnval); RETURN_STR(returnval);
} }
/* {{{ proto string hash_pbkdf2(string algo, string password, string salt, int iterations [, int length = 0, bool raw_output = false]) /* {{{ Generate a PBKDF2 hash of the given password and salt
Generate a PBKDF2 hash of the given password and salt
Returns lowercase hexits by default */ Returns lowercase hexits by default */
PHP_FUNCTION(hash_pbkdf2) PHP_FUNCTION(hash_pbkdf2)
{ {
@ -1077,8 +1063,7 @@ PHP_FUNCTION(hash_pbkdf2)
} }
/* }}} */ /* }}} */
/* {{{ proto bool hash_equals(string known_string, string user_string) /* {{{ Compares two strings using the same time whether they're equal or not.
Compares two strings using the same time whether they're equal or not.
A difference in length will leak */ A difference in length will leak */
PHP_FUNCTION(hash_equals) PHP_FUNCTION(hash_equals)
{ {
@ -1118,7 +1103,7 @@ PHP_FUNCTION(hash_equals)
} }
/* }}} */ /* }}} */
/* {{{ proto HashContext::__construct() */ /* {{{ */
PHP_METHOD(HashContext, __construct) { PHP_METHOD(HashContext, __construct) {
/* Normally unreachable as private/final */ /* Normally unreachable as private/final */
zend_throw_exception(zend_ce_error, "Illegal call to private/final constructor", 0); zend_throw_exception(zend_ce_error, "Illegal call to private/final constructor", 0);
@ -1175,8 +1160,7 @@ static void mhash_init(INIT_FUNC_ARGS)
/* TODO: this cause #69823 zend_register_internal_module(&mhash_module_entry); */ /* TODO: this cause #69823 zend_register_internal_module(&mhash_module_entry); */
} }
/* {{{ proto string mhash(int hash, string data [, string key]) /* {{{ Hash data with hash */
Hash data with hash */
PHP_FUNCTION(mhash) PHP_FUNCTION(mhash)
{ {
zval *z_algorithm; zval *z_algorithm;
@ -1206,8 +1190,7 @@ PHP_FUNCTION(mhash)
} }
/* }}} */ /* }}} */
/* {{{ proto string mhash_get_hash_name(int hash) /* {{{ Gets the name of hash */
Gets the name of hash */
PHP_FUNCTION(mhash_get_hash_name) PHP_FUNCTION(mhash_get_hash_name)
{ {
zend_long algorithm; zend_long algorithm;
@ -1226,8 +1209,7 @@ PHP_FUNCTION(mhash_get_hash_name)
} }
/* }}} */ /* }}} */
/* {{{ proto int mhash_count(void) /* {{{ Gets the number of available hashes */
Gets the number of available hashes */
PHP_FUNCTION(mhash_count) PHP_FUNCTION(mhash_count)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -1237,8 +1219,7 @@ PHP_FUNCTION(mhash_count)
} }
/* }}} */ /* }}} */
/* {{{ proto int mhash_get_block_size(int hash) /* {{{ Gets the block size of hash */
Gets the block size of hash */
PHP_FUNCTION(mhash_get_block_size) PHP_FUNCTION(mhash_get_block_size)
{ {
zend_long algorithm; zend_long algorithm;
@ -1262,8 +1243,7 @@ PHP_FUNCTION(mhash_get_block_size)
#define SALT_SIZE 8 #define SALT_SIZE 8
/* {{{ proto string mhash_keygen_s2k(int hash, string input_password, string salt, int bytes) /* {{{ Generates a key using hash functions */
Generates a key using hash functions */
PHP_FUNCTION(mhash_keygen_s2k) PHP_FUNCTION(mhash_keygen_s2k)
{ {
zend_long algorithm, l_bytes; zend_long algorithm, l_bytes;
@ -1417,8 +1397,7 @@ static zend_object *php_hashcontext_clone(zend_object *zobj) {
Currently HASH_HMAC contexts cannot be serialized, because serializing them Currently HASH_HMAC contexts cannot be serialized, because serializing them
would require serializing the HMAC key in plaintext. */ would require serializing the HMAC key in plaintext. */
/* {{{ proto array HashContext::__serialize() /* {{{ Serialize the object */
Serialize the object */
PHP_METHOD(HashContext, __serialize) PHP_METHOD(HashContext, __serialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -1466,9 +1445,7 @@ serialize_failure:
} }
/* }}} */ /* }}} */
/* {{{ proto void HashContext::__unserialize(array serialized) /* {{{ unserialize the object */
* unserialize the object
*/
PHP_METHOD(HashContext, __unserialize) PHP_METHOD(HashContext, __unserialize)
{ {
zval *object = ZEND_THIS; zval *object = ZEND_THIS;
@ -1536,8 +1513,7 @@ PHP_METHOD(HashContext, __unserialize)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(hash) PHP_MINIT_FUNCTION(hash)
{ {
zend_class_entry ce; zend_class_entry ce;
@ -1622,8 +1598,7 @@ PHP_MINIT_FUNCTION(hash)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(hash) PHP_MSHUTDOWN_FUNCTION(hash)
{ {
zend_hash_destroy(&php_hash_hashtable); zend_hash_destroy(&php_hash_hashtable);
@ -1632,8 +1607,7 @@ PHP_MSHUTDOWN_FUNCTION(hash)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(hash) PHP_MINFO_FUNCTION(hash)
{ {
char buffer[2048]; char buffer[2048];
@ -1660,8 +1634,7 @@ PHP_MINFO_FUNCTION(hash)
} }
/* }}} */ /* }}} */
/* {{{ hash_module_entry /* {{{ hash_module_entry */
*/
zend_module_entry hash_module_entry = { zend_module_entry hash_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
PHP_HASH_EXTNAME, PHP_HASH_EXTNAME,

27
ext/hash/hash_haval.c
View file

@ -135,8 +135,7 @@ static void Decode(uint32_t *output, const unsigned char *input, unsigned int le
#define ROTR(x,n) (((x) >> (n)) | ((x) << (32 - (n)))) #define ROTR(x,n) (((x) >> (n)) | ((x) << (32 - (n))))
/* {{{ PHP_3HAVALTransform /* {{{ PHP_3HAVALTransform */
*/
static void PHP_3HAVALTransform(uint32_t state[8], const unsigned char block[128]) static void PHP_3HAVALTransform(uint32_t state[8], const unsigned char block[128])
{ {
uint32_t E[8]; uint32_t E[8];
@ -169,8 +168,7 @@ static void PHP_3HAVALTransform(uint32_t state[8], const unsigned char block[128
} }
/* }}} */ /* }}} */
/* {{{ PHP_4HAVALTransform /* {{{ PHP_4HAVALTransform */
*/
static void PHP_4HAVALTransform(uint32_t state[8], const unsigned char block[128]) static void PHP_4HAVALTransform(uint32_t state[8], const unsigned char block[128])
{ {
uint32_t E[8]; uint32_t E[8];
@ -206,8 +204,7 @@ static void PHP_4HAVALTransform(uint32_t state[8], const unsigned char block[128
} }
/* }}} */ /* }}} */
/* {{{ PHP_5HAVALTransform /* {{{ PHP_5HAVALTransform */
*/
static void PHP_5HAVALTransform(uint32_t state[8], const unsigned char block[128]) static void PHP_5HAVALTransform(uint32_t state[8], const unsigned char block[128])
{ {
uint32_t E[8]; uint32_t E[8];
@ -280,8 +277,7 @@ PHP_HASH_HAVAL_INIT(5,192)
PHP_HASH_HAVAL_INIT(5,224) PHP_HASH_HAVAL_INIT(5,224)
PHP_HASH_HAVAL_INIT(5,256) PHP_HASH_HAVAL_INIT(5,256)
/* {{{ PHP_HAVALUpdate /* {{{ PHP_HAVALUpdate */
*/
PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *input, size_t inputLen) PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *input, size_t inputLen)
{ {
unsigned int i, index, partLen; unsigned int i, index, partLen;
@ -318,8 +314,7 @@ PHP_HASH_API void PHP_HAVALUpdate(PHP_HAVAL_CTX *context, const unsigned char *i
#define PHP_HASH_HAVAL_VERSION 0x01 #define PHP_HASH_HAVAL_VERSION 0x01
/* {{{ PHP_HAVAL128Final /* {{{ PHP_HAVAL128Final */
*/
PHP_HASH_API void PHP_HAVAL128Final(unsigned char *digest, PHP_HAVAL_CTX * context) PHP_HASH_API void PHP_HAVAL128Final(unsigned char *digest, PHP_HAVAL_CTX * context)
{ {
unsigned char bits[10]; unsigned char bits[10];
@ -372,8 +367,7 @@ PHP_HASH_API void PHP_HAVAL128Final(unsigned char *digest, PHP_HAVAL_CTX * conte
} }
/* }}} */ /* }}} */
/* {{{ PHP_HAVAL160Final /* {{{ PHP_HAVAL160Final */
*/
PHP_HASH_API void PHP_HAVAL160Final(unsigned char *digest, PHP_HAVAL_CTX * context) PHP_HASH_API void PHP_HAVAL160Final(unsigned char *digest, PHP_HAVAL_CTX * context)
{ {
unsigned char bits[10]; unsigned char bits[10];
@ -426,8 +420,7 @@ PHP_HASH_API void PHP_HAVAL160Final(unsigned char *digest, PHP_HAVAL_CTX * conte
} }
/* }}} */ /* }}} */
/* {{{ PHP_HAVAL192Final /* {{{ PHP_HAVAL192Final */
*/
PHP_HASH_API void PHP_HAVAL192Final(unsigned char *digest, PHP_HAVAL_CTX * context) PHP_HASH_API void PHP_HAVAL192Final(unsigned char *digest, PHP_HAVAL_CTX * context)
{ {
unsigned char bits[10]; unsigned char bits[10];
@ -466,8 +459,7 @@ PHP_HASH_API void PHP_HAVAL192Final(unsigned char *digest, PHP_HAVAL_CTX * conte
} }
/* }}} */ /* }}} */
/* {{{ PHP_HAVAL224Final /* {{{ PHP_HAVAL224Final */
*/
PHP_HASH_API void PHP_HAVAL224Final(unsigned char *digest, PHP_HAVAL_CTX * context) PHP_HASH_API void PHP_HAVAL224Final(unsigned char *digest, PHP_HAVAL_CTX * context)
{ {
unsigned char bits[10]; unsigned char bits[10];
@ -507,8 +499,7 @@ PHP_HASH_API void PHP_HAVAL224Final(unsigned char *digest, PHP_HAVAL_CTX * conte
} }
/* }}} */ /* }}} */
/* {{{ PHP_HAVAL256Final /* {{{ PHP_HAVAL256Final */
*/
PHP_HASH_API void PHP_HAVAL256Final(unsigned char *digest, PHP_HAVAL_CTX * context) PHP_HASH_API void PHP_HAVAL256Final(unsigned char *digest, PHP_HAVAL_CTX * context)
{ {
unsigned char bits[10]; unsigned char bits[10];

39
ext/iconv/iconv.c
View file

@ -59,8 +59,7 @@
ZEND_DECLARE_MODULE_GLOBALS(iconv) ZEND_DECLARE_MODULE_GLOBALS(iconv)
static PHP_GINIT_FUNCTION(iconv); static PHP_GINIT_FUNCTION(iconv);
/* {{{ iconv_module_entry /* {{{ iconv_module_entry */
*/
zend_module_entry iconv_module_entry = { zend_module_entry iconv_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"iconv", "iconv",
@ -182,8 +181,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding)
} }
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("iconv.input_encoding", "", PHP_INI_ALL, OnUpdateInputEncoding, input_encoding, zend_iconv_globals, iconv_globals) STD_PHP_INI_ENTRY("iconv.input_encoding", "", PHP_INI_ALL, OnUpdateInputEncoding, input_encoding, zend_iconv_globals, iconv_globals)
STD_PHP_INI_ENTRY("iconv.output_encoding", "", PHP_INI_ALL, OnUpdateOutputEncoding, output_encoding, zend_iconv_globals, iconv_globals) STD_PHP_INI_ENTRY("iconv.output_encoding", "", PHP_INI_ALL, OnUpdateOutputEncoding, output_encoding, zend_iconv_globals, iconv_globals)
@ -434,8 +432,7 @@ static int _php_check_ignore(const char *charset)
#endif #endif
/* }}} */ /* }}} */
/* {{{ php_iconv_string() /* {{{ php_iconv_string() */
*/
PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, zend_string **out, const char *out_charset, const char *in_charset) PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, zend_string **out, const char *out_charset, const char *in_charset)
{ {
iconv_t cd; iconv_t cd;
@ -1822,8 +1819,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset,
} }
/* }}} */ /* }}} */
/* {{{ proto int iconv_strlen(string str [, string charset]) /* {{{ Returns the character count of str */
Returns the character count of str */
PHP_FUNCTION(iconv_strlen) PHP_FUNCTION(iconv_strlen)
{ {
const char *charset = NULL; const char *charset = NULL;
@ -1856,8 +1852,7 @@ PHP_FUNCTION(iconv_strlen)
} }
/* }}} */ /* }}} */
/* {{{ proto string iconv_substr(string str, int offset, [int length, string charset]) /* {{{ Returns specified part of a string */
Returns specified part of a string */
PHP_FUNCTION(iconv_substr) PHP_FUNCTION(iconv_substr)
{ {
const char *charset = NULL; const char *charset = NULL;
@ -1898,8 +1893,7 @@ PHP_FUNCTION(iconv_substr)
} }
/* }}} */ /* }}} */
/* {{{ proto int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) /* {{{ Finds position of first occurrence of needle within part of haystack beginning with offset */
Finds position of first occurrence of needle within part of haystack beginning with offset */
PHP_FUNCTION(iconv_strpos) PHP_FUNCTION(iconv_strpos)
{ {
const char *charset = NULL; const char *charset = NULL;
@ -1955,8 +1949,7 @@ PHP_FUNCTION(iconv_strpos)
} }
/* }}} */ /* }}} */
/* {{{ proto int iconv_strrpos(string haystack, string needle [, string charset]) /* {{{ Finds position of last occurrence of needle within part of haystack beginning with offset */
Finds position of last occurrence of needle within part of haystack beginning with offset */
PHP_FUNCTION(iconv_strrpos) PHP_FUNCTION(iconv_strrpos)
{ {
const char *charset = NULL; const char *charset = NULL;
@ -1997,8 +1990,7 @@ PHP_FUNCTION(iconv_strrpos)
} }
/* }}} */ /* }}} */
/* {{{ proto string iconv_mime_encode(string field_name, string field_value [, array preference]) /* {{{ Composes a mime header field with field_name and field_value in a specified scheme */
Composes a mime header field with field_name and field_value in a specified scheme */
PHP_FUNCTION(iconv_mime_encode) PHP_FUNCTION(iconv_mime_encode)
{ {
zend_string *field_name = NULL; zend_string *field_name = NULL;
@ -2100,8 +2092,7 @@ PHP_FUNCTION(iconv_mime_encode)
} }
/* }}} */ /* }}} */
/* {{{ proto string iconv_mime_decode(string encoded_string [, int mode, string charset]) /* {{{ Decodes a mime header field */
Decodes a mime header field */
PHP_FUNCTION(iconv_mime_decode) PHP_FUNCTION(iconv_mime_decode)
{ {
zend_string *encoded_str; zend_string *encoded_str;
@ -2142,8 +2133,7 @@ PHP_FUNCTION(iconv_mime_decode)
} }
/* }}} */ /* }}} */
/* {{{ proto array iconv_mime_decode_headers(string headers [, int mode, string charset]) /* {{{ Decodes multiple mime header fields */
Decodes multiple mime header fields */
PHP_FUNCTION(iconv_mime_decode_headers) PHP_FUNCTION(iconv_mime_decode_headers)
{ {
zend_string *encoded_str; zend_string *encoded_str;
@ -2242,8 +2232,7 @@ PHP_FUNCTION(iconv_mime_decode_headers)
} }
/* }}} */ /* }}} */
/* {{{ proto string iconv(string in_charset, string out_charset, string str) /* {{{ Returns str converted to the out_charset character set */
Returns str converted to the out_charset character set */
PHP_FUNCTION(iconv) PHP_FUNCTION(iconv)
{ {
char *in_charset, *out_charset; char *in_charset, *out_charset;
@ -2275,8 +2264,7 @@ PHP_FUNCTION(iconv)
} }
/* }}} */ /* }}} */
/* {{{ proto bool iconv_set_encoding(string type, string charset) /* {{{ Sets internal encoding and output encoding for ob_iconv_handler() */
Sets internal encoding and output encoding for ob_iconv_handler() */
PHP_FUNCTION(iconv_set_encoding) PHP_FUNCTION(iconv_set_encoding)
{ {
char *type; char *type;
@ -2314,8 +2302,7 @@ PHP_FUNCTION(iconv_set_encoding)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed iconv_get_encoding([string type]) /* {{{ Get internal encoding and output encoding for ob_iconv_handler() */
Get internal encoding and output encoding for ob_iconv_handler() */
PHP_FUNCTION(iconv_get_encoding) PHP_FUNCTION(iconv_get_encoding)
{ {
char *type = "all"; char *type = "all";

267
ext/imap/php_imap.c
View file

@ -104,16 +104,14 @@ static const zend_module_dep imap_deps[] = {
/* }}} */ /* }}} */
/* {{{ PHP_INI /* {{{ PHP_INI */
*/
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals)
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ imap_module_entry /* {{{ imap_module_entry */
*/
zend_module_entry imap_module_entry = { zend_module_entry imap_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
imap_deps, imap_deps,
@ -149,8 +147,7 @@ static int le_imap;
RETURN_FALSE; \ RETURN_FALSE; \
} \ } \
/* {{{ mail_close_it /* {{{ mail_close_it */
*/
static void mail_close_it(zend_resource *rsrc) static void mail_close_it(zend_resource *rsrc)
{ {
pils *imap_le_struct = (pils *)rsrc->ptr; pils *imap_le_struct = (pils *)rsrc->ptr;
@ -173,8 +170,7 @@ static void mail_close_it(zend_resource *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ add_assoc_object /* {{{ add_assoc_object */
*/
static zval *add_assoc_object(zval *arg, char *key, zval *tmp) static zval *add_assoc_object(zval *arg, char *key, zval *tmp)
{ {
HashTable *symtable; HashTable *symtable;
@ -188,8 +184,7 @@ static zval *add_assoc_object(zval *arg, char *key, zval *tmp)
} }
/* }}} */ /* }}} */
/* {{{ add_next_index_object /* {{{ add_next_index_object */
*/
static inline zval *add_next_index_object(zval *arg, zval *tmp) static inline zval *add_next_index_object(zval *arg, zval *tmp)
{ {
HashTable *symtable; HashTable *symtable;
@ -349,8 +344,7 @@ void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist)
/* }}} */ /* }}} */
#endif #endif
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(imap) static PHP_GINIT_FUNCTION(imap)
{ {
#if defined(COMPILE_DL_IMAP) && defined(ZTS) #if defined(COMPILE_DL_IMAP) && defined(ZTS)
@ -382,8 +376,7 @@ static PHP_GINIT_FUNCTION(imap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(imap) PHP_MINIT_FUNCTION(imap)
{ {
unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY;
@ -618,8 +611,7 @@ PHP_MINIT_FUNCTION(imap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RINIT_FUNCTION /* {{{ PHP_RINIT_FUNCTION */
*/
PHP_RINIT_FUNCTION(imap) PHP_RINIT_FUNCTION(imap)
{ {
IMAPG(imap_errorstack) = NIL; IMAPG(imap_errorstack) = NIL;
@ -629,8 +621,7 @@ PHP_RINIT_FUNCTION(imap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION /* {{{ PHP_RSHUTDOWN_FUNCTION */
*/
PHP_RSHUTDOWN_FUNCTION(imap) PHP_RSHUTDOWN_FUNCTION(imap)
{ {
ERRORLIST *ecur = NIL; ERRORLIST *ecur = NIL;
@ -687,8 +678,7 @@ PHP_RSHUTDOWN_FUNCTION(imap)
# endif # endif
#endif #endif
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(imap) PHP_MINFO_FUNCTION(imap)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -705,8 +695,7 @@ PHP_MINFO_FUNCTION(imap)
} }
/* }}} */ /* }}} */
/* {{{ imap_do_open /* {{{ imap_do_open */
*/
static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
zend_string *mailbox, *user, *passwd; zend_string *mailbox, *user, *passwd;
@ -816,16 +805,14 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
} }
/* }}} */ /* }}} */
/* {{{ proto resource imap_open(string mailbox, string user, string password [, int options [, int n_retries]]) /* {{{ Open an IMAP stream to a mailbox */
Open an IMAP stream to a mailbox */
PHP_FUNCTION(imap_open) PHP_FUNCTION(imap_open)
{ {
php_imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_reopen(resource stream_id, string mailbox [, int options [, int n_retries]]) /* {{{ Reopen an IMAP stream to a new mailbox */
Reopen an IMAP stream to a new mailbox */
PHP_FUNCTION(imap_reopen) PHP_FUNCTION(imap_reopen)
{ {
zval *streamind; zval *streamind;
@ -871,8 +858,7 @@ PHP_FUNCTION(imap_reopen)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_append(resource stream_id, string folder, string message [, string options [, string internal_date]]) /* {{{ Append a new message to a specified mailbox */
Append a new message to a specified mailbox */
PHP_FUNCTION(imap_append) PHP_FUNCTION(imap_append)
{ {
zval *streamind; zval *streamind;
@ -921,8 +907,7 @@ PHP_FUNCTION(imap_append)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_num_msg(resource stream_id) /* {{{ Gives the number of messages in the current mailbox */
Gives the number of messages in the current mailbox */
PHP_FUNCTION(imap_num_msg) PHP_FUNCTION(imap_num_msg)
{ {
zval *streamind; zval *streamind;
@ -940,8 +925,7 @@ PHP_FUNCTION(imap_num_msg)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_ping(resource stream_id) /* {{{ Check if the IMAP stream is still active */
Check if the IMAP stream is still active */
PHP_FUNCTION(imap_ping) PHP_FUNCTION(imap_ping)
{ {
zval *streamind; zval *streamind;
@ -959,8 +943,7 @@ PHP_FUNCTION(imap_ping)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_num_recent(resource stream_id) /* {{{ Gives the number of recent messages in current mailbox */
Gives the number of recent messages in current mailbox */
PHP_FUNCTION(imap_num_recent) PHP_FUNCTION(imap_num_recent)
{ {
zval *streamind; zval *streamind;
@ -979,8 +962,7 @@ PHP_FUNCTION(imap_num_recent)
/* }}} */ /* }}} */
#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
/* {{{ proto array imap_get_quota(resource stream_id, string qroot) /* {{{ Returns the quota set to the mailbox account qroot */
Returns the quota set to the mailbox account qroot */
PHP_FUNCTION(imap_get_quota) PHP_FUNCTION(imap_get_quota)
{ {
zval *streamind; zval *streamind;
@ -1008,8 +990,7 @@ PHP_FUNCTION(imap_get_quota)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_get_quotaroot(resource stream_id, string mbox) /* {{{ Returns the quota set to the mailbox account mbox */
Returns the quota set to the mailbox account mbox */
PHP_FUNCTION(imap_get_quotaroot) PHP_FUNCTION(imap_get_quotaroot)
{ {
zval *streamind; zval *streamind;
@ -1037,8 +1018,7 @@ PHP_FUNCTION(imap_get_quotaroot)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_set_quota(resource stream_id, string qroot, int mailbox_size) /* {{{ Will set the quota for qroot mailbox */
Will set the quota for qroot mailbox */
PHP_FUNCTION(imap_set_quota) PHP_FUNCTION(imap_set_quota)
{ {
zval *streamind; zval *streamind;
@ -1063,8 +1043,7 @@ PHP_FUNCTION(imap_set_quota)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_setacl(resource stream_id, string mailbox, string id, string rights) /* {{{ Sets the ACL for a given mailbox */
Sets the ACL for a given mailbox */
PHP_FUNCTION(imap_setacl) PHP_FUNCTION(imap_setacl)
{ {
zval *streamind; zval *streamind;
@ -1083,8 +1062,7 @@ PHP_FUNCTION(imap_setacl)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_getacl(resource stream_id, string mailbox) /* {{{ Gets the ACL for a given mailbox */
Gets the ACL for a given mailbox */
PHP_FUNCTION(imap_getacl) PHP_FUNCTION(imap_getacl)
{ {
zval *streamind; zval *streamind;
@ -1117,8 +1095,7 @@ PHP_FUNCTION(imap_getacl)
/* }}} */ /* }}} */
#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
/* {{{ proto bool imap_expunge(resource stream_id) /* {{{ Permanently delete all messages marked for deletion */
Permanently delete all messages marked for deletion */
PHP_FUNCTION(imap_expunge) PHP_FUNCTION(imap_expunge)
{ {
zval *streamind; zval *streamind;
@ -1138,8 +1115,7 @@ PHP_FUNCTION(imap_expunge)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_gc(resource stream_id, int flags) /* {{{ This function garbage collects (purges) the cache of entries of a specific type. */
This function garbage collects (purges) the cache of entries of a specific type. */
PHP_FUNCTION(imap_gc) PHP_FUNCTION(imap_gc)
{ {
zval *streamind; zval *streamind;
@ -1165,8 +1141,7 @@ PHP_FUNCTION(imap_gc)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_close(resource stream_id [, int options]) /* {{{ Close an IMAP stream */
Close an IMAP stream */
PHP_FUNCTION(imap_close) PHP_FUNCTION(imap_close)
{ {
zval *streamind; zval *streamind;
@ -1205,8 +1180,7 @@ PHP_FUNCTION(imap_close)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_headers(resource stream_id) /* {{{ Returns headers for all messages in a mailbox */
Returns headers for all messages in a mailbox */
PHP_FUNCTION(imap_headers) PHP_FUNCTION(imap_headers)
{ {
zval *streamind; zval *streamind;
@ -1257,8 +1231,7 @@ PHP_FUNCTION(imap_headers)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_body(resource stream_id, int msg_no [, int options]) /* {{{ Read the message body */
Read the message body */
PHP_FUNCTION(imap_body) PHP_FUNCTION(imap_body)
{ {
zval *streamind; zval *streamind;
@ -1303,8 +1276,7 @@ PHP_FUNCTION(imap_body)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_mail_copy(resource stream_id, string msglist, string mailbox [, int options]) /* {{{ Copy specified message to a mailbox */
Copy specified message to a mailbox */
PHP_FUNCTION(imap_mail_copy) PHP_FUNCTION(imap_mail_copy)
{ {
zval *streamind; zval *streamind;
@ -1329,8 +1301,7 @@ PHP_FUNCTION(imap_mail_copy)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_mail_move(resource stream_id, string sequence, string mailbox [, int options]) /* {{{ Move specified message to a mailbox */
Move specified message to a mailbox */
PHP_FUNCTION(imap_mail_move) PHP_FUNCTION(imap_mail_move)
{ {
zval *streamind; zval *streamind;
@ -1355,8 +1326,7 @@ PHP_FUNCTION(imap_mail_move)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_createmailbox(resource stream_id, string mailbox) /* {{{ Create a new mailbox */
Create a new mailbox */
PHP_FUNCTION(imap_createmailbox) PHP_FUNCTION(imap_createmailbox)
{ {
zval *streamind; zval *streamind;
@ -1379,8 +1349,7 @@ PHP_FUNCTION(imap_createmailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_renamemailbox(resource stream_id, string old_name, string new_name) /* {{{ Rename a mailbox */
Rename a mailbox */
PHP_FUNCTION(imap_renamemailbox) PHP_FUNCTION(imap_renamemailbox)
{ {
zval *streamind; zval *streamind;
@ -1403,8 +1372,7 @@ PHP_FUNCTION(imap_renamemailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_deletemailbox(resource stream_id, string mailbox) /* {{{ Delete a mailbox */
Delete a mailbox */
PHP_FUNCTION(imap_deletemailbox) PHP_FUNCTION(imap_deletemailbox)
{ {
zval *streamind; zval *streamind;
@ -1427,8 +1395,7 @@ PHP_FUNCTION(imap_deletemailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_list(resource stream_id, string ref, string pattern) /* {{{ Read the list of mailboxes */
Read the list of mailboxes */
PHP_FUNCTION(imap_list) PHP_FUNCTION(imap_list)
{ {
zval *streamind; zval *streamind;
@ -1465,8 +1432,7 @@ PHP_FUNCTION(imap_list)
/* }}} */ /* }}} */
/* {{{ proto array imap_getmailboxes(resource stream_id, string ref, string pattern) /* {{{ Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */
Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */
/* Author: CJH */ /* Author: CJH */
PHP_FUNCTION(imap_getmailboxes) PHP_FUNCTION(imap_getmailboxes)
{ {
@ -1516,8 +1482,7 @@ PHP_FUNCTION(imap_getmailboxes)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_listscan(resource stream_id, string ref, string pattern, string content) /* {{{ Read list of mailboxes containing a certain string */
Read list of mailboxes containing a certain string */
PHP_FUNCTION(imap_listscan) PHP_FUNCTION(imap_listscan)
{ {
zval *streamind; zval *streamind;
@ -1551,8 +1516,7 @@ PHP_FUNCTION(imap_listscan)
/* }}} */ /* }}} */
/* {{{ proto object imap_check(resource stream_id) /* {{{ Get mailbox properties */
Get mailbox properties */
PHP_FUNCTION(imap_check) PHP_FUNCTION(imap_check)
{ {
zval *streamind; zval *streamind;
@ -1585,8 +1549,7 @@ PHP_FUNCTION(imap_check)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_delete(resource stream_id, int msg_no [, int options]) /* {{{ Mark a message for deletion */
Mark a message for deletion */
PHP_FUNCTION(imap_delete) PHP_FUNCTION(imap_delete)
{ {
zval *streamind, *sequence; zval *streamind, *sequence;
@ -1611,8 +1574,7 @@ PHP_FUNCTION(imap_delete)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_undelete(resource stream_id, int msg_no [, int flags]) /* {{{ Remove the delete flag from a message */
Remove the delete flag from a message */
PHP_FUNCTION(imap_undelete) PHP_FUNCTION(imap_undelete)
{ {
zval *streamind, *sequence; zval *streamind, *sequence;
@ -1637,8 +1599,7 @@ PHP_FUNCTION(imap_undelete)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_headerinfo(resource stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]]) /* {{{ Read the headers of the message */
Read the headers of the message */
PHP_FUNCTION(imap_headerinfo) PHP_FUNCTION(imap_headerinfo)
{ {
zval *streamind; zval *streamind;
@ -1722,8 +1683,7 @@ PHP_FUNCTION(imap_headerinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_rfc822_parse_headers(string headers [, string default_host]) /* {{{ Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */
Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */
PHP_FUNCTION(imap_rfc822_parse_headers) PHP_FUNCTION(imap_rfc822_parse_headers)
{ {
zend_string *headers, *defaulthost = NULL; zend_string *headers, *defaulthost = NULL;
@ -1748,8 +1708,7 @@ PHP_FUNCTION(imap_rfc822_parse_headers)
/* }}} */ /* }}} */
/* KMLANG */ /* KMLANG */
/* {{{ proto array imap_lsub(resource stream_id, string ref, string pattern) /* {{{ Return a list of subscribed mailboxes */
Return a list of subscribed mailboxes */
PHP_FUNCTION(imap_lsub) PHP_FUNCTION(imap_lsub)
{ {
zval *streamind; zval *streamind;
@ -1785,8 +1744,7 @@ PHP_FUNCTION(imap_lsub)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_getsubscribed(resource stream_id, string ref, string pattern) /* {{{ Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */
Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */
/* Author: CJH */ /* Author: CJH */
PHP_FUNCTION(imap_getsubscribed) PHP_FUNCTION(imap_getsubscribed)
{ {
@ -1836,8 +1794,7 @@ PHP_FUNCTION(imap_getsubscribed)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_subscribe(resource stream_id, string mailbox) /* {{{ Subscribe to a mailbox */
Subscribe to a mailbox */
PHP_FUNCTION(imap_subscribe) PHP_FUNCTION(imap_subscribe)
{ {
zval *streamind; zval *streamind;
@ -1860,8 +1817,7 @@ PHP_FUNCTION(imap_subscribe)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_unsubscribe(resource stream_id, string mailbox) /* {{{ Unsubscribe from a mailbox */
Unsubscribe from a mailbox */
PHP_FUNCTION(imap_unsubscribe) PHP_FUNCTION(imap_unsubscribe)
{ {
zval *streamind; zval *streamind;
@ -1884,8 +1840,7 @@ PHP_FUNCTION(imap_unsubscribe)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_fetchstructure(resource stream_id, int msg_no [, int options]) /* {{{ Read the full structure of a message */
Read the full structure of a message */
PHP_FUNCTION(imap_fetchstructure) PHP_FUNCTION(imap_fetchstructure)
{ {
zval *streamind; zval *streamind;
@ -1934,8 +1889,7 @@ PHP_FUNCTION(imap_fetchstructure)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchbody(resource stream_id, int msg_no, string section [, int options]) /* {{{ Get a specific body section */
Get a specific body section */
PHP_FUNCTION(imap_fetchbody) PHP_FUNCTION(imap_fetchbody)
{ {
zval *streamind; zval *streamind;
@ -1976,8 +1930,7 @@ PHP_FUNCTION(imap_fetchbody)
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchmime(resource stream_id, int msg_no, string section [, int options]) /* {{{ Get a specific body section's MIME headers */
Get a specific body section's MIME headers */
PHP_FUNCTION(imap_fetchmime) PHP_FUNCTION(imap_fetchmime)
{ {
zval *streamind; zval *streamind;
@ -2017,8 +1970,7 @@ PHP_FUNCTION(imap_fetchmime)
/* }}} */ /* }}} */
/* {{{ proto bool imap_savebody(resource stream_id, string|resource file, int msg_no[, string section = ""[, int options = 0]]) /* {{{ Save a specific body section to a file */
Save a specific body section to a file */
PHP_FUNCTION(imap_savebody) PHP_FUNCTION(imap_savebody)
{ {
zval *stream, *out; zval *stream, *out;
@ -2074,8 +2026,7 @@ PHP_FUNCTION(imap_savebody)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_base64(string text) /* {{{ Decode BASE64 encoded text */
Decode BASE64 encoded text */
PHP_FUNCTION(imap_base64) PHP_FUNCTION(imap_base64)
{ {
zend_string *text; zend_string *text;
@ -2097,8 +2048,7 @@ PHP_FUNCTION(imap_base64)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_qprint(string text) /* {{{ Convert a quoted-printable string to an 8-bit string */
Convert a quoted-printable string to an 8-bit string */
PHP_FUNCTION(imap_qprint) PHP_FUNCTION(imap_qprint)
{ {
zend_string *text; zend_string *text;
@ -2120,8 +2070,7 @@ PHP_FUNCTION(imap_qprint)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_8bit(string text) /* {{{ Convert an 8-bit string to a quoted-printable string */
Convert an 8-bit string to a quoted-printable string */
PHP_FUNCTION(imap_8bit) PHP_FUNCTION(imap_8bit)
{ {
zend_string *text; zend_string *text;
@ -2143,8 +2092,7 @@ PHP_FUNCTION(imap_8bit)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_binary(string text) /* {{{ Convert an 8bit string to a base64 string */
Convert an 8bit string to a base64 string */
PHP_FUNCTION(imap_binary) PHP_FUNCTION(imap_binary)
{ {
zend_string *text; zend_string *text;
@ -2166,8 +2114,7 @@ PHP_FUNCTION(imap_binary)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_mailboxmsginfo(resource stream_id) /* {{{ Returns info about the current mailbox */
Returns info about the current mailbox */
PHP_FUNCTION(imap_mailboxmsginfo) PHP_FUNCTION(imap_mailboxmsginfo)
{ {
zval *streamind; zval *streamind;
@ -2212,8 +2159,7 @@ PHP_FUNCTION(imap_mailboxmsginfo)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal) /* {{{ Returns a properly formatted email address given the mailbox, host, and personal info */
Returns a properly formatted email address given the mailbox, host, and personal info */
PHP_FUNCTION(imap_rfc822_write_address) PHP_FUNCTION(imap_rfc822_write_address)
{ {
zend_string *mailbox, *host, *personal; zend_string *mailbox, *host, *personal;
@ -2251,8 +2197,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host) /* {{{ Parses an address string */
Parses an address string */
PHP_FUNCTION(imap_rfc822_parse_adrlist) PHP_FUNCTION(imap_rfc822_parse_adrlist)
{ {
zval tovals; zval tovals;
@ -2297,8 +2242,7 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_utf8(string mime_encoded_text) /* {{{ Convert a mime-encoded text to UTF-8 */
Convert a mime-encoded text to UTF-8 */
PHP_FUNCTION(imap_utf8) PHP_FUNCTION(imap_utf8)
{ {
zend_string *str; zend_string *str;
@ -2350,8 +2294,7 @@ PHP_FUNCTION(imap_utf8)
(c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4) (c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4)
/* }}} */ /* }}} */
/* {{{ proto string imap_utf7_decode(string buf) /* {{{ Decode a modified UTF-7 string */
Decode a modified UTF-7 string */
PHP_FUNCTION(imap_utf7_decode) PHP_FUNCTION(imap_utf7_decode)
{ {
/* author: Andrew Skalski <askalski@chek.com> */ /* author: Andrew Skalski <askalski@chek.com> */
@ -2489,8 +2432,7 @@ PHP_FUNCTION(imap_utf7_decode)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_utf7_encode(string buf) /* {{{ Encode a string in modified UTF-7 */
Encode a string in modified UTF-7 */
PHP_FUNCTION(imap_utf7_encode) PHP_FUNCTION(imap_utf7_encode)
{ {
/* author: Andrew Skalski <askalski@chek.com> */ /* author: Andrew Skalski <askalski@chek.com> */
@ -2633,16 +2575,14 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_utf8_to_mutf7(string in) /* {{{ Encode a UTF-8 string to modified UTF-7 */
Encode a UTF-8 string to modified UTF-7 */
PHP_FUNCTION(imap_utf8_to_mutf7) PHP_FUNCTION(imap_utf8_to_mutf7)
{ {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_mutf7_to_utf8(string in) /* {{{ Decode a modified UTF-7 string to UTF-8 */
Decode a modified UTF-7 string to UTF-8 */
PHP_FUNCTION(imap_mutf7_to_utf8) PHP_FUNCTION(imap_mutf7_to_utf8)
{ {
php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@ -2650,8 +2590,7 @@ PHP_FUNCTION(imap_mutf7_to_utf8)
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, string flag [, int options]) /* {{{ Sets flags on messages */
Sets flags on messages */
PHP_FUNCTION(imap_setflag_full) PHP_FUNCTION(imap_setflag_full)
{ {
zval *streamind; zval *streamind;
@ -2672,8 +2611,7 @@ PHP_FUNCTION(imap_setflag_full)
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_clearflag_full(resource stream_id, string sequence, string flag [, int options]) /* {{{ Clears flags on messages */
Clears flags on messages */
PHP_FUNCTION(imap_clearflag_full) PHP_FUNCTION(imap_clearflag_full)
{ {
zval *streamind; zval *streamind;
@ -2695,8 +2633,7 @@ PHP_FUNCTION(imap_clearflag_full)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_sort(resource stream_id, int criteria, int reverse [, int options [, string search_criteria [, string charset]]]) /* {{{ Sort an array of message headers, optionally including only messages that meet specified criteria. */
Sort an array of message headers, optionally including only messages that meet specified criteria. */
PHP_FUNCTION(imap_sort) PHP_FUNCTION(imap_sort)
{ {
zval *streamind; zval *streamind;
@ -2756,8 +2693,7 @@ PHP_FUNCTION(imap_sort)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchheader(resource stream_id, int msg_no [, int options]) /* {{{ Get the full unfiltered header for a message */
Get the full unfiltered header for a message */
PHP_FUNCTION(imap_fetchheader) PHP_FUNCTION(imap_fetchheader)
{ {
zval *streamind; zval *streamind;
@ -2793,8 +2729,7 @@ PHP_FUNCTION(imap_fetchheader)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_uid(resource stream_id, int msg_no) /* {{{ Get the unique message id associated with a standard sequential message number */
Get the unique message id associated with a standard sequential message number */
PHP_FUNCTION(imap_uid) PHP_FUNCTION(imap_uid)
{ {
zval *streamind; zval *streamind;
@ -2820,8 +2755,7 @@ PHP_FUNCTION(imap_uid)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_msgno(resource stream_id, int unique_msg_id) /* {{{ Get the sequence number associated with a UID */
Get the sequence number associated with a UID */
PHP_FUNCTION(imap_msgno) PHP_FUNCTION(imap_msgno)
{ {
zval *streamind; zval *streamind;
@ -2840,8 +2774,7 @@ PHP_FUNCTION(imap_msgno)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_status(resource stream_id, string mailbox, int options) /* {{{ Get status info from a mailbox */
Get status info from a mailbox */
PHP_FUNCTION(imap_status) PHP_FUNCTION(imap_status)
{ {
zval *streamind; zval *streamind;
@ -2882,8 +2815,7 @@ PHP_FUNCTION(imap_status)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_bodystruct(resource stream_id, int msg_no, string section) /* {{{ Read the structure of a specified body section of a specific message */
Read the structure of a specified body section of a specific message */
PHP_FUNCTION(imap_bodystruct) PHP_FUNCTION(imap_bodystruct)
{ {
zval *streamind; zval *streamind;
@ -2995,8 +2927,7 @@ PHP_FUNCTION(imap_bodystruct)
/* }}} */ /* }}} */
/* {{{ proto array imap_fetch_overview(resource stream_id, string sequence [, int options]) /* {{{ Read an overview of the information in the headers of the given message sequence */
Read an overview of the information in the headers of the given message sequence */
PHP_FUNCTION(imap_fetch_overview) PHP_FUNCTION(imap_fetch_overview)
{ {
zval *streamind; zval *streamind;
@ -3081,8 +3012,7 @@ PHP_FUNCTION(imap_fetch_overview)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_mail_compose(array envelope, array body) /* {{{ Create a MIME message based on given envelope and body sections */
Create a MIME message based on given envelope and body sections */
PHP_FUNCTION(imap_mail_compose) PHP_FUNCTION(imap_mail_compose)
{ {
zval *envelope, *body; zval *envelope, *body;
@ -3479,8 +3409,7 @@ done:
} }
/* }}} */ /* }}} */
/* {{{ _php_imap_mail /* {{{ _php_imap_mail */
*/
int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath) int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath)
{ {
#ifdef PHP_WIN32 #ifdef PHP_WIN32
@ -3639,8 +3568,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
} }
/* }}} */ /* }}} */
/* {{{ proto bool imap_mail(string to, string subject, string message [, string additional_headers [, string cc [, string bcc [, string rpath]]]]) /* {{{ Send an email message */
Send an email message */
PHP_FUNCTION(imap_mail) PHP_FUNCTION(imap_mail)
{ {
zend_string *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL; zend_string *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL;
@ -3678,8 +3606,7 @@ PHP_FUNCTION(imap_mail)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_search(resource stream_id, string criteria [, int options [, string charset]]) /* {{{ Return a list of messages matching the given criteria */
Return a list of messages matching the given criteria */
PHP_FUNCTION(imap_search) PHP_FUNCTION(imap_search)
{ {
zval *streamind; zval *streamind;
@ -3727,8 +3654,7 @@ PHP_FUNCTION(imap_search)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_alerts(void) /* {{{ Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. */
Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. */
/* Author: CJH */ /* Author: CJH */
PHP_FUNCTION(imap_alerts) PHP_FUNCTION(imap_alerts)
{ {
@ -3754,8 +3680,7 @@ PHP_FUNCTION(imap_alerts)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_errors(void) /* {{{ Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called. */
Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called. */
/* Author: CJH */ /* Author: CJH */
PHP_FUNCTION(imap_errors) PHP_FUNCTION(imap_errors)
{ {
@ -3781,8 +3706,7 @@ PHP_FUNCTION(imap_errors)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_last_error(void) /* {{{ Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */
Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */
/* Author: CJH */ /* Author: CJH */
PHP_FUNCTION(imap_last_error) PHP_FUNCTION(imap_last_error)
{ {
@ -3806,8 +3730,7 @@ PHP_FUNCTION(imap_last_error)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_mime_header_decode(string str) /* {{{ Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */
Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */
PHP_FUNCTION(imap_mime_header_decode) PHP_FUNCTION(imap_mime_header_decode)
{ {
/* Author: Ted Parnefors <ted@mtv.se> */ /* Author: Ted Parnefors <ted@mtv.se> */
@ -3904,8 +3827,7 @@ PHP_FUNCTION(imap_mime_header_decode)
/* Support Functions */ /* Support Functions */
#ifdef HAVE_RFC822_OUTPUT_ADDRESS_LIST #ifdef HAVE_RFC822_OUTPUT_ADDRESS_LIST
/* {{{ _php_rfc822_soutr /* {{{ _php_rfc822_soutr */
*/
static long _php_rfc822_soutr (void *stream, char *string) static long _php_rfc822_soutr (void *stream, char *string)
{ {
smart_str *ret = (smart_str*)stream; smart_str *ret = (smart_str*)stream;
@ -3916,8 +3838,7 @@ static long _php_rfc822_soutr (void *stream, char *string)
} }
/* }}} */ /* }}} */
/* {{{ _php_rfc822_write_address /* {{{ _php_rfc822_write_address */
*/
static zend_string* _php_rfc822_write_address(ADDRESS *addresslist) static zend_string* _php_rfc822_write_address(ADDRESS *addresslist)
{ {
char address[MAILTMPLEN]; char address[MAILTMPLEN];
@ -3967,8 +3888,7 @@ static int _php_rfc822_len(char *str)
} }
/* }}} */ /* }}} */
/* {{{ _php_imap_get_address_size /* {{{ _php_imap_get_address_size */
*/
static int _php_imap_address_size (ADDRESS *addresslist) static int _php_imap_address_size (ADDRESS *addresslist)
{ {
ADDRESS *tmp; ADDRESS *tmp;
@ -3996,8 +3916,7 @@ static int _php_imap_address_size (ADDRESS *addresslist)
/* }}} */ /* }}} */
/* {{{ _php_rfc822_write_address /* {{{ _php_rfc822_write_address */
*/
static zend_string* _php_rfc822_write_address(ADDRESS *addresslist) static zend_string* _php_rfc822_write_address(ADDRESS *addresslist)
{ {
char address[SENDBUFLEN]; char address[SENDBUFLEN];
@ -4012,8 +3931,7 @@ static zend_string* _php_rfc822_write_address(ADDRESS *addresslist)
} }
/* }}} */ /* }}} */
#endif #endif
/* {{{ _php_imap_parse_address /* {{{ _php_imap_parse_address */
*/
static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress) static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress)
{ {
zend_string *fulladdress; zend_string *fulladdress;
@ -4037,8 +3955,7 @@ static zend_string* _php_imap_parse_address (ADDRESS *addresslist, zval *paddres
} }
/* }}} */ /* }}} */
/* {{{ _php_make_header_object /* {{{ _php_make_header_object */
*/
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en) static void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
{ {
zval paddress; zval paddress;
@ -4122,8 +4039,7 @@ static void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
} }
/* }}} */ /* }}} */
/* {{{ _php_imap_add_body /* {{{ _php_imap_add_body */
*/
void _php_imap_add_body(zval *arg, BODY *body) void _php_imap_add_body(zval *arg, BODY *body)
{ {
zval parametres, param, dparametres, dparam; zval parametres, param, dparametres, dparam;
@ -4236,8 +4152,7 @@ void _php_imap_add_body(zval *arg, BODY *body)
/* }}} */ /* }}} */
/* imap_thread, stealing this from header cclient -rjs3 */ /* imap_thread, stealing this from header cclient -rjs3 */
/* {{{ build_thread_tree_helper /* {{{ build_thread_tree_helper */
*/
static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes, char *buf) static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes, char *buf)
{ {
unsigned long thisNode = *numNodes; unsigned long thisNode = *numNodes;
@ -4267,8 +4182,7 @@ static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes
} }
/* }}} */ /* }}} */
/* {{{ build_thread_tree /* {{{ build_thread_tree */
*/
static int build_thread_tree(THREADNODE *top, zval **tree) static int build_thread_tree(THREADNODE *top, zval **tree)
{ {
long numNodes = 0; long numNodes = 0;
@ -4282,8 +4196,7 @@ static int build_thread_tree(THREADNODE *top, zval **tree)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_thread(resource stream_id [, int options]) /* {{{ Return threaded by REFERENCES tree */
Return threaded by REFERENCES tree */
PHP_FUNCTION(imap_thread) PHP_FUNCTION(imap_thread)
{ {
zval *streamind; zval *streamind;
@ -4322,8 +4235,7 @@ PHP_FUNCTION(imap_thread)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed imap_timeout(int timeout_type [, int timeout]) /* {{{ Set or fetch imap timeout */
Set or fetch imap timeout */
PHP_FUNCTION(imap_timeout) PHP_FUNCTION(imap_timeout)
{ {
zend_long ttype, timeout=-1; zend_long ttype, timeout=-1;
@ -4425,8 +4337,7 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA
} }
/* }}} */ /* }}} */
/* {{{ Interfaces to C-client /* {{{ Interfaces to C-client */
*/
PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number) PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
{ {
MESSAGELIST *cur = NIL; MESSAGELIST *cur = NIL;

24
ext/intl/collator/collator_attr.c
View file

@ -23,11 +23,7 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
/* {{{ proto int Collator::getAttribute( int $attr ) /* {{{ Get collation attribute value. */
* Get collation attribute value. }}} */
/* {{{ proto int collator_get_attribute( Collator $coll, int $attr )
* Get collation attribute value.
*/
PHP_FUNCTION( collator_get_attribute ) PHP_FUNCTION( collator_get_attribute )
{ {
zend_long attribute, value; zend_long attribute, value;
@ -51,11 +47,7 @@ PHP_FUNCTION( collator_get_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::getAttribute( int $attr ) /* {{{ Set collation attribute. */
* Get collation attribute value. }}} */
/* {{{ proto bool collator_set_attribute( Collator $coll, int $attr, int $val )
* Set collation attribute.
*/
PHP_FUNCTION( collator_set_attribute ) PHP_FUNCTION( collator_set_attribute )
{ {
zend_long attribute, value; zend_long attribute, value;
@ -80,11 +72,7 @@ PHP_FUNCTION( collator_set_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto int Collator::getStrength() /* {{{ Returns the current collation strength. */
* Returns the current collation strength. }}} */
/* {{{ proto int collator_get_strength(Collator coll)
* Returns the current collation strength.
*/
PHP_FUNCTION( collator_get_strength ) PHP_FUNCTION( collator_get_strength )
{ {
COLLATOR_METHOD_INIT_VARS COLLATOR_METHOD_INIT_VARS
@ -104,11 +92,7 @@ PHP_FUNCTION( collator_get_strength )
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::setStrength(int strength) /* {{{ Set the collation strength. */
* Set the collation strength. }}} */
/* {{{ proto bool collator_set_strength(Collator coll, int strength)
* Set the collation strength.
*/
PHP_FUNCTION( collator_set_strength ) PHP_FUNCTION( collator_set_strength )
{ {
zend_long strength; zend_long strength;

6
ext/intl/collator/collator_compare.c
View file

@ -21,11 +21,7 @@
#include "collator_class.h" #include "collator_class.h"
#include "intl_convert.h" #include "intl_convert.h"
/* {{{ proto int Collator::compare( string $str1, string $str2 ) /* {{{ Compare two strings. */
* Compare two strings. }}} */
/* {{{ proto int collator_compare( Collator $coll, string $str1, string $str2 )
* Compare two strings.
*/
PHP_FUNCTION( collator_compare ) PHP_FUNCTION( collator_compare )
{ {
char* str1 = NULL; char* str1 = NULL;

8
ext/intl/collator/collator_create.c
View file

@ -52,9 +52,7 @@ static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
} }
/* }}} */ /* }}} */
/* {{{ proto Collator collator_create( string $locale ) /* {{{ Create collator. */
* Create collator.
*/
PHP_FUNCTION( collator_create ) PHP_FUNCTION( collator_create )
{ {
object_init_ex( return_value, Collator_ce_ptr ); object_init_ex( return_value, Collator_ce_ptr );
@ -65,9 +63,7 @@ PHP_FUNCTION( collator_create )
} }
/* }}} */ /* }}} */
/* {{{ proto Collator::__construct( string $locale ) /* {{{ Collator object constructor. */
* Collator object constructor.
*/
PHP_METHOD( Collator, __construct ) PHP_METHOD( Collator, __construct )
{ {
zend_error_handling error_handling; zend_error_handling error_handling;

12
ext/intl/collator/collator_error.c
View file

@ -20,11 +20,7 @@
#include "php_intl.h" #include "php_intl.h"
#include "collator_class.h" #include "collator_class.h"
/* {{{ proto int Collator::getErrorCode( Collator $coll ) /* {{{ Get collator's last error code. */
* Get collator's last error code. }}} */
/* {{{ proto int collator_get_error_code( Collator $coll )
* Get collator's last error code.
*/
PHP_FUNCTION( collator_get_error_code ) PHP_FUNCTION( collator_get_error_code )
{ {
COLLATOR_METHOD_INIT_VARS COLLATOR_METHOD_INIT_VARS
@ -46,11 +42,7 @@ PHP_FUNCTION( collator_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string Collator::getErrorMessage( Collator $coll ) /* {{{ Get text description for collator's last error code. */
* Get text description for collator's last error code. }}} */
/* {{{ proto string collator_get_error_message( Collator $coll )
* Get text description for collator's last error code.
*/
PHP_FUNCTION( collator_get_error_message ) PHP_FUNCTION( collator_get_error_message )
{ {
zend_string* message = NULL; zend_string* message = NULL;

6
ext/intl/collator/collator_locale.c
View file

@ -23,11 +23,7 @@
#include <zend_API.h> #include <zend_API.h>
/* {{{ proto string Collator::getLocale( int $type ) /* {{{ Gets the locale name of the collator. */
* Gets the locale name of the collator. }}} */
/* {{{ proto string collator_get_locale( Collator $coll, int $type )
* Gets the locale name of the collator.
*/
PHP_FUNCTION( collator_get_locale ) PHP_FUNCTION( collator_get_locale )
{ {
zend_long type = 0; zend_long type = 0;

23
ext/intl/collator/collator_sort.c
View file

@ -326,11 +326,7 @@ static void collator_sort_internal( int renumber, INTERNAL_FUNCTION_PARAMETERS )
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::sort( Collator $coll, array(string) $arr [, int $sort_flags] ) /* {{{ Sort array using specified collator. */
* Sort array using specified collator. }}} */
/* {{{ proto bool collator_sort( Collator $coll, array(string) $arr [, int $sort_flags] )
* Sort array using specified collator.
*/
PHP_FUNCTION( collator_sort ) PHP_FUNCTION( collator_sort )
{ {
collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
@ -346,11 +342,9 @@ static void collator_sortkey_swap(collator_sort_key_index_t *p, collator_sort_ke
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::sortWithSortKeys( Collator $coll, array(string) $arr ) /* {{{ Equivalent to standard PHP sort using Collator.
* Equivalent to standard PHP sort using Collator.
* Uses ICU ucol_getSortKey for performance. }}} */ * Uses ICU ucol_getSortKey for performance. }}} */
/* {{{ proto bool collator_sort_with_sort_keys( Collator $coll, array(string) $arr ) /* {{{ Equivalent to standard PHP sort using Collator.
* Equivalent to standard PHP sort using Collator.
* Uses ICU ucol_getSortKey for performance. * Uses ICU ucol_getSortKey for performance.
*/ */
PHP_FUNCTION( collator_sort_with_sort_keys ) PHP_FUNCTION( collator_sort_with_sort_keys )
@ -517,21 +511,14 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::asort( Collator $coll, array(string) $arr ) /* {{{ Sort array using specified collator, maintaining index association. */
* Sort array using specified collator, maintaining index association. }}} */
/* {{{ proto bool collator_asort( Collator $coll, array(string) $arr )
* Sort array using specified collator, maintaining index association.
*/
PHP_FUNCTION( collator_asort ) PHP_FUNCTION( collator_asort )
{ {
collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto bool Collator::getSortKey( Collator $coll, string $str ) /* {{{ Get a sort key for a string from a Collator. */
* Get a sort key for a string from a Collator. }}} */
/* {{{ proto bool collator_get_sort_key( Collator $coll, string $str )
* Get a sort key for a string from a Collator. */
PHP_FUNCTION( collator_get_sort_key ) PHP_FUNCTION( collator_get_sort_key )
{ {
char* str = NULL; char* str = NULL;

14
ext/intl/common/common_error.c
View file

@ -21,9 +21,7 @@
#include "intl_error.h" #include "intl_error.h"
#include "common_error.h" #include "common_error.h"
/* {{{ proto int intl_get_error_code() /* {{{ Get code of the last occurred error. */
* Get code of the last occurred error.
*/
PHP_FUNCTION( intl_get_error_code ) PHP_FUNCTION( intl_get_error_code )
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -34,9 +32,7 @@ PHP_FUNCTION( intl_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string intl_get_error_message() /* {{{ Get text description of the last occurred error. */
* Get text description of the last occurred error.
*/
PHP_FUNCTION( intl_get_error_message ) PHP_FUNCTION( intl_get_error_message )
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -47,8 +43,7 @@ PHP_FUNCTION( intl_get_error_message )
} }
/* }}} */ /* }}} */
/* {{{ proto bool intl_is_failure() /* {{{ Check whether the given error code indicates a failure.
* Check whether the given error code indicates a failure.
* Returns true if it does, and false if the code * Returns true if it does, and false if the code
* indicates success or a warning. * indicates success or a warning.
*/ */
@ -67,8 +62,7 @@ PHP_FUNCTION( intl_is_failure )
} }
/* }}} */ /* }}} */
/* {{{ proto string intl_error_name() /* {{{ Return a string for a given error code.
* Return a string for a given error code.
* The string will be the same as the name of the error code constant. * The string will be the same as the name of the error code constant.
*/ */
PHP_FUNCTION( intl_error_name ) PHP_FUNCTION( intl_error_name )

42
ext/intl/converter/converter.c
View file

@ -103,9 +103,7 @@ static void php_converter_default_callback(zval *return_value, zval *zobj, zend_
} }
/* }}} */ /* }}} */
/* {{{ proto void UConverter::toUCallback(int $reason, /* {{{ */
string $source, string $codeUnits,
int &$error) */
PHP_METHOD(UConverter, toUCallback) { PHP_METHOD(UConverter, toUCallback) {
zend_long reason; zend_long reason;
zend_string *source, *codeUnits; zend_string *source, *codeUnits;
@ -120,9 +118,7 @@ PHP_METHOD(UConverter, toUCallback) {
} }
/* }}} */ /* }}} */
/* {{{ proto void UConverter::fromUCallback(int $reason, /* {{{ */
array $source, int $codePoint,
int &$error) */
PHP_METHOD(UConverter, fromUCallback) { PHP_METHOD(UConverter, fromUCallback) {
zend_long reason; zend_long reason;
zval *source, *error; zval *source, *error;
@ -418,14 +414,14 @@ static void php_converter_do_set_encoding(UConverter **pcnv, INTERNAL_FUNCTION_P
} }
/* }}} */ /* }}} */
/* {{{ proto bool UConverter::setSourceEncoding(string encoding) */ /* {{{ */
PHP_METHOD(UConverter, setSourceEncoding) { PHP_METHOD(UConverter, setSourceEncoding) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_set_encoding(&(objval->src), INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_set_encoding(&(objval->src), INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto bool UConverter::setDestinationEncoding(string encoding) */ /* {{{ */
PHP_METHOD(UConverter, setDestinationEncoding) { PHP_METHOD(UConverter, setDestinationEncoding) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_set_encoding(&(objval->dest), INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_set_encoding(&(objval->dest), INTERNAL_FUNCTION_PARAM_PASSTHRU);
@ -456,14 +452,14 @@ static void php_converter_do_get_encoding(php_converter_object *objval, UConvert
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::getSourceEncoding() */ /* {{{ */
PHP_METHOD(UConverter, getSourceEncoding) { PHP_METHOD(UConverter, getSourceEncoding) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_get_encoding(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_get_encoding(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::getDestinationEncoding() */ /* {{{ */
PHP_METHOD(UConverter, getDestinationEncoding) { PHP_METHOD(UConverter, getDestinationEncoding) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_get_encoding(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_get_encoding(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU);
@ -493,14 +489,14 @@ static void php_converter_do_get_type(php_converter_object *objval, UConverter *
} }
/* }}} */ /* }}} */
/* {{{ proto int UConverter::getSourceType() */ /* {{{ */
PHP_METHOD(UConverter, getSourceType) { PHP_METHOD(UConverter, getSourceType) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_get_type(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_get_type(objval, objval->src, INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */
/* {{{ proto int UConverter::getDestinationType() */ /* {{{ */
PHP_METHOD(UConverter, getDestinationType) { PHP_METHOD(UConverter, getDestinationType) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
php_converter_do_get_type(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU); php_converter_do_get_type(objval, objval->dest, INTERNAL_FUNCTION_PARAM_PASSTHRU);
@ -531,7 +527,7 @@ static void php_converter_resolve_callback(zval *zobj,
} }
/* }}} */ /* }}} */
/* {{{ proto UConverter::__construct([string dest = 'utf-8',[string src = 'utf-8']]) */ /* {{{ */
PHP_METHOD(UConverter, __construct) { PHP_METHOD(UConverter, __construct) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
char *src = "utf-8"; char *src = "utf-8";
@ -552,7 +548,7 @@ PHP_METHOD(UConverter, __construct) {
} }
/* }}} */ /* }}} */
/* {{{ proto bool UConverter::setSubstChars(string $chars) */ /* {{{ */
PHP_METHOD(UConverter, setSubstChars) { PHP_METHOD(UConverter, setSubstChars) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
char *chars; char *chars;
@ -592,7 +588,7 @@ PHP_METHOD(UConverter, setSubstChars) {
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::getSubstChars() */ /* {{{ */
PHP_METHOD(UConverter, getSubstChars) { PHP_METHOD(UConverter, getSubstChars) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
char chars[127]; char chars[127];
@ -679,7 +675,7 @@ static zend_string* php_converter_do_convert(UConverter *dest_cnv,
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::reasonText(int reason) */ /* {{{ */
#define UCNV_REASON_CASE(v) case (UCNV_ ## v) : RETURN_STRINGL( "REASON_" #v , sizeof( "REASON_" #v ) - 1); #define UCNV_REASON_CASE(v) case (UCNV_ ## v) : RETURN_STRINGL( "REASON_" #v , sizeof( "REASON_" #v ) - 1);
PHP_METHOD(UConverter, reasonText) { PHP_METHOD(UConverter, reasonText) {
zend_long reason; zend_long reason;
@ -703,7 +699,7 @@ PHP_METHOD(UConverter, reasonText) {
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::convert(string str[, bool reverse]) */ /* {{{ */
PHP_METHOD(UConverter, convert) { PHP_METHOD(UConverter, convert) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
char *str; char *str;
@ -729,7 +725,7 @@ PHP_METHOD(UConverter, convert) {
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::transcode(string $str, string $toEncoding, string $fromEncoding[, Array $options = array()]) */ /* {{{ */
PHP_METHOD(UConverter, transcode) { PHP_METHOD(UConverter, transcode) {
char *str, *src, *dest; char *str, *src, *dest;
size_t str_len, src_len, dest_len; size_t str_len, src_len, dest_len;
@ -786,7 +782,7 @@ PHP_METHOD(UConverter, transcode) {
} }
/* }}} */ /* }}} */
/* {{{ proto int UConverter::getErrorCode() */ /* {{{ */
PHP_METHOD(UConverter, getErrorCode) { PHP_METHOD(UConverter, getErrorCode) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
@ -798,7 +794,7 @@ PHP_METHOD(UConverter, getErrorCode) {
} }
/* }}} */ /* }}} */
/* {{{ proto string UConverter::getErrorMessage() */ /* {{{ */
PHP_METHOD(UConverter, getErrorMessage) { PHP_METHOD(UConverter, getErrorMessage) {
php_converter_object *objval = CONV_GET(ZEND_THIS); php_converter_object *objval = CONV_GET(ZEND_THIS);
zend_string *message = intl_error_get_message(&(objval->error)); zend_string *message = intl_error_get_message(&(objval->error));
@ -815,7 +811,7 @@ PHP_METHOD(UConverter, getErrorMessage) {
} }
/* }}} */ /* }}} */
/* {{{ proto array UConverter::getAvailable() */ /* {{{ */
PHP_METHOD(UConverter, getAvailable) { PHP_METHOD(UConverter, getAvailable) {
int32_t i, int32_t i,
count = ucnv_countAvailable(); count = ucnv_countAvailable();
@ -833,7 +829,7 @@ PHP_METHOD(UConverter, getAvailable) {
} }
/* }}} */ /* }}} */
/* {{{ proto array UConverter::getAliases(string name) */ /* {{{ */
PHP_METHOD(UConverter, getAliases) { PHP_METHOD(UConverter, getAliases) {
char *name; char *name;
size_t name_len; size_t name_len;
@ -867,7 +863,7 @@ PHP_METHOD(UConverter, getAliases) {
} }
/* }}} */ /* }}} */
/* {{{ proto array UConverter::getStandards() */ /* {{{ */
PHP_METHOD(UConverter, getStandards) { PHP_METHOD(UConverter, getStandards) {
uint16_t i, count; uint16_t i, count;

12
ext/intl/dateformat/dateformat.c
View file

@ -66,11 +66,7 @@ void dateformat_register_constants( INIT_FUNC_ARGS )
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlDateFormatter::getErrorCode() /* {{{ Get formatter's last error code. */
* Get formatter's last error code. }}} */
/* {{{ proto int datefmt_get_error_code( IntlDateFormatter $nf )
* Get formatter's last error code.
*/
PHP_FUNCTION( datefmt_get_error_code ) PHP_FUNCTION( datefmt_get_error_code )
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -89,11 +85,7 @@ PHP_FUNCTION( datefmt_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlDateFormatter::getErrorMessage( ) /* {{{ Get text description for formatter's last error code. */
* Get text description for formatter's last error code. }}} */
/* {{{ proto string datefmt_get_error_message( IntlDateFormatter $coll )
* Get text description for formatter's last error code.
*/
PHP_FUNCTION( datefmt_get_error_message ) PHP_FUNCTION( datefmt_get_error_message )
{ {
zend_string *message = NULL; zend_string *message = NULL;

42
ext/intl/dateformat/dateformat_attr.c
View file

@ -23,11 +23,7 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <unicode/udat.h> #include <unicode/udat.h>
/* {{{ proto unicode IntlDateFormatter::getDateType( ) /* {{{ Get formatter datetype. */
* Get formatter datetype. }}} */
/* {{{ proto string datefmt_get_datetype( IntlDateFormatter $mf )
* Get formatter datetype.
*/
PHP_FUNCTION( datefmt_get_datetype ) PHP_FUNCTION( datefmt_get_datetype )
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -47,11 +43,7 @@ PHP_FUNCTION( datefmt_get_datetype )
} }
/* }}} */ /* }}} */
/* {{{ proto unicode IntlDateFormatter::getTimeType( ) /* {{{ Get formatter timetype. */
* Get formatter timetype. }}} */
/* {{{ proto string datefmt_get_timetype( IntlDateFormatter $mf )
* Get formatter timetype.
*/
PHP_FUNCTION( datefmt_get_timetype ) PHP_FUNCTION( datefmt_get_timetype )
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -71,11 +63,7 @@ PHP_FUNCTION( datefmt_get_timetype )
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlDateFormatter::getPattern( ) /* {{{ Get formatter pattern. */
* Get formatter pattern. }}} */
/* {{{ proto string datefmt_get_pattern( IntlDateFormatter $mf )
* Get formatter pattern.
*/
PHP_FUNCTION( datefmt_get_pattern ) PHP_FUNCTION( datefmt_get_pattern )
{ {
UChar value_buf[64]; UChar value_buf[64];
@ -111,11 +99,7 @@ PHP_FUNCTION( datefmt_get_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto bool IntlDateFormatter::setPattern( string $pattern ) /* {{{ Set formatter pattern. */
* Set formatter pattern. }}} */
/* {{{ proto bool datefmt_set_pattern( IntlDateFormatter $mf, string $pattern )
* Set formatter pattern.
*/
PHP_FUNCTION( datefmt_set_pattern ) PHP_FUNCTION( datefmt_set_pattern )
{ {
char* value = NULL; char* value = NULL;
@ -151,11 +135,7 @@ PHP_FUNCTION( datefmt_set_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlDateFormatter::getLocale() /* {{{ Get formatter locale. */
* Get formatter locale. }}} */
/* {{{ proto string datefmt_get_locale(IntlDateFormatter $mf)
* Get formatter locale.
*/
PHP_FUNCTION( datefmt_get_locale ) PHP_FUNCTION( datefmt_get_locale )
{ {
char *loc; char *loc;
@ -180,11 +160,7 @@ PHP_FUNCTION( datefmt_get_locale )
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlDateFormatter::isLenient() /* {{{ Get formatter isLenient. */
* Get formatter isLenient. }}} */
/* {{{ proto string datefmt_isLenient(IntlDateFormatter $mf)
* Get formatter locale.
*/
PHP_FUNCTION( datefmt_is_lenient ) PHP_FUNCTION( datefmt_is_lenient )
{ {
@ -205,11 +181,7 @@ PHP_FUNCTION( datefmt_is_lenient )
} }
/* }}} */ /* }}} */
/* {{{ proto void IntlDateFormatter::setLenient() /* {{{ Set formatter lenient. */
* Set formatter lenient. }}} */
/* {{{ proto void datefmt_setLenient(IntlDateFormatter $mf)
* Set formatter lenient.
*/
PHP_FUNCTION( datefmt_set_lenient ) PHP_FUNCTION( datefmt_set_lenient )
{ {
zend_bool isLenient = FALSE; zend_bool isLenient = FALSE;

33
ext/intl/dateformat/dateformat_attrcpp.cpp
View file

@ -34,11 +34,7 @@ static inline DateFormat *fetch_datefmt(IntlDateFormatter_object *dfo) {
return (DateFormat *)dfo->datef_data.udatf; return (DateFormat *)dfo->datef_data.udatf;
} }
/* {{{ proto string IntlDateFormatter::getTimeZoneId() /* {{{ Get formatter timezone_id. */
* Get formatter timezone_id. }}} */
/* {{{ proto string datefmt_get_timezone_id(IntlDateFormatter $mf)
* Get formatter timezone_id.
*/
U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id) U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
{ {
zend_string *u8str; zend_string *u8str;
@ -59,11 +55,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
RETVAL_STR(u8str); RETVAL_STR(u8str);
} }
/* {{{ proto IntlTimeZone IntlDateFormatter::getTimeZone() /* {{{ Get formatter timezone. */
* Get formatter timezone. }}} */
/* {{{ proto IntlTimeZone datefmt_get_timezone(IntlDateFormatter $mf)
* Get formatter timezone.
*/
U_CFUNC PHP_FUNCTION(datefmt_get_timezone) U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -87,8 +79,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
timezone_object_construct(tz_clone, return_value, 1); timezone_object_construct(tz_clone, return_value, 1);
} }
/* {{{ proto boolean IntlDateFormatter::setTimeZone(mixed $timezone) /* {{{ Set formatter's timezone. */
* Set formatter's timezone. */
U_CFUNC PHP_FUNCTION(datefmt_set_timezone) U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
{ {
zval *timezone_zv; zval *timezone_zv;
@ -112,11 +103,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
fetch_datefmt(dfo)->adoptTimeZone(timezone); fetch_datefmt(dfo)->adoptTimeZone(timezone);
} }
/* {{{ proto int IntlDateFormatter::getCalendar( ) /* {{{ Get formatter calendar type. */
* Get formatter calendar type. }}} */
/* {{{ proto int datefmt_get_calendar(IntlDateFormatter $mf)
* Get formatter calendar type.
*/
U_CFUNC PHP_FUNCTION(datefmt_get_calendar) U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -137,11 +124,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
} }
/* }}} */ /* }}} */
/* {{{ proto IntlCalendar IntlDateFormatter::getCalendarObject() /* {{{ Get formatter calendar. */
* Get formatter calendar. }}} */
/* {{{ proto IntlCalendar datefmt_get_calendar_object(IntlDateFormatter $mf)
* Get formatter calendar.
*/
U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object) U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
{ {
DATE_FORMAT_METHOD_INIT_VARS; DATE_FORMAT_METHOD_INIT_VARS;
@ -170,11 +153,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
} }
/* }}} */ /* }}} */
/* {{{ proto bool IntlDateFormatter::setCalendar(mixed $calendar) /* {{{ Set formatter's calendar. */
* Set formatter's calendar. }}} */
/* {{{ proto bool datefmt_set_calendar(IntlDateFormatter $mf, mixed $calendar)
* Set formatter's calendar.
*/
U_CFUNC PHP_FUNCTION(datefmt_set_calendar) U_CFUNC PHP_FUNCTION(datefmt_set_calendar)
{ {
zval *calendar_zv; zval *calendar_zv;

10
ext/intl/dateformat/dateformat_create.cpp
View file

@ -179,11 +179,7 @@ error:
} }
/* }}} */ /* }}} */
/* {{{ proto IntlDateFormatter IntlDateFormatter::create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern] ) /* {{{ Create formatter. */
* Create formatter. }}} */
/* {{{ proto IntlDateFormatter datefmt_create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern)
* Create formatter.
*/
U_CFUNC PHP_FUNCTION( datefmt_create ) U_CFUNC PHP_FUNCTION( datefmt_create )
{ {
object_init_ex( return_value, IntlDateFormatter_ce_ptr ); object_init_ex( return_value, IntlDateFormatter_ce_ptr );
@ -194,9 +190,7 @@ U_CFUNC PHP_FUNCTION( datefmt_create )
} }
/* }}} */ /* }}} */
/* {{{ proto void IntlDateFormatter::__construct(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern]) /* {{{ IntlDateFormatter object constructor. */
* IntlDateFormatter object constructor.
*/
U_CFUNC PHP_METHOD( IntlDateFormatter, __construct ) U_CFUNC PHP_METHOD( IntlDateFormatter, __construct )
{ {
zend_error_handling error_handling; zend_error_handling error_handling;

17
ext/intl/dateformat/dateformat_format.c
View file

@ -27,9 +27,7 @@
#include "dateformat_class.h" #include "dateformat_class.h"
#include "dateformat_data.h" #include "dateformat_data.h"
/* {{{ /* {{{ * Internal function which calls the udat_format */
* Internal function which calls the udat_format
*/
static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval *return_value) static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval *return_value)
{ {
UChar* formatted = NULL; UChar* formatted = NULL;
@ -54,9 +52,7 @@ static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval
/* }}} */ /* }}} */
/* {{{ /* {{{ * Internal function which fetches an element from the passed array for the key_name passed */
* Internal function which fetches an element from the passed array for the key_name passed
*/
static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo, static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
HashTable* hash_arr, char* key_name, intl_error *err) HashTable* hash_arr, char* key_name, intl_error *err)
{ {
@ -92,9 +88,7 @@ static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
} }
/* }}} */ /* }}} */
/* {{{ /* {{{ * Internal function which sets UCalendar from the passed array and retrieves timestamp */
* Internal function which sets UCalendar from the passed array and retrieves timestamp
*/
static UDate internal_get_timestamp(IntlDateFormatter_object *dfo, static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
HashTable *hash_arr) HashTable *hash_arr)
{ {
@ -143,10 +137,7 @@ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
} }
/* {{{ proto string IntlDateFormatter::format( [mixed]int $args or array $args ) /* {{{ Format the time value as a string. */
* Format the time value as a string. }}}*/
/* {{{ proto string datefmt_format( [mixed]int $args or array $args )
* Format the time value as a string. }}}*/
PHP_FUNCTION(datefmt_format) PHP_FUNCTION(datefmt_format)
{ {
UDate timestamp = 0; UDate timestamp = 0;

14
ext/intl/dateformat/dateformat_parse.c
View file

@ -75,9 +75,7 @@ static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_va
} }
} }
/* {{{ /* {{{ * Internal function which calls the udat_parseCalendar */
* Internal function which calls the udat_parseCalendar
*/
static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* text_to_parse, size_t text_len, int32_t *parse_pos, zval *return_value) static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* text_to_parse, size_t text_len, int32_t *parse_pos, zval *return_value)
{ {
UCalendar *parsed_calendar = NULL; UCalendar *parsed_calendar = NULL;
@ -118,10 +116,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex
/* }}} */ /* }}} */
/* {{{ proto int IntlDateFormatter::parse( string $text_to_parse [, int $parse_pos] ) /* {{{ Parse the string $value starting at parse_pos to a Unix timestamp -int */
* Parse the string $value starting at parse_pos to a Unix timestamp -int }}}*/
/* {{{ proto int datefmt_parse( IntlDateFormatter $fmt, string $text_to_parse [, int $parse_pos] )
* Parse the string $value starting at parse_pos to a Unix timestamp -int }}}*/
PHP_FUNCTION(datefmt_parse) PHP_FUNCTION(datefmt_parse)
{ {
char* text_to_parse = NULL; char* text_to_parse = NULL;
@ -162,10 +157,7 @@ PHP_FUNCTION(datefmt_parse)
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlDateFormatter::localtime( string $text_to_parse[, int $parse_pos] ) /* {{{ Parse the string $value to a localtime array */
* Parse the string $value to a localtime array }}}*/
/* {{{ proto int datefmt_localtime( IntlDateFormatter $fmt, string $text_to_parse[, int $parse_pos ])
* Parse the string $value to a localtime array }}}*/
PHP_FUNCTION(datefmt_localtime) PHP_FUNCTION(datefmt_localtime)
{ {
char* text_to_parse = NULL; char* text_to_parse = NULL;

54
ext/intl/formatter/formatter_attr.c
View file

@ -22,11 +22,7 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
/* {{{ proto mixed NumberFormatter::getAttribute( int $attr ) /* {{{ Get formatter attribute value. */
* Get formatter attribute value. }}} */
/* {{{ proto mixed numfmt_get_attribute( NumberFormatter $nf, int $attr )
* Get formatter attribute value.
*/
PHP_FUNCTION( numfmt_get_attribute ) PHP_FUNCTION( numfmt_get_attribute )
{ {
zend_long attribute, value; zend_long attribute, value;
@ -88,11 +84,7 @@ PHP_FUNCTION( numfmt_get_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto string NumberFormatter::getTextAttribute( int $attr ) /* {{{ Get formatter attribute value. */
* Get formatter attribute value. }}} */
/* {{{ proto string numfmt_get_text_attribute( NumberFormatter $nf, int $attr )
* Get formatter attribute value.
*/
PHP_FUNCTION( numfmt_get_text_attribute ) PHP_FUNCTION( numfmt_get_text_attribute )
{ {
zend_long attribute; zend_long attribute;
@ -129,11 +121,7 @@ PHP_FUNCTION( numfmt_get_text_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto bool NumberFormatter::setAttribute( int $attr, mixed $value ) /* {{{ Get formatter attribute value. */
* Get formatter attribute value. }}} */
/* {{{ proto bool numfmt_set_attribute( NumberFormatter $nf, int $attr, mixed $value )
* Get formatter attribute value.
*/
PHP_FUNCTION( numfmt_set_attribute ) PHP_FUNCTION( numfmt_set_attribute )
{ {
zend_long attribute; zend_long attribute;
@ -186,11 +174,7 @@ PHP_FUNCTION( numfmt_set_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto bool NumberFormatter::setTextAttribute( int $attr, string $value ) /* {{{ Get formatter attribute value. */
* Get formatter attribute value. }}} */
/* {{{ proto bool numfmt_set_text_attribute( NumberFormatter $nf, int $attr, string $value )
* Get formatter attribute value.
*/
PHP_FUNCTION( numfmt_set_text_attribute ) PHP_FUNCTION( numfmt_set_text_attribute )
{ {
int32_t slength = 0; int32_t slength = 0;
@ -225,11 +209,7 @@ PHP_FUNCTION( numfmt_set_text_attribute )
} }
/* }}} */ /* }}} */
/* {{{ proto string NumberFormatter::getSymbol( int $attr ) /* {{{ Get formatter symbol value. */
* Get formatter symbol value. }}} */
/* {{{ proto string numfmt_get_symbol( NumberFormatter $nf, int $attr )
* Get formatter symbol value.
*/
PHP_FUNCTION( numfmt_get_symbol ) PHP_FUNCTION( numfmt_get_symbol )
{ {
zend_long symbol; zend_long symbol;
@ -270,11 +250,7 @@ PHP_FUNCTION( numfmt_get_symbol )
} }
/* }}} */ /* }}} */
/* {{{ proto bool NumberFormatter::setSymbol( int $attr, string $symbol ) /* {{{ Set formatter symbol value. */
* Set formatter symbol value. }}} */
/* {{{ proto bool numfmt_set_symbol( NumberFormatter $nf, int $attr, string $symbol )
* Set formatter symbol value.
*/
PHP_FUNCTION( numfmt_set_symbol ) PHP_FUNCTION( numfmt_set_symbol )
{ {
zend_long symbol; zend_long symbol;
@ -314,11 +290,7 @@ PHP_FUNCTION( numfmt_set_symbol )
} }
/* }}} */ /* }}} */
/* {{{ proto string NumberFormatter::getPattern( ) /* {{{ Get formatter pattern. */
* Get formatter pattern. }}} */
/* {{{ proto string numfmt_get_pattern( NumberFormatter $nf )
* Get formatter pattern.
*/
PHP_FUNCTION( numfmt_get_pattern ) PHP_FUNCTION( numfmt_get_pattern )
{ {
UChar value_buf[64]; UChar value_buf[64];
@ -353,11 +325,7 @@ PHP_FUNCTION( numfmt_get_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto bool NumberFormatter::setPattern( string $pattern ) /* {{{ Set formatter pattern. */
* Set formatter pattern. }}} */
/* {{{ proto bool numfmt_set_pattern( NumberFormatter $nf, string $pattern )
* Set formatter pattern.
*/
PHP_FUNCTION( numfmt_set_pattern ) PHP_FUNCTION( numfmt_set_pattern )
{ {
char* value = NULL; char* value = NULL;
@ -390,11 +358,7 @@ PHP_FUNCTION( numfmt_set_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto string NumberFormatter::getLocale([int type]) /* {{{ Get formatter locale. */
* Get formatter locale. }}} */
/* {{{ proto string numfmt_get_locale( NumberFormatter $nf[, int type] )
* Get formatter locale.
*/
PHP_FUNCTION( numfmt_get_locale ) PHP_FUNCTION( numfmt_get_locale )
{ {
zend_long type = ULOC_ACTUAL_LOCALE; zend_long type = ULOC_ACTUAL_LOCALE;

12
ext/intl/formatter/formatter_format.c
View file

@ -24,11 +24,7 @@
#include "formatter_format.h" #include "formatter_format.h"
#include "intl_convert.h" #include "intl_convert.h"
/* {{{ proto mixed NumberFormatter::format( mixed $num[, int $type] ) /* {{{ Format a number. */
* Format a number. }}} */
/* {{{ proto mixed numfmt_format( NumberFormatter $nf, mixed $num[, int type] )
* Format a number.
*/
PHP_FUNCTION( numfmt_format ) PHP_FUNCTION( numfmt_format )
{ {
zval *number; zval *number;
@ -118,11 +114,7 @@ PHP_FUNCTION( numfmt_format )
} }
/* }}} */ /* }}} */
/* {{{ proto mixed NumberFormatter::formatCurrency( double $num, string $currency ) /* {{{ Format a number as currency. */
* Format a number as currency. }}} */
/* {{{ proto mixed numfmt_format_currency( NumberFormatter $nf, double $num, string $currency )
* Format a number as currency.
*/
PHP_FUNCTION( numfmt_format_currency ) PHP_FUNCTION( numfmt_format_currency )
{ {
double number; double number;

22
ext/intl/formatter/formatter_main.c
View file

@ -66,11 +66,7 @@ static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
} }
/* }}} */ /* }}} */
/* {{{ proto NumberFormatter NumberFormatter::create( string $locale, int style[, string $pattern ] ) /* {{{ Create number formatter. */
* Create number formatter. }}} */
/* {{{ proto NumberFormatter numfmt_create( string $locale, int style[, string $pattern ] )
* Create number formatter.
*/
PHP_FUNCTION( numfmt_create ) PHP_FUNCTION( numfmt_create )
{ {
object_init_ex( return_value, NumberFormatter_ce_ptr ); object_init_ex( return_value, NumberFormatter_ce_ptr );
@ -81,9 +77,7 @@ PHP_FUNCTION( numfmt_create )
} }
/* }}} */ /* }}} */
/* {{{ proto NumberFormatter::__construct( string $locale, int style[, string $pattern ] ) /* {{{ NumberFormatter object constructor. */
* NumberFormatter object constructor.
*/
PHP_METHOD( NumberFormatter, __construct ) PHP_METHOD( NumberFormatter, __construct )
{ {
zend_error_handling error_handling; zend_error_handling error_handling;
@ -99,11 +93,7 @@ PHP_METHOD( NumberFormatter, __construct )
} }
/* }}} */ /* }}} */
/* {{{ proto int NumberFormatter::getErrorCode() /* {{{ Get formatter's last error code. */
* Get formatter's last error code. }}} */
/* {{{ proto int numfmt_get_error_code( NumberFormatter $nf )
* Get formatter's last error code.
*/
PHP_FUNCTION( numfmt_get_error_code ) PHP_FUNCTION( numfmt_get_error_code )
{ {
FORMATTER_METHOD_INIT_VARS FORMATTER_METHOD_INIT_VARS
@ -122,11 +112,7 @@ PHP_FUNCTION( numfmt_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string NumberFormatter::getErrorMessage( ) /* {{{ Get text description for formatter's last error code. */
* Get text description for formatter's last error code. }}} */
/* {{{ proto string numfmt_get_error_message( NumberFormatter $nf )
* Get text description for formatter's last error code.
*/
PHP_FUNCTION( numfmt_get_error_message ) PHP_FUNCTION( numfmt_get_error_message )
{ {
zend_string *message = NULL; zend_string *message = NULL;

12
ext/intl/formatter/formatter_parse.c
View file

@ -27,11 +27,7 @@
#define ICU_LOCALE_BUG 1 #define ICU_LOCALE_BUG 1
/* {{{ proto mixed NumberFormatter::parse( string $str[, int $type, int &$position ]) /* {{{ Parse a number. */
* Parse a number. }}} */
/* {{{ proto mixed numfmt_parse( NumberFormatter $nf, string $str[, int $type, int &$position ])
* Parse a number.
*/
PHP_FUNCTION( numfmt_parse ) PHP_FUNCTION( numfmt_parse )
{ {
zend_long type = FORMAT_TYPE_DOUBLE; zend_long type = FORMAT_TYPE_DOUBLE;
@ -110,11 +106,7 @@ PHP_FUNCTION( numfmt_parse )
} }
/* }}} */ /* }}} */
/* {{{ proto float NumberFormatter::parseCurrency( string $str, string &$currency[, int &$position] ) /* {{{ Parse a number as currency. */
* Parse a number as currency. }}} */
/* {{{ proto float numfmt_parse_currency( NumberFormatter $nf, string $str, string &$currency[, int &$position] )
* Parse a number as currency.
*/
PHP_FUNCTION( numfmt_parse_currency ) PHP_FUNCTION( numfmt_parse_currency )
{ {
double number; double number;

27
ext/intl/grapheme/grapheme_string.c
View file

@ -49,8 +49,7 @@ void grapheme_register_constants( INIT_FUNC_ARGS )
} }
/* }}} */ /* }}} */
/* {{{ proto size_t grapheme_strlen(string str) /* {{{ Get number of graphemes in a string */
Get number of graphemes in a string */
PHP_FUNCTION(grapheme_strlen) PHP_FUNCTION(grapheme_strlen)
{ {
char* string; char* string;
@ -99,8 +98,7 @@ PHP_FUNCTION(grapheme_strlen)
} }
/* }}} */ /* }}} */
/* {{{ proto int grapheme_strpos(string haystack, string needle [, int offset ]) /* {{{ Find position of first occurrence of a string within another */
Find position of first occurrence of a string within another */
PHP_FUNCTION(grapheme_strpos) PHP_FUNCTION(grapheme_strpos)
{ {
char *haystack, *needle; char *haystack, *needle;
@ -160,8 +158,7 @@ PHP_FUNCTION(grapheme_strpos)
} }
/* }}} */ /* }}} */
/* {{{ proto int grapheme_stripos(string haystack, string needle [, int offset ]) /* {{{ Find position of first occurrence of a string within another, ignoring case differences */
Find position of first occurrence of a string within another, ignoring case differences */
PHP_FUNCTION(grapheme_stripos) PHP_FUNCTION(grapheme_stripos)
{ {
char *haystack, *needle; char *haystack, *needle;
@ -228,8 +225,7 @@ PHP_FUNCTION(grapheme_stripos)
} }
/* }}} */ /* }}} */
/* {{{ proto int grapheme_strrpos(string haystack, string needle [, int offset]) /* {{{ Find position of last occurrence of a string within another */
Find position of last occurrence of a string within another */
PHP_FUNCTION(grapheme_strrpos) PHP_FUNCTION(grapheme_strrpos)
{ {
char *haystack, *needle; char *haystack, *needle;
@ -289,8 +285,7 @@ PHP_FUNCTION(grapheme_strrpos)
} }
/* }}} */ /* }}} */
/* {{{ proto int grapheme_strripos(string haystack, string needle [, int offset]) /* {{{ Find position of last occurrence of a string within another, ignoring case */
Find position of last occurrence of a string within another, ignoring case */
PHP_FUNCTION(grapheme_strripos) PHP_FUNCTION(grapheme_strripos)
{ {
char *haystack, *needle; char *haystack, *needle;
@ -359,8 +354,7 @@ PHP_FUNCTION(grapheme_strripos)
} }
/* }}} */ /* }}} */
/* {{{ proto string grapheme_substr(string str, int start [, int length]) /* {{{ Returns part of a string */
Returns part of a string */
PHP_FUNCTION(grapheme_substr) PHP_FUNCTION(grapheme_substr)
{ {
char *str; char *str;
@ -641,16 +635,14 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas
} }
/* }}} */ /* }}} */
/* {{{ proto string grapheme_strstr(string haystack, string needle[, bool part]) /* {{{ Finds first occurrence of a string within another */
Finds first occurrence of a string within another */
PHP_FUNCTION(grapheme_strstr) PHP_FUNCTION(grapheme_strstr)
{ {
strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0 /* f_ignore_case */); strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0 /* f_ignore_case */);
} }
/* }}} */ /* }}} */
/* {{{ proto string grapheme_stristr(string haystack, string needle[, bool part]) /* {{{ Finds first occurrence of a string within another */
Finds first occurrence of a string within another */
PHP_FUNCTION(grapheme_stristr) PHP_FUNCTION(grapheme_stristr)
{ {
strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1 /* f_ignore_case */); strstr_common_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1 /* f_ignore_case */);
@ -753,8 +745,7 @@ static grapheme_extract_iter grapheme_extract_iters[] = {
}; };
/* }}} */ /* }}} */
/* {{{ proto string grapheme_extract(string str, int size[, int extract_type[, int start[, int next]]]) /* {{{ Function to extract a sequence of default grapheme clusters */
Function to extract a sequence of default grapheme clusters */
PHP_FUNCTION(grapheme_extract) PHP_FUNCTION(grapheme_extract)
{ {
char *str, *pstr; char *str, *pstr;

6
ext/intl/idn/idn.c
View file

@ -211,8 +211,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
php_intl_idn_to_46(INTERNAL_FUNCTION_PARAM_PASSTHRU, domain, (uint32_t)option, mode, idna_info); php_intl_idn_to_46(INTERNAL_FUNCTION_PARAM_PASSTHRU, domain, (uint32_t)option, mode, idna_info);
} }
/* {{{ proto string idn_to_ascii(string domain[, int options[, int variant[, array &idna_info]]]) /* {{{ Converts an Unicode domain to ASCII representation, as defined in the IDNA RFC */
Converts an Unicode domain to ASCII representation, as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_ascii) PHP_FUNCTION(idn_to_ascii)
{ {
php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_ASCII); php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_ASCII);
@ -220,8 +219,7 @@ PHP_FUNCTION(idn_to_ascii)
/* }}} */ /* }}} */
/* {{{ proto string idn_to_utf8(string domain[, int options[, int variant[, array &idna_info]]]) /* {{{ Converts an ASCII representation of the domain to Unicode (UTF-8), as defined in the IDNA RFC */
Converts an ASCII representation of the domain to Unicode (UTF-8), as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_utf8) PHP_FUNCTION(idn_to_utf8)
{ {
php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_UTF8); php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_UTF8);

9
ext/intl/intl_error.c
View file

@ -195,8 +195,7 @@ void intl_errors_set( intl_error* err, UErrorCode code, const char* msg, int cop
} }
/* }}} */ /* }}} */
/* {{{ void intl_errors_reset( intl_error* err ) /* {{{ void intl_errors_reset( intl_error* err ) */
*/
void intl_errors_reset( intl_error* err ) void intl_errors_reset( intl_error* err )
{ {
if(err) { if(err) {
@ -206,8 +205,7 @@ void intl_errors_reset( intl_error* err )
} }
/* }}} */ /* }}} */
/* {{{ void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg ) /* {{{ void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg ) */
*/
void intl_errors_set_custom_msg( intl_error* err, const char* msg, int copyMsg ) void intl_errors_set_custom_msg( intl_error* err, const char* msg, int copyMsg )
{ {
if(err) { if(err) {
@ -217,8 +215,7 @@ void intl_errors_set_custom_msg( intl_error* err, const char* msg, int copyMsg )
} }
/* }}} */ /* }}} */
/* {{{ intl_errors_set_code( intl_error* err, UErrorCode err_code ) /* {{{ intl_errors_set_code( intl_error* err, UErrorCode err_code ) */
*/
void intl_errors_set_code( intl_error* err, UErrorCode err_code ) void intl_errors_set_code( intl_error* err, UErrorCode err_code )
{ {
if(err) { if(err) {

123
ext/intl/locale/locale_methods.c
View file

@ -199,11 +199,9 @@ static zend_off_t getSingletonPos(const char* str)
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getDefault( ) /* {{{ Get default locale */
Get default locale */
/* }}} */ /* }}} */
/* {{{ proto static string locale_get_default( ) /* {{{ Get default locale */
Get default locale */
PHP_NAMED_FUNCTION(zif_locale_get_default) PHP_NAMED_FUNCTION(zif_locale_get_default)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -215,11 +213,9 @@ PHP_NAMED_FUNCTION(zif_locale_get_default)
/* }}} */ /* }}} */
/* {{{ proto static string Locale::setDefault( string $locale ) /* {{{ Set default locale */
Set default locale */
/* }}} */ /* }}} */
/* {{{ proto static string locale_set_default( string $locale ) /* {{{ Set default locale */
Set default locale */
PHP_NAMED_FUNCTION(zif_locale_set_default) PHP_NAMED_FUNCTION(zif_locale_set_default)
{ {
zend_string* locale_name; zend_string* locale_name;
@ -433,36 +429,21 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getScript($locale) /* {{{ gets the script for the $locale */
* gets the script for the $locale
}}} */
/* {{{ proto static string locale_get_script($locale)
* gets the script for the $locale
*/
PHP_FUNCTION( locale_get_script ) PHP_FUNCTION( locale_get_script )
{ {
get_icu_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getRegion($locale) /* {{{ gets the region for the $locale */
* gets the region for the $locale
}}} */
/* {{{ proto static string locale_get_region($locale)
* gets the region for the $locale
*/
PHP_FUNCTION( locale_get_region ) PHP_FUNCTION( locale_get_region )
{ {
get_icu_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getPrimaryLanguage($locale) /* {{{ gets the primary language for the $locale */
* gets the primary language for the $locale
}}} */
/* {{{ proto static string locale_get_primary_language($locale)
* gets the primary language for the $locale
*/
PHP_FUNCTION(locale_get_primary_language ) PHP_FUNCTION(locale_get_primary_language )
{ {
get_icu_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
@ -603,48 +584,28 @@ static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAME
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getDisplayName($locale[, $in_locale = null]) /* {{{ gets the name for the $locale in $in_locale or default_locale */
* gets the name for the $locale in $in_locale or default_locale
}}} */
/* {{{ proto static string get_display_name($locale[, $in_locale = null])
* gets the name for the $locale in $in_locale or default_locale
*/
PHP_FUNCTION(locale_get_display_name) PHP_FUNCTION(locale_get_display_name)
{ {
get_icu_disp_value_src_php( DISP_NAME , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_disp_value_src_php( DISP_NAME , INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getDisplayLanguage($locale[, $in_locale = null]) /* {{{ gets the language for the $locale in $in_locale or default_locale */
* gets the language for the $locale in $in_locale or default_locale
}}} */
/* {{{ proto static string get_display_language($locale[, $in_locale = null])
* gets the language for the $locale in $in_locale or default_locale
*/
PHP_FUNCTION(locale_get_display_language) PHP_FUNCTION(locale_get_display_language)
{ {
get_icu_disp_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_disp_value_src_php( LOC_LANG_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getDisplayScript($locale, $in_locale = null) /* {{{ gets the script for the $locale in $in_locale or default_locale */
* gets the script for the $locale in $in_locale or default_locale
}}} */
/* {{{ proto static string get_display_script($locale, $in_locale = null)
* gets the script for the $locale in $in_locale or default_locale
*/
PHP_FUNCTION(locale_get_display_script) PHP_FUNCTION(locale_get_display_script)
{ {
get_icu_disp_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_disp_value_src_php( LOC_SCRIPT_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::getDisplayRegion($locale, $in_locale = null) /* {{{ gets the region for the $locale in $in_locale or default_locale */
* gets the region for the $locale in $in_locale or default_locale
}}} */
/* {{{ proto static string get_display_region($locale, $in_locale = null)
* gets the region for the $locale in $in_locale or default_locale
*/
PHP_FUNCTION(locale_get_display_region) PHP_FUNCTION(locale_get_display_region)
{ {
get_icu_disp_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_disp_value_src_php( LOC_REGION_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
@ -665,12 +626,10 @@ PHP_FUNCTION(locale_get_display_variant)
} }
/* }}} */ /* }}} */
/* {{{ proto static array getKeywords(string $locale) { /* {{{ return an associative array containing keyword-value
* return an associative array containing keyword-value
* pairs for this locale. The keys are keys to the array (doh!) * pairs for this locale. The keys are keys to the array (doh!)
* }}}*/ * }}}*/
/* {{{ proto static array locale_get_keywords(string $locale) { /* {{{ return an associative array containing keyword-value
* return an associative array containing keyword-value
* pairs for this locale. The keys are keys to the array (doh!) * pairs for this locale. The keys are keys to the array (doh!)
*/ */
PHP_FUNCTION( locale_get_keywords ) PHP_FUNCTION( locale_get_keywords )
@ -743,12 +702,9 @@ PHP_FUNCTION( locale_get_keywords )
} }
/* }}} */ /* }}} */
/* {{{ proto static string Locale::canonicalize($locale) /* {{{ @return string the canonicalized locale
* @return string the canonicalized locale
* }}} */ * }}} */
/* {{{ proto static string locale_canonicalize(Locale $loc, string $locale) /* {{{ @param string $locale The locale string to canonicalize */
* @param string $locale The locale string to canonicalize
*/
PHP_FUNCTION(locale_canonicalize) PHP_FUNCTION(locale_canonicalize)
{ {
get_icu_value_src_php( LOC_CANONICALIZE_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU ); get_icu_value_src_php( LOC_CANONICALIZE_TAG , INTERNAL_FUNCTION_PARAM_PASSTHRU );
@ -889,11 +845,9 @@ static int handleAppendResult( int result, smart_str* loc_name)
/* }}} */ /* }}} */
#define RETURN_SMART_STR(str) smart_str_0((str)); RETURN_NEW_STR((str)->s) #define RETURN_SMART_STR(str) smart_str_0((str)); RETURN_NEW_STR((str)->s)
/* {{{ proto static string Locale::composeLocale($array) /* {{{ Creates a locale by combining the parts of locale-ID passed
* Creates a locale by combining the parts of locale-ID passed
* }}} */ * }}} */
/* {{{ proto static string compose_locale($array) /* {{{ Creates a locale by combining the parts of locale-ID passed
* Creates a locale by combining the parts of locale-ID passed
* }}} */ * }}} */
PHP_FUNCTION(locale_compose) PHP_FUNCTION(locale_compose)
{ {
@ -1016,8 +970,7 @@ static zend_string* get_private_subtags(const char* loc_name)
} }
/* }}} */ /* }}} */
/* {{{ code used by locale_parse /* {{{ code used by locale_parse */
*/
static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name) static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name)
{ {
zend_string* key_value = NULL; zend_string* key_value = NULL;
@ -1077,12 +1030,7 @@ static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name)
} }
/* }}} */ /* }}} */
/* {{{ proto static array Locale::parseLocale($locale) /* {{{ parses a locale-id into an array the different parts of it */
* parses a locale-id into an array the different parts of it
}}} */
/* {{{ proto static array parse_locale($locale)
* parses a locale-id into an array the different parts of it
*/
PHP_FUNCTION(locale_parse) PHP_FUNCTION(locale_parse)
{ {
const char* loc_name = NULL; const char* loc_name = NULL;
@ -1120,12 +1068,7 @@ PHP_FUNCTION(locale_parse)
} }
/* }}} */ /* }}} */
/* {{{ proto static array Locale::getAllVariants($locale) /* {{{ gets an array containing the list of variants, or null */
* gets an array containing the list of variants, or null
}}} */
/* {{{ proto static array locale_get_all_variants($locale)
* gets an array containing the list of variants, or null
*/
PHP_FUNCTION(locale_get_all_variants) PHP_FUNCTION(locale_get_all_variants)
{ {
const char* loc_name = NULL; const char* loc_name = NULL;
@ -1178,9 +1121,7 @@ PHP_FUNCTION(locale_get_all_variants)
} }
/* }}} */ /* }}} */
/*{{{ /* {{{ * Converts to lower case and also replaces all hyphens with the underscore */
* Converts to lower case and also replaces all hyphens with the underscore
*/
static int strToMatch(const char* str ,char *retstr) static int strToMatch(const char* str ,char *retstr)
{ {
char* anchor = NULL; char* anchor = NULL;
@ -1211,13 +1152,9 @@ static int strToMatch(const char* str ,char *retstr)
} }
/* }}} */ /* }}} */
/* {{{ proto static boolean Locale::filterMatches(string $langtag, string $locale[, bool $canonicalize]) /* {{{ Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm */
* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm
*/
/* }}} */ /* }}} */
/* {{{ proto bool locale_filter_matches(string $langtag, string $locale[, bool $canonicalize]) /* {{{ Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm */
* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm
*/
PHP_FUNCTION(locale_filter_matches) PHP_FUNCTION(locale_filter_matches)
{ {
char* lang_tag = NULL; char* lang_tag = NULL;
@ -1493,13 +1430,11 @@ static zend_string* lookup_loc_range(const char* loc_range, HashTable* hash_arr,
} }
/* }}} */ /* }}} */
/* {{{ proto string Locale::lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) /* {{{ Searches the items in $langtag for the best match to the language
* Searches the items in $langtag for the best match to the language
* range * range
*/ */
/* }}} */ /* }}} */
/* {{{ proto string locale_lookup(array $langtag, string $locale[, bool $canonicalize[, string $default = null]]) /* {{{ Searches the items in $langtag for the best match to the language
* Searches the items in $langtag for the best match to the language
* range * range
*/ */
PHP_FUNCTION(locale_lookup) PHP_FUNCTION(locale_lookup)
@ -1551,13 +1486,9 @@ PHP_FUNCTION(locale_lookup)
} }
/* }}} */ /* }}} */
/* {{{ proto string Locale::acceptFromHttp(string $http_accept) /* {{{ Tries to find out best available locale based on HTTP "Accept-Language" header */
* Tries to find out best available locale based on HTTP "Accept-Language" header
*/
/* }}} */ /* }}} */
/* {{{ proto string locale_accept_from_http(string $http_accept) /* {{{ Tries to find out best available locale based on HTTP "Accept-Language" header */
* Tries to find out best available locale based on HTTP "Accept-Language" header
*/
PHP_FUNCTION(locale_accept_from_http) PHP_FUNCTION(locale_accept_from_http)
{ {
UEnumeration *available; UEnumeration *available;

22
ext/intl/msgformat/msgformat.c
View file

@ -85,11 +85,7 @@ static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
} }
/* }}} */ /* }}} */
/* {{{ proto MessageFormatter MesssageFormatter::create( string $locale, string $pattern ) /* {{{ Create formatter. */
* Create formatter. }}} */
/* {{{ proto MessageFormatter msgfmt_create( string $locale, string $pattern )
* Create formatter.
*/
PHP_FUNCTION( msgfmt_create ) PHP_FUNCTION( msgfmt_create )
{ {
object_init_ex( return_value, MessageFormatter_ce_ptr ); object_init_ex( return_value, MessageFormatter_ce_ptr );
@ -100,9 +96,7 @@ PHP_FUNCTION( msgfmt_create )
} }
/* }}} */ /* }}} */
/* {{{ proto MessageFormatter::__construct( string $locale, string $pattern ) /* {{{ MessageFormatter object constructor. */
* MessageFormatter object constructor.
*/
PHP_METHOD( MessageFormatter, __construct ) PHP_METHOD( MessageFormatter, __construct )
{ {
zend_error_handling error_handling; zend_error_handling error_handling;
@ -118,11 +112,7 @@ PHP_METHOD( MessageFormatter, __construct )
} }
/* }}} */ /* }}} */
/* {{{ proto int MessageFormatter::getErrorCode() /* {{{ Get formatter's last error code. */
* Get formatter's last error code. }}} */
/* {{{ proto int msgfmt_get_error_code( MessageFormatter $nf )
* Get formatter's last error code.
*/
PHP_FUNCTION( msgfmt_get_error_code ) PHP_FUNCTION( msgfmt_get_error_code )
{ {
zval* object = NULL; zval* object = NULL;
@ -142,11 +132,7 @@ PHP_FUNCTION( msgfmt_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string MessageFormatter::getErrorMessage( ) /* {{{ Get text description for formatter's last error code. */
* Get text description for formatter's last error code. }}} */
/* {{{ proto string msgfmt_get_error_message( MessageFormatter $coll )
* Get text description for formatter's last error code.
*/
PHP_FUNCTION( msgfmt_get_error_message ) PHP_FUNCTION( msgfmt_get_error_message )
{ {
zend_string* message = NULL; zend_string* message = NULL;

18
ext/intl/msgformat/msgformat_attr.c
View file

@ -23,11 +23,7 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
/* {{{ proto string MessageFormatter::getPattern( ) /* {{{ Get formatter pattern. */
* Get formatter pattern. }}} */
/* {{{ proto string msgfmt_get_pattern( MessageFormatter $mf )
* Get formatter pattern.
*/
PHP_FUNCTION( msgfmt_get_pattern ) PHP_FUNCTION( msgfmt_get_pattern )
{ {
MSG_FORMAT_METHOD_INIT_VARS; MSG_FORMAT_METHOD_INIT_VARS;
@ -49,11 +45,7 @@ PHP_FUNCTION( msgfmt_get_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto bool MessageFormatter::setPattern( string $pattern ) /* {{{ Set formatter pattern. */
* Set formatter pattern. }}} */
/* {{{ proto bool msgfmt_set_pattern( MessageFormatter $mf, string $pattern )
* Set formatter pattern.
*/
PHP_FUNCTION( msgfmt_set_pattern ) PHP_FUNCTION( msgfmt_set_pattern )
{ {
char* value = NULL; char* value = NULL;
@ -106,11 +98,7 @@ PHP_FUNCTION( msgfmt_set_pattern )
} }
/* }}} */ /* }}} */
/* {{{ proto string MessageFormatter::getLocale() /* {{{ Get formatter locale. */
* Get formatter locale. }}} */
/* {{{ proto string msgfmt_get_locale(MessageFormatter $mf)
* Get formatter locale.
*/
PHP_FUNCTION( msgfmt_get_locale ) PHP_FUNCTION( msgfmt_get_locale )
{ {
char *loc; char *loc;

12
ext/intl/msgformat/msgformat_format.c
View file

@ -47,11 +47,7 @@ static void msgfmt_do_format(MessageFormatter_object *mfo, zval *args, zval *ret
} }
/* }}} */ /* }}} */
/* {{{ proto mixed MessageFormatter::format( array $args ) /* {{{ Format a message. */
* Format a message. }}} */
/* {{{ proto mixed msgfmt_format( MessageFormatter $nf, array $args )
* Format a message.
*/
PHP_FUNCTION( msgfmt_format ) PHP_FUNCTION( msgfmt_format )
{ {
zval *args; zval *args;
@ -72,11 +68,7 @@ PHP_FUNCTION( msgfmt_format )
} }
/* }}} */ /* }}} */
/* {{{ proto mixed MessageFormatter::formatMessage( string $locale, string $pattern, array $args ) /* {{{ Format a message. */
* Format a message. }}} */
/* {{{ proto mixed msgfmt_format_message( string $locale, string $pattern, array $args )
* Format a message.
*/
PHP_FUNCTION( msgfmt_format_message ) PHP_FUNCTION( msgfmt_format_message )
{ {
zval *args; zval *args;

12
ext/intl/msgformat/msgformat_parse.c
View file

@ -50,11 +50,7 @@ static void msgfmt_do_parse(MessageFormatter_object *mfo, char *source, size_t s
} }
/* }}} */ /* }}} */
/* {{{ proto array MessageFormatter::parse( string $source ) /* {{{ Parse a message */
* Parse a message }}} */
/* {{{ proto array msgfmt_parse( MessageFormatter $nf, string $source )
* Parse a message.
*/
PHP_FUNCTION( msgfmt_parse ) PHP_FUNCTION( msgfmt_parse )
{ {
char *source; char *source;
@ -76,11 +72,7 @@ PHP_FUNCTION( msgfmt_parse )
} }
/* }}} */ /* }}} */
/* {{{ proto array MessageFormatter::formatMessage( string $locale, string $pattern, string $source ) /* {{{ Parse a message. */
* Parse a message. }}} */
/* {{{ proto array msgfmt_parse_message( string $locale, string $pattern, string $source )
* Parse a message.
*/
PHP_FUNCTION( msgfmt_parse_message ) PHP_FUNCTION( msgfmt_parse_message )
{ {
UChar *spattern = NULL; UChar *spattern = NULL;

18
ext/intl/normalizer/normalizer_normalize.c
View file

@ -76,11 +76,7 @@ static UBool intl_is_normalized(zend_long form, const UChar *uinput, int32_t uin
}/*}}}*/ }/*}}}*/
#endif #endif
/* {{{ proto string Normalizer::normalize( string $input [, string $form = FORM_C] ) /* {{{ Normalize a string. */
* Normalize a string. }}} */
/* {{{ proto string normalizer_normalize( string $input [, string $form = FORM_C] )
* Normalize a string.
*/
PHP_FUNCTION( normalizer_normalize ) PHP_FUNCTION( normalizer_normalize )
{ {
char* input = NULL; char* input = NULL;
@ -219,11 +215,7 @@ PHP_FUNCTION( normalizer_normalize )
} }
/* }}} */ /* }}} */
/* {{{ proto bool Normalizer::isNormalized( string $input [, string $form = FORM_C] ) /* {{{ Test if a string is in a given normalization form. */
* Test if a string is in a given normalization form. }}} */
/* {{{ proto bool normalizer_is_normalized( string $input [, string $form = FORM_C] )
* Test if a string is in a given normalization form.
*/
PHP_FUNCTION( normalizer_is_normalized ) PHP_FUNCTION( normalizer_is_normalized )
{ {
char* input = NULL; char* input = NULL;
@ -306,11 +298,7 @@ PHP_FUNCTION( normalizer_is_normalized )
} }
/* }}} */ /* }}} */
/* {{{ proto string|null Normalizer::getRawDecomposition( string $input [, string $form = FORM_C] ) /* {{{ Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. */
* Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. }}} */
/* {{{ proto string|null normalizer_get_raw_decomposition( string $input [, string $form = FORM_C] )
* Returns the Decomposition_Mapping property for the given UTF-8 encoded code point.
*/
#if U_ICU_VERSION_MAJOR_NUM >= 56 #if U_ICU_VERSION_MAJOR_NUM >= 56
PHP_FUNCTION( normalizer_get_raw_decomposition ) PHP_FUNCTION( normalizer_get_raw_decomposition )
{ {

15
ext/intl/php_intl.c
View file

@ -141,8 +141,7 @@ static PHP_GINIT_FUNCTION(intl)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION( intl ) PHP_MINIT_FUNCTION( intl )
{ {
/* For the default locale php.ini setting */ /* For the default locale php.ini setting */
@ -242,8 +241,7 @@ PHP_MINIT_FUNCTION( intl )
#define EXPLICIT_CLEANUP_ENV_VAR "INTL_EXPLICIT_CLEANUP" #define EXPLICIT_CLEANUP_ENV_VAR "INTL_EXPLICIT_CLEANUP"
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION( intl ) PHP_MSHUTDOWN_FUNCTION( intl )
{ {
const char *cleanup; const char *cleanup;
@ -259,16 +257,14 @@ PHP_MSHUTDOWN_FUNCTION( intl )
} }
/* }}} */ /* }}} */
/* {{{ PHP_RINIT_FUNCTION /* {{{ PHP_RINIT_FUNCTION */
*/
PHP_RINIT_FUNCTION( intl ) PHP_RINIT_FUNCTION( intl )
{ {
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION /* {{{ PHP_RSHUTDOWN_FUNCTION */
*/
PHP_RSHUTDOWN_FUNCTION( intl ) PHP_RSHUTDOWN_FUNCTION( intl )
{ {
if(!Z_ISUNDEF(INTL_G(current_collator))) { if(!Z_ISUNDEF(INTL_G(current_collator))) {
@ -284,8 +280,7 @@ PHP_RSHUTDOWN_FUNCTION( intl )
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION( intl ) PHP_MINFO_FUNCTION( intl )
{ {
#ifndef UCONFIG_NO_FORMATTING #ifndef UCONFIG_NO_FORMATTING

33
ext/intl/resourcebundle/resourcebundle_class.c
View file

@ -132,9 +132,7 @@ static int resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
} }
/* }}} */ /* }}} */
/* {{{ proto ResourceBundle::__construct( string $locale [, string $bundlename [, bool $fallback = true ]] ) /* {{{ ResourceBundle object constructor */
* ResourceBundle object constructor
*/
PHP_METHOD( ResourceBundle, __construct ) PHP_METHOD( ResourceBundle, __construct )
{ {
zend_error_handling error_handling; zend_error_handling error_handling;
@ -150,9 +148,7 @@ PHP_METHOD( ResourceBundle, __construct )
} }
/* }}} */ /* }}} */
/* {{{ proto ResourceBundle ResourceBundle::create( string $locale [, string $bundlename [, bool $fallback = true ]] ) /* {{{ */
proto ResourceBundle resourcebundle_create( string $locale [, string $bundlename [, bool $fallback = true ]] )
*/
PHP_FUNCTION( resourcebundle_create ) PHP_FUNCTION( resourcebundle_create )
{ {
object_init_ex( return_value, ResourceBundle_ce_ptr ); object_init_ex( return_value, ResourceBundle_ce_ptr );
@ -229,10 +225,7 @@ zval *resourcebundle_array_get(zend_object *object, zval *offset, int type, zval
} }
/* }}} */ /* }}} */
/* {{{ proto mixed ResourceBundle::get( int|string $resindex [, bool $fallback = true ] ) /* {{{ Get resource identified by numerical index or key name. */
* proto mixed resourcebundle_get( ResourceBundle $rb, int|string $resindex [, bool $fallback = true ] )
* Get resource identified by numerical index or key name.
*/
PHP_FUNCTION( resourcebundle_get ) PHP_FUNCTION( resourcebundle_get )
{ {
zend_bool fallback = 1; zend_bool fallback = 1;
@ -264,10 +257,7 @@ int resourcebundle_array_count(zend_object *object, zend_long *count)
} }
/* }}} */ /* }}} */
/* {{{ proto int ResourceBundle::count() /* {{{ Get resources count */
* proto int resourcebundle_count( ResourceBundle $bundle )
* Get resources count
*/
PHP_FUNCTION( resourcebundle_count ) PHP_FUNCTION( resourcebundle_count )
{ {
int32_t len; int32_t len;
@ -283,10 +273,7 @@ PHP_FUNCTION( resourcebundle_count )
RETURN_LONG( len ); RETURN_LONG( len );
} }
/* {{{ proto array ResourceBundle::getLocales( string $bundlename ) /* {{{ Get available locales from ResourceBundle name */
* proto array resourcebundle_locales( string $bundlename )
* Get available locales from ResourceBundle name
*/
PHP_FUNCTION( resourcebundle_locales ) PHP_FUNCTION( resourcebundle_locales )
{ {
char * bundlename; char * bundlename;
@ -327,10 +314,7 @@ PHP_FUNCTION( resourcebundle_locales )
} }
/* }}} */ /* }}} */
/* {{{ proto string ResourceBundle::getErrorCode( ) /* {{{ Get text description for ResourceBundle's last error code. */
* proto string resourcebundle_get_error_code( ResourceBundle $bundle )
* Get text description for ResourceBundle's last error code.
*/
PHP_FUNCTION( resourcebundle_get_error_code ) PHP_FUNCTION( resourcebundle_get_error_code )
{ {
RESOURCEBUNDLE_METHOD_INIT_VARS; RESOURCEBUNDLE_METHOD_INIT_VARS;
@ -347,10 +331,7 @@ PHP_FUNCTION( resourcebundle_get_error_code )
} }
/* }}} */ /* }}} */
/* {{{ proto string ResourceBundle::getErrorMessage( ) /* {{{ Get text description for ResourceBundle's last error. */
* proto string resourcebundle_get_error_message( ResourceBundle $bundle )
* Get text description for ResourceBundle's last error.
*/
PHP_FUNCTION( resourcebundle_get_error_message ) PHP_FUNCTION( resourcebundle_get_error_message )
{ {
zend_string* message = NULL; zend_string* message = NULL;

4
ext/intl/spoofchecker/spoofchecker_create.c
View file

@ -20,9 +20,7 @@
#include "spoofchecker_class.h" #include "spoofchecker_class.h"
#include "intl_data.h" #include "intl_data.h"
/* {{{ proto Spoofchecker::__construct() /* {{{ Spoofchecker object constructor. */
* Spoofchecker object constructor.
*/
PHP_METHOD(Spoofchecker, __construct) PHP_METHOD(Spoofchecker, __construct)
{ {
#if U_ICU_VERSION_MAJOR_NUM < 58 #if U_ICU_VERSION_MAJOR_NUM < 58

20
ext/intl/spoofchecker/spoofchecker_main.c
View file

@ -19,9 +19,7 @@
#include "php_intl.h" #include "php_intl.h"
#include "spoofchecker_class.h" #include "spoofchecker_class.h"
/* {{{ proto bool Spoofchecker::isSuspicious( string text[, int &error_code ] ) /* {{{ Checks if a given text contains any suspicious characters */
* Checks if a given text contains any suspicious characters
*/
PHP_METHOD(Spoofchecker, isSuspicious) PHP_METHOD(Spoofchecker, isSuspicious)
{ {
int ret; int ret;
@ -51,9 +49,7 @@ PHP_METHOD(Spoofchecker, isSuspicious)
} }
/* }}} */ /* }}} */
/* {{{ proto bool Spoofchecker::areConfusable( string str1, string str2[, int &error_code ] ) /* {{{ Checks if a given text contains any confusable characters */
* Checks if a given text contains any confusable characters
*/
PHP_METHOD(Spoofchecker, areConfusable) PHP_METHOD(Spoofchecker, areConfusable)
{ {
int ret; int ret;
@ -86,9 +82,7 @@ PHP_METHOD(Spoofchecker, areConfusable)
} }
/* }}} */ /* }}} */
/* {{{ proto void Spoofchecker::setAllowedLocales( string locales ) /* {{{ Locales to use when running checks */
* Locales to use when running checks
*/
PHP_METHOD(Spoofchecker, setAllowedLocales) PHP_METHOD(Spoofchecker, setAllowedLocales)
{ {
char *locales; char *locales;
@ -110,9 +104,7 @@ PHP_METHOD(Spoofchecker, setAllowedLocales)
} }
/* }}} */ /* }}} */
/* {{{ proto void Spoofchecker::setChecks( int checks ) /* {{{ Set the checks to run */
* Set the checks to run
*/
PHP_METHOD(Spoofchecker, setChecks) PHP_METHOD(Spoofchecker, setChecks)
{ {
zend_long checks; zend_long checks;
@ -133,9 +125,7 @@ PHP_METHOD(Spoofchecker, setChecks)
/* }}} */ /* }}} */
#if U_ICU_VERSION_MAJOR_NUM >= 58 #if U_ICU_VERSION_MAJOR_NUM >= 58
/* {{{ proto void Spoofchecker::setRestrictionLevel( int $restriction_level ) /* {{{ Set the loosest restriction level allowed for strings. */
* Set the loosest restriction level allowed for strings.
*/
PHP_METHOD(Spoofchecker, setRestrictionLevel) PHP_METHOD(Spoofchecker, setRestrictionLevel)
{ {
zend_long level; zend_long level;

8
ext/intl/timezone/timezone_methods.cpp
View file

@ -599,9 +599,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message)
} }
#if U_ICU_VERSION_MAJOR_NUM >= 52 #if U_ICU_VERSION_MAJOR_NUM >= 52
/* {{{ proto string IntlTimeZone::getWindowsID(string $timezone) /* {{{ Translate a system timezone (e.g. "America/Los_Angeles" into a
proto string intltz_get_windows_id(string $timezone)
Translate a system timezone (e.g. "America/Los_Angeles" into a
Windows Timezone (e.g. "Pacific Standard Time") Windows Timezone (e.g. "Pacific Standard Time")
*/ */
U_CFUNC PHP_FUNCTION(intltz_get_windows_id) U_CFUNC PHP_FUNCTION(intltz_get_windows_id)
@ -637,9 +635,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_windows_id)
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlTimeZone::getIDForWindowsID(string $timezone[, string $region = NULL]) /* {{{ Translate a windows timezone (e.g. "Pacific Time Zone" into a
proto string intltz_get_id_for_windows_id(string $timezone[, string $region = NULL])
Translate a windows timezone (e.g. "Pacific Time Zone" into a
System Timezone (e.g. "America/Los_Angeles") System Timezone (e.g. "America/Los_Angeles")
*/ */
U_CFUNC PHP_FUNCTION(intltz_get_id_for_windows_id) U_CFUNC PHP_FUNCTION(intltz_get_id_for_windows_id)

34
ext/intl/transliterator/transliterator_methods.c
View file

@ -94,10 +94,7 @@ static int create_transliterator( char *str_id, size_t str_id_len, zend_long dir
return SUCCESS; return SUCCESS;
} }
/* {{{ proto Transliterator transliterator_create( string id [, int direction ] ) /* {{{ Opens a transliterator by id. */
* proto Transliterator Transliterator::create( string id [, int direction ] )
* Opens a transliterator by id.
*/
PHP_FUNCTION( transliterator_create ) PHP_FUNCTION( transliterator_create )
{ {
char *str_id; char *str_id;
@ -124,10 +121,7 @@ PHP_FUNCTION( transliterator_create )
} }
/* }}} */ /* }}} */
/* {{{ proto Transliterator transliterator_create_from_rules( string rules [, int direction ] ) /* {{{ Opens a transliterator by id. */
* proto Transliterator Transliterator::createFromRules( string rules [, int direction ] )
* Opens a transliterator by id.
*/
PHP_FUNCTION( transliterator_create_from_rules ) PHP_FUNCTION( transliterator_create_from_rules )
{ {
char *str_rules; char *str_rules;
@ -194,10 +188,7 @@ PHP_FUNCTION( transliterator_create_from_rules )
} }
/* }}} */ /* }}} */
/* {{{ proto Transliterator transliterator_create_inverse( Transliterator orig_trans ) /* {{{ Opens the inverse transliterator transliterator. */
* proto Transliterator Transliterator::createInverse()
* Opens the inverse transliterator transliterator.
*/
PHP_FUNCTION( transliterator_create_inverse ) PHP_FUNCTION( transliterator_create_inverse )
{ {
Transliterator_object *to_orig; Transliterator_object *to_orig;
@ -226,10 +217,7 @@ PHP_FUNCTION( transliterator_create_inverse )
} }
/* }}} */ /* }}} */
/* {{{ proto array transliterator_list_ids() /* {{{ Return an array with the registered transliterator IDs. */
* proto array Transliterator::listIDs()
* Return an array with the registered transliterator IDs.
*/
PHP_FUNCTION( transliterator_list_ids ) PHP_FUNCTION( transliterator_list_ids )
{ {
UEnumeration *en; UEnumeration *en;
@ -275,9 +263,7 @@ PHP_FUNCTION( transliterator_list_ids )
} }
/* }}} */ /* }}} */
/* {{{ proto string transliterator_transliterate( Transliterator trans, string subject [, int start = 0 [, int end = -1 ]] ) /* {{{ Transliterate a string. */
* proto string Transliterator::transliterate( string subject [, int start = 0 [, int end = -1 ]] )
* Transliterate a string. */
PHP_FUNCTION( transliterator_transliterate ) PHP_FUNCTION( transliterator_transliterate )
{ {
char *str; char *str;
@ -450,10 +436,7 @@ PHP_METHOD( Transliterator, __construct )
0 ); 0 );
} }
/* {{{ proto int transliterator_get_error_code( Transliterator trans ) /* {{{ Get the last error code for this transliterator. */
* proto int Transliterator::getErrorCode()
* Get the last error code for this transliterator.
*/
PHP_FUNCTION( transliterator_get_error_code ) PHP_FUNCTION( transliterator_get_error_code )
{ {
TRANSLITERATOR_METHOD_INIT_VARS TRANSLITERATOR_METHOD_INIT_VARS
@ -474,10 +457,7 @@ PHP_FUNCTION( transliterator_get_error_code )
/* }}} */ /* }}} */
/* {{{ proto string transliterator_get_error_message( Transliterator trans ) /* {{{ Get the last error message for this transliterator. */
* proto string Transliterator::getErrorMessage()
* Get the last error message for this transliterator.
*/
PHP_FUNCTION( transliterator_get_error_message ) PHP_FUNCTION( transliterator_get_error_message )
{ {
zend_string* message = NULL; zend_string* message = NULL;

51
ext/intl/uchar/uchar.c
View file

@ -45,8 +45,7 @@ static zend_never_inline int parse_code_point_param(INTERNAL_FUNCTION_PARAMETERS
return convert_cp(cp, string_codepoint, int_codepoint); return convert_cp(cp, string_codepoint, int_codepoint);
} }
/* {{{ proto string IntlChar::chr(int|string $codepoint) /* {{{ Converts a numeric codepoint to UTF-8
* Converts a numeric codepoint to UTF-8
* Acts as an identify function when given a valid UTF-8 encoded codepoint * Acts as an identify function when given a valid UTF-8 encoded codepoint
*/ */
IC_METHOD(chr) { IC_METHOD(chr) {
@ -67,8 +66,7 @@ IC_METHOD(chr) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::ord(int|string $character) /* {{{ Converts a UTf-8 encoded codepoint to its integer U32 value
* Converts a UTf-8 encoded codepoint to its integer U32 value
* Acts as an identity function when passed a valid integer codepoint * Acts as an identity function when passed a valid integer codepoint
*/ */
IC_METHOD(ord) { IC_METHOD(ord) {
@ -82,7 +80,7 @@ IC_METHOD(ord) {
} }
/* }}} */ /* }}} */
/* {{{ proto bool IntlChar::hasBinaryProperty(int|string $codepoint, int $property) */ /* {{{ */
IC_METHOD(hasBinaryProperty) { IC_METHOD(hasBinaryProperty) {
UChar32 cp; UChar32 cp;
zend_long prop; zend_long prop;
@ -102,7 +100,7 @@ IC_METHOD(hasBinaryProperty) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getIntPropertyValue(int|string $codepoint, int $property) */ /* {{{ */
IC_METHOD(getIntPropertyValue) { IC_METHOD(getIntPropertyValue) {
UChar32 cp; UChar32 cp;
zend_long prop; zend_long prop;
@ -122,7 +120,7 @@ IC_METHOD(getIntPropertyValue) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getIntPropertyMinValue(int $property) */ /* {{{ */
IC_METHOD(getIntPropertyMinValue) { IC_METHOD(getIntPropertyMinValue) {
zend_long prop; zend_long prop;
@ -134,7 +132,7 @@ IC_METHOD(getIntPropertyMinValue) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getIntPropertyMaxValue(int $property) */ /* {{{ */
IC_METHOD(getIntPropertyMaxValue) { IC_METHOD(getIntPropertyMaxValue) {
zend_long prop; zend_long prop;
@ -146,7 +144,7 @@ IC_METHOD(getIntPropertyMaxValue) {
} }
/* }}} */ /* }}} */
/* {{{ proto float IntlChar::getNumericValue(int|string $codepoint) */ /* {{{ */
IC_METHOD(getNumericValue) { IC_METHOD(getNumericValue) {
UChar32 cp; UChar32 cp;
@ -158,7 +156,7 @@ IC_METHOD(getNumericValue) {
} }
/* }}} */ /* }}} */
/* {{{ proto void IntlChar::enumCharTypes(callable $callback) */ /* {{{ */
typedef struct _enumCharType_data { typedef struct _enumCharType_data {
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache; zend_fcall_info_cache fci_cache;
@ -199,7 +197,7 @@ IC_METHOD(enumCharTypes) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getBlockCode(int|string $codepoint) */ /* {{{ */
IC_METHOD(getBlockCode) { IC_METHOD(getBlockCode) {
UChar32 cp; UChar32 cp;
@ -211,7 +209,7 @@ IC_METHOD(getBlockCode) {
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlChar::charName(int|string $codepoint, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) */ /* {{{ */
IC_METHOD(charName) { IC_METHOD(charName) {
UChar32 cp; UChar32 cp;
zend_string *string_codepoint; zend_string *string_codepoint;
@ -243,7 +241,7 @@ IC_METHOD(charName) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::charFromName(string $characterName, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) */ /* {{{ */
IC_METHOD(charFromName) { IC_METHOD(charFromName) {
char *name; char *name;
size_t name_len; size_t name_len;
@ -318,7 +316,7 @@ IC_METHOD(enumCharNames) {
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlChar::getPropertyName(int $property, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) */ /* {{{ */
IC_METHOD(getPropertyName) { IC_METHOD(getPropertyName) {
zend_long property; zend_long property;
zend_long nameChoice = U_LONG_PROPERTY_NAME; zend_long nameChoice = U_LONG_PROPERTY_NAME;
@ -339,7 +337,7 @@ IC_METHOD(getPropertyName) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getPropertyEnum(string $alias) */ /* {{{ */
IC_METHOD(getPropertyEnum) { IC_METHOD(getPropertyEnum) {
char *alias; char *alias;
size_t alias_len; size_t alias_len;
@ -352,7 +350,7 @@ IC_METHOD(getPropertyEnum) {
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlChar::getPropertyValueName(int $property, int $value[, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) */ /* {{{ */
IC_METHOD(getPropertyValueName) { IC_METHOD(getPropertyValueName) {
zend_long property, value, nameChoice = U_LONG_PROPERTY_NAME; zend_long property, value, nameChoice = U_LONG_PROPERTY_NAME;
const char *ret; const char *ret;
@ -372,7 +370,7 @@ IC_METHOD(getPropertyValueName) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::getPropertyValueEnum(int $property, string $name) */ /* {{{ */
IC_METHOD(getPropertyValueEnum) { IC_METHOD(getPropertyValueEnum) {
zend_long property; zend_long property;
char *name; char *name;
@ -386,7 +384,7 @@ IC_METHOD(getPropertyValueEnum) {
} }
/* }}} */ /* }}} */
/* {{{ proto int|string IntlChar::foldCase(int|string $codepoint, int $options = IntlChar::FOLD_CASE_DEFAULT) */ /* {{{ */
IC_METHOD(foldCase) { IC_METHOD(foldCase) {
UChar32 cp, ret; UChar32 cp, ret;
zend_long options = U_FOLD_CASE_DEFAULT; zend_long options = U_FOLD_CASE_DEFAULT;
@ -415,7 +413,7 @@ IC_METHOD(foldCase) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::digit(int|string $codepoint[, int $radix = 10]) */ /* {{{ */
IC_METHOD(digit) { IC_METHOD(digit) {
UChar32 cp; UChar32 cp;
zend_long radix = 10; zend_long radix = 10;
@ -443,7 +441,7 @@ IC_METHOD(digit) {
} }
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::forDigit(int $digit[, int $radix = 10]) */ /* {{{ */
IC_METHOD(forDigit) { IC_METHOD(forDigit) {
zend_long digit, radix = 10; zend_long digit, radix = 10;
@ -455,7 +453,7 @@ IC_METHOD(forDigit) {
} }
/* }}} */ /* }}} */
/* {{{ proto array IntlChar::charAge(int|string $codepoint) */ /* {{{ */
IC_METHOD(charAge) { IC_METHOD(charAge) {
UChar32 cp; UChar32 cp;
UVersionInfo version; UVersionInfo version;
@ -473,7 +471,7 @@ IC_METHOD(charAge) {
} }
/* }}} */ /* }}} */
/* {{{ proto array IntlChar::getUnicodeVersion() */ /* {{{ */
IC_METHOD(getUnicodeVersion) { IC_METHOD(getUnicodeVersion) {
UVersionInfo version; UVersionInfo version;
int i; int i;
@ -490,7 +488,7 @@ IC_METHOD(getUnicodeVersion) {
} }
/* }}} */ /* }}} */
/* {{{ proto string IntlChar::getFC_NFKC_Closure(int|string $codepoint) */ /* {{{ */
IC_METHOD(getFC_NFKC_Closure) { IC_METHOD(getFC_NFKC_Closure) {
UChar32 cp; UChar32 cp;
UChar *closure; UChar *closure;
@ -522,7 +520,7 @@ IC_METHOD(getFC_NFKC_Closure) {
} }
/* }}} */ /* }}} */
/* {{{ proto bool IntlChar::<name>(int|string $codepoint) */ /* {{{ */
#define IC_BOOL_METHOD_CHAR(name) \ #define IC_BOOL_METHOD_CHAR(name) \
IC_METHOD(name) { \ IC_METHOD(name) { \
UChar32 cp; \ UChar32 cp; \
@ -562,7 +560,7 @@ IC_BOOL_METHOD_CHAR(isJavaIDPart)
#undef IC_BOOL_METHOD_CHAR #undef IC_BOOL_METHOD_CHAR
/* }}} */ /* }}} */
/* {{{ proto int IntlChar::<name>(int|string $codepoint) */ /* {{{ */
#define IC_INT_METHOD_CHAR(name) \ #define IC_INT_METHOD_CHAR(name) \
IC_METHOD(name) { \ IC_METHOD(name) { \
UChar32 cp; \ UChar32 cp; \
@ -578,8 +576,7 @@ IC_INT_METHOD_CHAR(charDigitValue)
#undef IC_INT_METHOD_CHAR #undef IC_INT_METHOD_CHAR
/* }}} */ /* }}} */
/* {{{ proto int|string IntlChar::<name>(int|string $codepoint) /* {{{ Returns a utf-8 character if codepoint was passed as a utf-8 sequence
* Returns a utf-8 character if codepoint was passed as a utf-8 sequence
* Returns an int otherwise * Returns an int otherwise
*/ */
#define IC_CHAR_METHOD_CHAR(name) \ #define IC_CHAR_METHOD_CHAR(name) \

21
ext/json/json.c
View file

@ -92,8 +92,7 @@ static PHP_MINIT_FUNCTION(json)
} }
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(json) static PHP_GINIT_FUNCTION(json)
{ {
#if defined(COMPILE_DL_JSON) && defined(ZTS) #if defined(COMPILE_DL_JSON) && defined(ZTS)
@ -106,8 +105,7 @@ static PHP_GINIT_FUNCTION(json)
/* }}} */ /* }}} */
/* {{{ json_module_entry /* {{{ json_module_entry */
*/
zend_module_entry json_module_entry = { zend_module_entry json_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"json", "json",
@ -133,8 +131,7 @@ ZEND_TSRMLS_CACHE_DEFINE()
ZEND_GET_MODULE(json) ZEND_GET_MODULE(json)
#endif #endif
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
static PHP_MINFO_FUNCTION(json) static PHP_MINFO_FUNCTION(json)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -216,8 +213,7 @@ PHP_JSON_API int php_json_decode_ex(zval *return_value, const char *str, size_t
} }
/* }}} */ /* }}} */
/* {{{ proto string json_encode(mixed data [, int options[, int depth]]) /* {{{ Returns the JSON representation of a value */
Returns the JSON representation of a value */
PHP_FUNCTION(json_encode) PHP_FUNCTION(json_encode)
{ {
zval *parameter; zval *parameter;
@ -259,8 +255,7 @@ PHP_FUNCTION(json_encode)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed json_decode(string json [, bool assoc [, int depth]]) /* {{{ Decodes the JSON representation into a PHP value */
Decodes the JSON representation into a PHP value */
PHP_FUNCTION(json_decode) PHP_FUNCTION(json_decode)
{ {
char *str; char *str;
@ -314,8 +309,7 @@ PHP_FUNCTION(json_decode)
} }
/* }}} */ /* }}} */
/* {{{ proto int json_last_error() /* {{{ Returns the error code of the last json_encode() or json_decode() call. */
Returns the error code of the last json_encode() or json_decode() call. */
PHP_FUNCTION(json_last_error) PHP_FUNCTION(json_last_error)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -324,8 +318,7 @@ PHP_FUNCTION(json_last_error)
} }
/* }}} */ /* }}} */
/* {{{ proto string json_last_error_msg() /* {{{ Returns the error string of the last json_encode() or json_decode() call. */
Returns the error string of the last json_encode() or json_decode() call. */
PHP_FUNCTION(json_last_error_msg) PHP_FUNCTION(json_last_error_msg)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();

222
ext/ldap/ldap.c
View file

@ -693,15 +693,13 @@ static void _php_ldap_controls_free (LDAPControl*** ctrls)
} }
/* }}} */ /* }}} */
/* {{{ PHP_INI_BEGIN /* {{{ PHP_INI_BEGIN */
*/
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_ldap_globals, ldap_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("ldap.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_ldap_globals, ldap_globals, display_link_numbers)
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(ldap) static PHP_GINIT_FUNCTION(ldap)
{ {
#if defined(COMPILE_DL_LDAP) && defined(ZTS) #if defined(COMPILE_DL_LDAP) && defined(ZTS)
@ -711,8 +709,7 @@ static PHP_GINIT_FUNCTION(ldap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(ldap) PHP_MINIT_FUNCTION(ldap)
{ {
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
@ -932,8 +929,7 @@ PHP_MINIT_FUNCTION(ldap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(ldap) PHP_MSHUTDOWN_FUNCTION(ldap)
{ {
UNREGISTER_INI_ENTRIES(); UNREGISTER_INI_ENTRIES();
@ -941,8 +937,7 @@ PHP_MSHUTDOWN_FUNCTION(ldap)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(ldap) PHP_MINFO_FUNCTION(ldap)
{ {
char tmp[32]; char tmp[32];
@ -980,8 +975,7 @@ PHP_MINFO_FUNCTION(ldap)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_connect([string host [, int port [, string wallet [, string wallet_passwd [, int authmode]]]]]) /* {{{ Connect to an LDAP server */
Connect to an LDAP server */
PHP_FUNCTION(ldap_connect) PHP_FUNCTION(ldap_connect)
{ {
char *host = NULL; char *host = NULL;
@ -1083,8 +1077,7 @@ PHP_FUNCTION(ldap_connect)
} }
/* }}} */ /* }}} */
/* {{{ _get_lderrno /* {{{ _get_lderrno */
*/
static int _get_lderrno(LDAP *ldap) static int _get_lderrno(LDAP *ldap)
{ {
#if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP) #if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP)
@ -1099,8 +1092,7 @@ static int _get_lderrno(LDAP *ldap)
} }
/* }}} */ /* }}} */
/* {{{ _set_lderrno /* {{{ _set_lderrno */
*/
static void _set_lderrno(LDAP *ldap, int lderr) static void _set_lderrno(LDAP *ldap, int lderr)
{ {
#if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP) #if LDAP_API_VERSION > 2000 || defined(HAVE_ORALDAP)
@ -1112,8 +1104,7 @@ static void _set_lderrno(LDAP *ldap, int lderr)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]]) /* {{{ Bind to LDAP directory */
Bind to LDAP directory */
PHP_FUNCTION(ldap_bind) PHP_FUNCTION(ldap_bind)
{ {
zval *link; zval *link;
@ -1166,8 +1157,7 @@ PHP_FUNCTION(ldap_bind)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_bind_ext(resource link [, string dn [, string password [, serverctrls]]]) /* {{{ Bind to LDAP directory */
Bind to LDAP directory */
PHP_FUNCTION(ldap_bind_ext) PHP_FUNCTION(ldap_bind_ext)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -1252,8 +1242,7 @@ typedef struct {
char *authzid; char *authzid;
} php_ldap_bictx; } php_ldap_bictx;
/* {{{ _php_sasl_setdefs /* {{{ _php_sasl_setdefs */
*/
static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *sasl_authc_id, char *passwd, char *sasl_authz_id) static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *sasl_authc_id, char *passwd, char *sasl_authz_id)
{ {
php_ldap_bictx *ctx; php_ldap_bictx *ctx;
@ -1282,8 +1271,7 @@ static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_r
} }
/* }}} */ /* }}} */
/* {{{ _php_sasl_freedefs /* {{{ _php_sasl_freedefs */
*/
static void _php_sasl_freedefs(php_ldap_bictx *ctx) static void _php_sasl_freedefs(php_ldap_bictx *ctx)
{ {
if (ctx->mech) ber_memfree(ctx->mech); if (ctx->mech) ber_memfree(ctx->mech);
@ -1328,8 +1316,7 @@ static int _php_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *in
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [, string sasl_authz_id [, string props]]]]]]]) /* {{{ Bind to LDAP directory using SASL */
Bind to LDAP directory using SASL */
PHP_FUNCTION(ldap_sasl_bind) PHP_FUNCTION(ldap_sasl_bind)
{ {
zval *link; zval *link;
@ -1370,8 +1357,7 @@ PHP_FUNCTION(ldap_sasl_bind)
/* }}} */ /* }}} */
#endif /* HAVE_LDAP_SASL */ #endif /* HAVE_LDAP_SASL */
/* {{{ proto bool ldap_unbind(resource link) /* {{{ Unbind from LDAP directory */
Unbind from LDAP directory */
PHP_FUNCTION(ldap_unbind) PHP_FUNCTION(ldap_unbind)
{ {
zval *link; zval *link;
@ -1390,8 +1376,7 @@ PHP_FUNCTION(ldap_unbind)
} }
/* }}} */ /* }}} */
/* {{{ php_set_opts /* {{{ php_set_opts */
*/
static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, int *old_sizelimit, int *old_timelimit, int *old_deref) static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, int *old_sizelimit, int *old_timelimit, int *old_deref)
{ {
/* sizelimit */ /* sizelimit */
@ -1429,8 +1414,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in
} }
/* }}} */ /* }}} */
/* {{{ php_ldap_do_search /* {{{ php_ldap_do_search */
*/
static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
{ {
zval *link, *base_dn, *filter, *attrs = NULL, *attr, *serverctrls = NULL; zval *link, *base_dn, *filter, *attrs = NULL, *attr, *serverctrls = NULL;
@ -1677,32 +1661,28 @@ cleanup:
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_read(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) /* {{{ Read an entry */
Read an entry */
PHP_FUNCTION(ldap_read) PHP_FUNCTION(ldap_read)
{ {
php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE); php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_list(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) /* {{{ Single-level search */
Single-level search */
PHP_FUNCTION(ldap_list) PHP_FUNCTION(ldap_list)
{ {
php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL); php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_search(resource|array link, string base_dn, string filter [, array attrs [, int attrsonly [, int sizelimit [, int timelimit [, int deref [, array servercontrols]]]]]]) /* {{{ Search LDAP tree under base_dn */
Search LDAP tree under base_dn */
PHP_FUNCTION(ldap_search) PHP_FUNCTION(ldap_search)
{ {
php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE); php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_free_result(resource result) /* {{{ Free result memory */
Free result memory */
PHP_FUNCTION(ldap_free_result) PHP_FUNCTION(ldap_free_result)
{ {
zval *result; zval *result;
@ -1721,8 +1701,7 @@ PHP_FUNCTION(ldap_free_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int ldap_count_entries(resource link, resource result) /* {{{ Count the number of entries in a search result */
Count the number of entries in a search result */
PHP_FUNCTION(ldap_count_entries) PHP_FUNCTION(ldap_count_entries)
{ {
zval *link, *result; zval *link, *result;
@ -1745,8 +1724,7 @@ PHP_FUNCTION(ldap_count_entries)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_first_entry(resource link, resource result) /* {{{ Return first result id */
Return first result id */
PHP_FUNCTION(ldap_first_entry) PHP_FUNCTION(ldap_first_entry)
{ {
zval *link, *result; zval *link, *result;
@ -1778,8 +1756,7 @@ PHP_FUNCTION(ldap_first_entry)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_next_entry(resource link, resource result_entry) /* {{{ Get next result entry */
Get next result entry */
PHP_FUNCTION(ldap_next_entry) PHP_FUNCTION(ldap_next_entry)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -1810,8 +1787,7 @@ PHP_FUNCTION(ldap_next_entry)
} }
/* }}} */ /* }}} */
/* {{{ proto array ldap_get_entries(resource link, resource result) /* {{{ Get all result entries */
Get all result entries */
PHP_FUNCTION(ldap_get_entries) PHP_FUNCTION(ldap_get_entries)
{ {
zval *link, *result; zval *link, *result;
@ -1911,8 +1887,7 @@ PHP_FUNCTION(ldap_get_entries)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_first_attribute(resource link, resource result_entry) /* {{{ Return first attribute */
Return first attribute */
PHP_FUNCTION(ldap_first_attribute) PHP_FUNCTION(ldap_first_attribute)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -1944,8 +1919,7 @@ PHP_FUNCTION(ldap_first_attribute)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_next_attribute(resource link, resource result_entry) /* {{{ Get the next attribute in result */
Get the next attribute in result */
PHP_FUNCTION(ldap_next_attribute) PHP_FUNCTION(ldap_next_attribute)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -1988,8 +1962,7 @@ PHP_FUNCTION(ldap_next_attribute)
} }
/* }}} */ /* }}} */
/* {{{ proto array ldap_get_attributes(resource link, resource result_entry) /* {{{ Get attributes from a search result entry */
Get attributes from a search result entry */
PHP_FUNCTION(ldap_get_attributes) PHP_FUNCTION(ldap_get_attributes)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -2047,8 +2020,7 @@ PHP_FUNCTION(ldap_get_attributes)
} }
/* }}} */ /* }}} */
/* {{{ proto array ldap_get_values_len(resource link, resource result_entry, string attribute) /* {{{ Get all values with lengths from a result entry */
Get all values with lengths from a result entry */
PHP_FUNCTION(ldap_get_values_len) PHP_FUNCTION(ldap_get_values_len)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -2089,8 +2061,7 @@ PHP_FUNCTION(ldap_get_values_len)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_get_dn(resource link, resource result_entry) /* {{{ Get the DN of a result entry */
Get the DN of a result entry */
PHP_FUNCTION(ldap_get_dn) PHP_FUNCTION(ldap_get_dn)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -2124,8 +2095,7 @@ PHP_FUNCTION(ldap_get_dn)
} }
/* }}} */ /* }}} */
/* {{{ proto array ldap_explode_dn(string dn, int with_attrib) /* {{{ Splits DN into its component parts */
Splits DN into its component parts */
PHP_FUNCTION(ldap_explode_dn) PHP_FUNCTION(ldap_explode_dn)
{ {
zend_long with_attrib; zend_long with_attrib;
@ -2157,8 +2127,7 @@ PHP_FUNCTION(ldap_explode_dn)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_dn2ufn(string dn) /* {{{ Convert DN to User Friendly Naming format */
Convert DN to User Friendly Naming format */
PHP_FUNCTION(ldap_dn2ufn) PHP_FUNCTION(ldap_dn2ufn)
{ {
char *dn, *ufn; char *dn, *ufn;
@ -2184,8 +2153,7 @@ PHP_FUNCTION(ldap_dn2ufn)
/* added to fix use of ldap_modify_add for doing an ldap_add, gerrit thomson. */ /* added to fix use of ldap_modify_add for doing an ldap_add, gerrit thomson. */
#define PHP_LD_FULL_ADD 0xff #define PHP_LD_FULL_ADD 0xff
/* {{{ php_ldap_do_modify /* {{{ php_ldap_do_modify */
*/
static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext) static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -2362,8 +2330,7 @@ cleanup:
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_add(resource link, string dn, array entry [, array servercontrols]) /* {{{ Add entries to LDAP directory */
Add entries to LDAP directory */
PHP_FUNCTION(ldap_add) PHP_FUNCTION(ldap_add)
{ {
/* use a newly define parameter into the do_modify so ldap_mod_add can be used the way it is supposed to be used , Gerrit THomson */ /* use a newly define parameter into the do_modify so ldap_mod_add can be used the way it is supposed to be used , Gerrit THomson */
@ -2371,8 +2338,7 @@ PHP_FUNCTION(ldap_add)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_add_ext(resource link, string dn, array entry [, array servercontrols]) /* {{{ Add entries to LDAP directory */
Add entries to LDAP directory */
PHP_FUNCTION(ldap_add_ext) PHP_FUNCTION(ldap_add_ext)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD, 1); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD, 1);
@ -2381,56 +2347,49 @@ PHP_FUNCTION(ldap_add_ext)
/* three functions for attribute base modifications, gerrit Thomson */ /* three functions for attribute base modifications, gerrit Thomson */
/* {{{ proto bool ldap_mod_replace(resource link, string dn, array entry [, array servercontrols]) /* {{{ Replace attribute values with new ones */
Replace attribute values with new ones */
PHP_FUNCTION(ldap_mod_replace) PHP_FUNCTION(ldap_mod_replace)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 0); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_mod_replace_ext(resource link, string dn, array entry [, array servercontrols]) /* {{{ Replace attribute values with new ones */
Replace attribute values with new ones */
PHP_FUNCTION(ldap_mod_replace_ext) PHP_FUNCTION(ldap_mod_replace_ext)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 1); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_mod_add(resource link, string dn, array entry [, array servercontrols]) /* {{{ Add attribute values to current */
Add attribute values to current */
PHP_FUNCTION(ldap_mod_add) PHP_FUNCTION(ldap_mod_add)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 0); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_mod_add(resource link, string dn, array entry [, array servercontrols]) /* {{{ Add attribute values to current */
Add attribute values to current */
PHP_FUNCTION(ldap_mod_add_ext) PHP_FUNCTION(ldap_mod_add_ext)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 1); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_mod_del(resource link, string dn, array entry [, array servercontrols]) /* {{{ Delete attribute values */
Delete attribute values */
PHP_FUNCTION(ldap_mod_del) PHP_FUNCTION(ldap_mod_del)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 0); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_mod_del_ext(resource link, string dn, array entry [, array servercontrols]) /* {{{ Delete attribute values */
Delete attribute values */
PHP_FUNCTION(ldap_mod_del_ext) PHP_FUNCTION(ldap_mod_del_ext)
{ {
php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 1); php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE, 1);
} }
/* }}} */ /* }}} */
/* {{{ php_ldap_do_delete /* {{{ php_ldap_do_delete */
*/
static void php_ldap_do_delete(INTERNAL_FUNCTION_PARAMETERS, int ext) static void php_ldap_do_delete(INTERNAL_FUNCTION_PARAMETERS, int ext)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -2490,24 +2449,21 @@ cleanup:
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_delete(resource link, string dn [, array servercontrols]) /* {{{ Delete an entry from a directory */
Delete an entry from a directory */
PHP_FUNCTION(ldap_delete) PHP_FUNCTION(ldap_delete)
{ {
php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_delete_ext(resource link, string dn [, array servercontrols]) /* {{{ Delete an entry from a directory */
Delete an entry from a directory */
PHP_FUNCTION(ldap_delete_ext) PHP_FUNCTION(ldap_delete_ext)
{ {
php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_ldap_do_delete(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ _ldap_str_equal_to_const /* {{{ _ldap_str_equal_to_const */
*/
static size_t _ldap_str_equal_to_const(const char *str, size_t str_len, const char *cstr) static size_t _ldap_str_equal_to_const(const char *str, size_t str_len, const char *cstr)
{ {
size_t i; size_t i;
@ -2525,8 +2481,7 @@ static size_t _ldap_str_equal_to_const(const char *str, size_t str_len, const ch
} }
/* }}} */ /* }}} */
/* {{{ _ldap_strlen_max /* {{{ _ldap_strlen_max */
*/
static size_t _ldap_strlen_max(const char *str, size_t max_len) static size_t _ldap_strlen_max(const char *str, size_t max_len)
{ {
size_t i; size_t i;
@ -2541,16 +2496,14 @@ static size_t _ldap_strlen_max(const char *str, size_t max_len)
} }
/* }}} */ /* }}} */
/* {{{ _ldap_hash_fetch /* {{{ _ldap_hash_fetch */
*/
static void _ldap_hash_fetch(zval *hashTbl, const char *key, zval **out) static void _ldap_hash_fetch(zval *hashTbl, const char *key, zval **out)
{ {
*out = zend_hash_str_find(Z_ARRVAL_P(hashTbl), key, strlen(key)); *out = zend_hash_str_find(Z_ARRVAL_P(hashTbl), key, strlen(key));
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_modify_batch(resource link, string dn, array modifs [, array servercontrols]) /* {{{ Perform multiple modifications as part of one operation */
Perform multiple modifications as part of one operation */
PHP_FUNCTION(ldap_modify_batch) PHP_FUNCTION(ldap_modify_batch)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -2867,8 +2820,7 @@ PHP_FUNCTION(ldap_modify_batch)
} }
/* }}} */ /* }}} */
/* {{{ proto int ldap_errno(resource link) /* {{{ Get the current ldap error number */
Get the current ldap error number */
PHP_FUNCTION(ldap_errno) PHP_FUNCTION(ldap_errno)
{ {
zval *link; zval *link;
@ -2886,8 +2838,7 @@ PHP_FUNCTION(ldap_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_err2str(int errno) /* {{{ Convert error number to error string */
Convert error number to error string */
PHP_FUNCTION(ldap_err2str) PHP_FUNCTION(ldap_err2str)
{ {
zend_long perrno; zend_long perrno;
@ -2900,8 +2851,7 @@ PHP_FUNCTION(ldap_err2str)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_error(resource link) /* {{{ Get the current ldap error string */
Get the current ldap error string */
PHP_FUNCTION(ldap_error) PHP_FUNCTION(ldap_error)
{ {
zval *link; zval *link;
@ -2922,8 +2872,7 @@ PHP_FUNCTION(ldap_error)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_compare(resource link, string dn, string attr, string value) /* {{{ Determine if an entry has a specific value for one of its attributes */
Determine if an entry has a specific value for one of its attributes */
PHP_FUNCTION(ldap_compare) PHP_FUNCTION(ldap_compare)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -2980,8 +2929,7 @@ cleanup:
/* }}} */ /* }}} */
#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
/* {{{ proto bool ldap_get_option(resource link, int option, mixed retval) /* {{{ Get the current value of various session-wide parameters */
Get the current value of various session-wide parameters */
PHP_FUNCTION(ldap_get_option) PHP_FUNCTION(ldap_get_option)
{ {
zval *link, *retval; zval *link, *retval;
@ -3148,8 +3096,7 @@ PHP_FUNCTION(ldap_get_option)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_set_option(resource link, int option, mixed newval) /* {{{ Set the value of various session-wide parameters */
Set the value of various session-wide parameters */
PHP_FUNCTION(ldap_set_option) PHP_FUNCTION(ldap_set_option)
{ {
zval *link, *newval; zval *link, *newval;
@ -3331,8 +3278,7 @@ PHP_FUNCTION(ldap_set_option)
/* }}} */ /* }}} */
#ifdef HAVE_LDAP_PARSE_RESULT #ifdef HAVE_LDAP_PARSE_RESULT
/* {{{ proto bool ldap_parse_result(resource link, resource result, int &errcode [, string &matcheddn [, string &errmsg [, array &referrals [, array &controls]]]]) /* {{{ Extract information from result */
Extract information from result */
PHP_FUNCTION(ldap_parse_result) PHP_FUNCTION(ldap_parse_result)
{ {
zval *link, *result, *errcode, *matcheddn, *errmsg, *referrals, *serverctrls; zval *link, *result, *errcode, *matcheddn, *errmsg, *referrals, *serverctrls;
@ -3407,8 +3353,7 @@ PHP_FUNCTION(ldap_parse_result)
/* {{{ Extended operation response parsing, Pierangelo Masarati */ /* {{{ Extended operation response parsing, Pierangelo Masarati */
#ifdef HAVE_LDAP_PARSE_EXTENDED_RESULT #ifdef HAVE_LDAP_PARSE_EXTENDED_RESULT
/* {{{ proto bool ldap_parse_exop(resource link, resource result [, string &retdata [, string &retoid]]) /* {{{ Extract information from extended operation result */
Extract information from extended operation result */
PHP_FUNCTION(ldap_parse_exop) PHP_FUNCTION(ldap_parse_exop)
{ {
zval *link, *result, *retdata, *retoid; zval *link, *result, *retdata, *retoid;
@ -3464,8 +3409,7 @@ PHP_FUNCTION(ldap_parse_exop)
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto int ldap_count_references(resource link, resource result) /* {{{ Count the number of references in a search result */
Count the number of references in a search result */
PHP_FUNCTION(ldap_count_references) PHP_FUNCTION(ldap_count_references)
{ {
zval *link, *result; zval *link, *result;
@ -3488,8 +3432,7 @@ PHP_FUNCTION(ldap_count_references)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_first_reference(resource link, resource result) /* {{{ Return first reference */
Return first reference */
PHP_FUNCTION(ldap_first_reference) PHP_FUNCTION(ldap_first_reference)
{ {
zval *link, *result; zval *link, *result;
@ -3521,8 +3464,7 @@ PHP_FUNCTION(ldap_first_reference)
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_next_reference(resource link, resource reference_entry) /* {{{ Get next reference */
Get next reference */
PHP_FUNCTION(ldap_next_reference) PHP_FUNCTION(ldap_next_reference)
{ {
zval *link, *result_entry; zval *link, *result_entry;
@ -3555,8 +3497,7 @@ PHP_FUNCTION(ldap_next_reference)
/* }}} */ /* }}} */
#ifdef HAVE_LDAP_PARSE_REFERENCE #ifdef HAVE_LDAP_PARSE_REFERENCE
/* {{{ proto bool ldap_parse_reference(resource link, resource reference_entry, array &referrals) /* {{{ Extract information from reference entry */
Extract information from reference entry */
PHP_FUNCTION(ldap_parse_reference) PHP_FUNCTION(ldap_parse_reference)
{ {
zval *link, *result_entry, *referrals; zval *link, *result_entry, *referrals;
@ -3598,8 +3539,7 @@ PHP_FUNCTION(ldap_parse_reference)
/* }}} */ /* }}} */
#endif #endif
/* {{{ php_ldap_do_rename /* {{{ php_ldap_do_rename */
*/
static void php_ldap_do_rename(INTERNAL_FUNCTION_PARAMETERS, int ext) static void php_ldap_do_rename(INTERNAL_FUNCTION_PARAMETERS, int ext)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -3680,16 +3620,14 @@ cleanup:
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn [, array servercontrols]) /* {{{ Modify the name of an entry */
Modify the name of an entry */
PHP_FUNCTION(ldap_rename) PHP_FUNCTION(ldap_rename)
{ {
php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto resource ldap_rename_ext(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn [, array servercontrols]) /* {{{ Modify the name of an entry */
Modify the name of an entry */
PHP_FUNCTION(ldap_rename_ext) PHP_FUNCTION(ldap_rename_ext)
{ {
php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_ldap_do_rename(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@ -3697,8 +3635,7 @@ PHP_FUNCTION(ldap_rename_ext)
/* }}} */ /* }}} */
#ifdef HAVE_LDAP_START_TLS_S #ifdef HAVE_LDAP_START_TLS_S
/* {{{ proto bool ldap_start_tls(resource link) /* {{{ Start TLS */
Start TLS */
PHP_FUNCTION(ldap_start_tls) PHP_FUNCTION(ldap_start_tls)
{ {
zval *link; zval *link;
@ -3727,8 +3664,7 @@ PHP_FUNCTION(ldap_start_tls)
#endif /* (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) */ #endif /* (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) */
#if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC) #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
/* {{{ _ldap_rebind_proc() /* {{{ _ldap_rebind_proc() */
*/
int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgid, void *params) int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgid, void *params)
{ {
ldap_linkdata *ld; ldap_linkdata *ld;
@ -3760,8 +3696,7 @@ int _ldap_rebind_proc(LDAP *ldap, const char *url, ber_tag_t req, ber_int_t msgi
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_set_rebind_proc(resource link, ?callable callback) /* {{{ Set a callback function to do re-binds on referral chasing. */
Set a callback function to do re-binds on referral chasing. */
PHP_FUNCTION(ldap_set_rebind_proc) PHP_FUNCTION(ldap_set_rebind_proc)
{ {
zval *link, *callback; zval *link, *callback;
@ -3889,8 +3824,7 @@ PHP_FUNCTION(ldap_escape)
} }
#ifdef STR_TRANSLATION #ifdef STR_TRANSLATION
/* {{{ php_ldap_do_translate /* {{{ php_ldap_do_translate */
*/
static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way)
{ {
char *value; char *value;
@ -3921,16 +3855,14 @@ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way)
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_t61_to_8859(string value) /* {{{ Translate t61 characters to 8859 characters */
Translate t61 characters to 8859 characters */
PHP_FUNCTION(ldap_t61_to_8859) PHP_FUNCTION(ldap_t61_to_8859)
{ {
php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string ldap_8859_to_t61(string value) /* {{{ Translate 8859 characters to t61 characters */
Translate 8859 characters to t61 characters */
PHP_FUNCTION(ldap_8859_to_t61) PHP_FUNCTION(ldap_8859_to_t61)
{ {
php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_ldap_do_translate(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@ -3939,8 +3871,7 @@ PHP_FUNCTION(ldap_8859_to_t61)
#endif #endif
#ifdef LDAP_CONTROL_PAGEDRESULTS #ifdef LDAP_CONTROL_PAGEDRESULTS
/* {{{ proto mixed ldap_control_paged_result(resource link, int pagesize [, bool iscritical [, string cookie]]) /* {{{ Inject paged results control*/
Inject paged results control*/
PHP_FUNCTION(ldap_control_paged_result) PHP_FUNCTION(ldap_control_paged_result)
{ {
zend_long pagesize; zend_long pagesize;
@ -4033,8 +3964,7 @@ lcpr_error_out:
} }
/* }}} */ /* }}} */
/* {{{ proto bool ldap_control_paged_result_response(resource link, resource result [, string &cookie [, int &estimated]]) /* {{{ Extract paged results control response */
Extract paged results control response */
PHP_FUNCTION(ldap_control_paged_result_response) PHP_FUNCTION(ldap_control_paged_result_response)
{ {
zval *link, *result, *cookie, *estimated; zval *link, *result, *cookie, *estimated;
@ -4131,8 +4061,7 @@ PHP_FUNCTION(ldap_control_paged_result_response)
/* {{{ Extended operations, Pierangelo Masarati */ /* {{{ Extended operations, Pierangelo Masarati */
#ifdef HAVE_LDAP_EXTENDED_OPERATION_S #ifdef HAVE_LDAP_EXTENDED_OPERATION_S
/* {{{ proto resource ldap_exop(resource link, string reqoid [, string reqdata [, array servercontrols [, string &retdata [, string &retoid]]]]) /* {{{ Extended operation */
Extended operation */
PHP_FUNCTION(ldap_exop) PHP_FUNCTION(ldap_exop)
{ {
zval *serverctrls = NULL; zval *serverctrls = NULL;
@ -4234,8 +4163,7 @@ PHP_FUNCTION(ldap_exop)
#endif #endif
#ifdef HAVE_LDAP_PASSWD #ifdef HAVE_LDAP_PASSWD
/* {{{ proto bool|string ldap_exop_passwd(resource link [, string user [, string oldpw [, string newpw [, array ctrls]]]]) /* {{{ Passwd modify extended operation */
Passwd modify extended operation */
PHP_FUNCTION(ldap_exop_passwd) PHP_FUNCTION(ldap_exop_passwd)
{ {
zval *link, *serverctrls; zval *link, *serverctrls;
@ -4327,8 +4255,7 @@ PHP_FUNCTION(ldap_exop_passwd)
#endif #endif
#ifdef HAVE_LDAP_WHOAMI_S #ifdef HAVE_LDAP_WHOAMI_S
/* {{{ proto bool|string ldap_exop_whoami(resource link) /* {{{ Whoami extended operation */
Whoami extended operation */
PHP_FUNCTION(ldap_exop_whoami) PHP_FUNCTION(ldap_exop_whoami)
{ {
zval *link; zval *link;
@ -4363,8 +4290,7 @@ PHP_FUNCTION(ldap_exop_whoami)
#endif #endif
#ifdef HAVE_LDAP_REFRESH_S #ifdef HAVE_LDAP_REFRESH_S
/* {{{ proto bool|int ldap_exop_refresh(resource link , string dn , int ttl) /* {{{ DDS refresh extended operation */
DDS refresh extended operation */
PHP_FUNCTION(ldap_exop_refresh) PHP_FUNCTION(ldap_exop_refresh)
{ {
zval *link, *ttl; zval *link, *ttl;

21
ext/libxml/libxml.c
View file

@ -892,8 +892,7 @@ static PHP_MINFO_FUNCTION(libxml)
} }
/* }}} */ /* }}} */
/* {{{ proto void libxml_set_streams_context(resource streams_context) /* {{{ Set the streams context for the next libxml document load or write */
Set the streams context for the next libxml document load or write */
PHP_FUNCTION(libxml_set_streams_context) PHP_FUNCTION(libxml_set_streams_context)
{ {
zval *arg; zval *arg;
@ -910,8 +909,7 @@ PHP_FUNCTION(libxml_set_streams_context)
} }
/* }}} */ /* }}} */
/* {{{ proto bool libxml_use_internal_errors([boolean use_errors]) /* {{{ Disable libxml errors and allow user to fetch error information as needed */
Disable libxml errors and allow user to fetch error information as needed */
PHP_FUNCTION(libxml_use_internal_errors) PHP_FUNCTION(libxml_use_internal_errors)
{ {
xmlStructuredErrorFunc current_handler; xmlStructuredErrorFunc current_handler;
@ -951,8 +949,7 @@ PHP_FUNCTION(libxml_use_internal_errors)
} }
/* }}} */ /* }}} */
/* {{{ proto object libxml_get_last_error() /* {{{ Retrieve last error from libxml */
Retrieve last error from libxml */
PHP_FUNCTION(libxml_get_last_error) PHP_FUNCTION(libxml_get_last_error)
{ {
xmlErrorPtr error; xmlErrorPtr error;
@ -983,8 +980,7 @@ PHP_FUNCTION(libxml_get_last_error)
} }
/* }}} */ /* }}} */
/* {{{ proto object libxml_get_errors() /* {{{ Retrieve array of errors */
Retrieve array of errors */
PHP_FUNCTION(libxml_get_errors) PHP_FUNCTION(libxml_get_errors)
{ {
@ -1025,8 +1021,7 @@ PHP_FUNCTION(libxml_get_errors)
} }
/* }}} */ /* }}} */
/* {{{ proto void libxml_clear_errors() /* {{{ Clear last error from libxml */
Clear last error from libxml */
PHP_FUNCTION(libxml_clear_errors) PHP_FUNCTION(libxml_clear_errors)
{ {
ZEND_PARSE_PARAMETERS_NONE(); ZEND_PARSE_PARAMETERS_NONE();
@ -1046,8 +1041,7 @@ PHP_LIBXML_API zend_bool php_libxml_disable_entity_loader(zend_bool disable) /*
return old; return old;
} /* }}} */ } /* }}} */
/* {{{ proto bool libxml_disable_entity_loader([boolean disable]) /* {{{ Disable/Enable ability to load external entities */
Disable/Enable ability to load external entities */
PHP_FUNCTION(libxml_disable_entity_loader) PHP_FUNCTION(libxml_disable_entity_loader)
{ {
zend_bool disable = 1; zend_bool disable = 1;
@ -1061,8 +1055,7 @@ PHP_FUNCTION(libxml_disable_entity_loader)
} }
/* }}} */ /* }}} */
/* {{{ proto void libxml_set_external_entity_loader(callback resolver_function) /* {{{ Changes the default external entity loader */
Changes the default external entity loader */
PHP_FUNCTION(libxml_set_external_entity_loader) PHP_FUNCTION(libxml_set_external_entity_loader)
{ {
zend_fcall_info fci; zend_fcall_info fci;

132
ext/mbstring/mbstring.c
View file

@ -1299,8 +1299,7 @@ PHP_MINFO_FUNCTION(mbstring)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_language([string language]) /* {{{ Sets the current language or Returns the current language as a string */
Sets the current language or Returns the current language as a string */
PHP_FUNCTION(mb_language) PHP_FUNCTION(mb_language)
{ {
zend_string *name = NULL; zend_string *name = NULL;
@ -1324,8 +1323,7 @@ PHP_FUNCTION(mb_language)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_internal_encoding([string encoding]) /* {{{ Sets the current internal encoding or Returns the current internal encoding as a string */
Sets the current internal encoding or Returns the current internal encoding as a string */
PHP_FUNCTION(mb_internal_encoding) PHP_FUNCTION(mb_internal_encoding)
{ {
const char *name = NULL; const char *name = NULL;
@ -1353,8 +1351,7 @@ PHP_FUNCTION(mb_internal_encoding)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mb_http_input([string type]) /* {{{ Returns the input encoding */
Returns the input encoding */
PHP_FUNCTION(mb_http_input) PHP_FUNCTION(mb_http_input)
{ {
char *typ = NULL; char *typ = NULL;
@ -1448,8 +1445,7 @@ PHP_FUNCTION(mb_http_input)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_http_output([string encoding]) /* {{{ Sets the current output_encoding or returns the current output_encoding as a string */
Sets the current output_encoding or returns the current output_encoding as a string */
PHP_FUNCTION(mb_http_output) PHP_FUNCTION(mb_http_output)
{ {
const char *name = NULL; const char *name = NULL;
@ -1478,8 +1474,7 @@ PHP_FUNCTION(mb_http_output)
} }
/* }}} */ /* }}} */
/* {{{ proto bool|array mb_detect_order([mixed encoding-list]) /* {{{ Sets the current detect_order or Return the current detect_order as a array */
Sets the current detect_order or Return the current detect_order as a array */
PHP_FUNCTION(mb_detect_order) PHP_FUNCTION(mb_detect_order)
{ {
zend_string *order_str = NULL; zend_string *order_str = NULL;
@ -1547,8 +1542,7 @@ static inline int php_mb_check_code_point(zend_long cp)
return 1; return 1;
} }
/* {{{ proto string|int|true mb_substitute_character([string|int|null substitute_character]) /* {{{ Sets the current substitute_character or returns the current substitute_character */
Sets the current substitute_character or returns the current substitute_character */
PHP_FUNCTION(mb_substitute_character) PHP_FUNCTION(mb_substitute_character)
{ {
zend_string *substitute_character = NULL; zend_string *substitute_character = NULL;
@ -1602,8 +1596,7 @@ PHP_FUNCTION(mb_substitute_character)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_preferred_mime_name(string encoding) /* {{{ Return the preferred MIME name (charset) as a string */
Return the preferred MIME name (charset) as a string */
PHP_FUNCTION(mb_preferred_mime_name) PHP_FUNCTION(mb_preferred_mime_name)
{ {
enum mbfl_no_encoding no_encoding; enum mbfl_no_encoding no_encoding;
@ -1633,8 +1626,7 @@ PHP_FUNCTION(mb_preferred_mime_name)
#define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0) #define IS_SJIS1(c) ((((c)>=0x81 && (c)<=0x9f) || ((c)>=0xe0 && (c)<=0xf5)) ? 1 : 0)
#define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0) #define IS_SJIS2(c) ((((c)>=0x40 && (c)<=0x7e) || ((c)>=0x80 && (c)<=0xfc)) ? 1 : 0)
/* {{{ proto bool mb_parse_str(string encoded_string, array &result) /* {{{ Parses GET/POST/COOKIE data and sets global variables */
Parses GET/POST/COOKIE data and sets global variables */
PHP_FUNCTION(mb_parse_str) PHP_FUNCTION(mb_parse_str)
{ {
zval *track_vars_array; zval *track_vars_array;
@ -1674,8 +1666,7 @@ PHP_FUNCTION(mb_parse_str)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_output_handler(string contents, int status) /* {{{ Returns string in output buffer converted to the http_output encoding */
Returns string in output buffer converted to the http_output encoding */
PHP_FUNCTION(mb_output_handler) PHP_FUNCTION(mb_output_handler)
{ {
char *arg_string; char *arg_string;
@ -1778,8 +1769,7 @@ PHP_FUNCTION(mb_output_handler)
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_str_split(string str [, int split_length] [, string encoding]) /* {{{ Convert a multibyte string to an array. If split_length is specified,
Convert a multibyte string to an array. If split_length is specified,
break the string down into chunks each split_length characters long. */ break the string down into chunks each split_length characters long. */
/* structure to pass split params to the callback */ /* structure to pass split params to the callback */
@ -1941,8 +1931,7 @@ PHP_FUNCTION(mb_str_split)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_strlen(string str [, string encoding]) /* {{{ Get character numbers of a string */
Get character numbers of a string */
PHP_FUNCTION(mb_strlen) PHP_FUNCTION(mb_strlen)
{ {
size_t n; size_t n;
@ -1988,8 +1977,7 @@ static void handle_strpos_error(size_t error) {
} }
} }
/* {{{ proto int mb_strpos(string haystack, string needle [, int offset [, string encoding]]) /* {{{ Find position of first occurrence of a string within another */
Find position of first occurrence of a string within another */
PHP_FUNCTION(mb_strpos) PHP_FUNCTION(mb_strpos)
{ {
int reverse = 0; int reverse = 0;
@ -2017,8 +2005,7 @@ PHP_FUNCTION(mb_strpos)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_strrpos(string haystack, string needle [, int offset [, string encoding]]) /* {{{ Find position of last occurrence of a string within another */
Find position of last occurrence of a string within another */
PHP_FUNCTION(mb_strrpos) PHP_FUNCTION(mb_strrpos)
{ {
mbfl_string haystack, needle; mbfl_string haystack, needle;
@ -2044,8 +2031,7 @@ PHP_FUNCTION(mb_strrpos)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) /* {{{ Finds position of first occurrence of a string within another, case insensitive */
Finds position of first occurrence of a string within another, case insensitive */
PHP_FUNCTION(mb_stripos) PHP_FUNCTION(mb_stripos)
{ {
size_t n = (size_t) -1; size_t n = (size_t) -1;
@ -2074,8 +2060,7 @@ PHP_FUNCTION(mb_stripos)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) /* {{{ Finds position of last occurrence of a string within another, case insensitive */
Finds position of last occurrence of a string within another, case insensitive */
PHP_FUNCTION(mb_strripos) PHP_FUNCTION(mb_strripos)
{ {
size_t n = (size_t) -1; size_t n = (size_t) -1;
@ -2158,32 +2143,28 @@ static void php_mb_strstr_variants(INTERNAL_FUNCTION_PARAMETERS, unsigned int va
} }
} }
/* {{{ proto string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) /* {{{ Finds first occurrence of a string within another */
Finds first occurrence of a string within another */
PHP_FUNCTION(mb_strstr) PHP_FUNCTION(mb_strstr)
{ {
php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRSTR); php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRSTR);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) /* {{{ Finds the last occurrence of a character in a string within another */
Finds the last occurrence of a character in a string within another */
PHP_FUNCTION(mb_strrchr) PHP_FUNCTION(mb_strrchr)
{ {
php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRCHR); php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRCHR);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) /* {{{ Finds first occurrence of a string within another, case insensitive */
Finds first occurrence of a string within another, case insensitive */
PHP_FUNCTION(mb_stristr) PHP_FUNCTION(mb_stristr)
{ {
php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRISTR); php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRISTR);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) /* {{{ Finds the last occurrence of a character in a string within another, case insensitive */
Finds the last occurrence of a character in a string within another, case insensitive */
PHP_FUNCTION(mb_strrichr) PHP_FUNCTION(mb_strrichr)
{ {
php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRICHR); php_mb_strstr_variants(INTERNAL_FUNCTION_PARAM_PASSTHRU, MB_STRRICHR);
@ -2195,8 +2176,7 @@ PHP_FUNCTION(mb_strrichr)
#undef MB_STRISTR #undef MB_STRISTR
#undef MB_STRRICHR #undef MB_STRRICHR
/* {{{ proto int mb_substr_count(string haystack, string needle [, string encoding]) /* {{{ Count the number of substring occurrences */
Count the number of substring occurrences */
PHP_FUNCTION(mb_substr_count) PHP_FUNCTION(mb_substr_count)
{ {
size_t n; size_t n;
@ -2227,8 +2207,7 @@ PHP_FUNCTION(mb_substr_count)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_substr(string str, int start [, int length [, string encoding]]) /* {{{ Returns part of a string */
Returns part of a string */
PHP_FUNCTION(mb_substr) PHP_FUNCTION(mb_substr)
{ {
char *str; char *str;
@ -2290,8 +2269,7 @@ PHP_FUNCTION(mb_substr)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strcut(string str, int start [, int length [, string encoding]]) /* {{{ Returns part of a string */
Returns part of a string */
PHP_FUNCTION(mb_strcut) PHP_FUNCTION(mb_strcut)
{ {
zend_string *encoding = NULL; zend_string *encoding = NULL;
@ -2346,8 +2324,7 @@ PHP_FUNCTION(mb_strcut)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_strwidth(string str [, string encoding]) /* {{{ Gets terminal width of a string */
Gets terminal width of a string */
PHP_FUNCTION(mb_strwidth) PHP_FUNCTION(mb_strwidth)
{ {
size_t n; size_t n;
@ -2369,8 +2346,7 @@ PHP_FUNCTION(mb_strwidth)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strimwidth(string str, int start, int width [, string trimmarker [, string encoding]]) /* {{{ Trim the string in terminal width */
Trim the string in terminal width */
PHP_FUNCTION(mb_strimwidth) PHP_FUNCTION(mb_strimwidth)
{ {
char *str, *trimmarker = NULL; char *str, *trimmarker = NULL;
@ -2592,8 +2568,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons
/* }}} */ /* }}} */
/* {{{ proto string mb_convert_encoding(string str, string to-encoding [, mixed from-encoding]) /* {{{ Returns converted string in desired encoding */
Returns converted string in desired encoding */
PHP_FUNCTION(mb_convert_encoding) PHP_FUNCTION(mb_convert_encoding)
{ {
zend_string *to_encoding_name; zend_string *to_encoding_name;
@ -2674,8 +2649,7 @@ static char *mbstring_convert_case(
MBSTRG(current_filter_illegal_mode), MBSTRG(current_filter_illegal_substchar)); MBSTRG(current_filter_illegal_mode), MBSTRG(current_filter_illegal_substchar));
} }
/* {{{ proto string mb_convert_case(string source_string, int mode [, string encoding]) /* {{{ Returns a case-folded version of source_string */
Returns a case-folded version of source_string */
PHP_FUNCTION(mb_convert_case) PHP_FUNCTION(mb_convert_case)
{ {
zend_string *from_encoding = NULL; zend_string *from_encoding = NULL;
@ -2711,9 +2685,7 @@ PHP_FUNCTION(mb_convert_case)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strtoupper(string source_string [, string encoding]) /* {{{ Returns a upper cased version of source_string */
* Returns a upper cased version of source_string
*/
PHP_FUNCTION(mb_strtoupper) PHP_FUNCTION(mb_strtoupper)
{ {
zend_string *from_encoding = NULL; zend_string *from_encoding = NULL;
@ -2742,9 +2714,7 @@ PHP_FUNCTION(mb_strtoupper)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_strtolower(string source_string [, string encoding]) /* {{{ Returns a lower cased version of source_string */
* Returns a lower cased version of source_string
*/
PHP_FUNCTION(mb_strtolower) PHP_FUNCTION(mb_strtolower)
{ {
zend_string *from_encoding = NULL; zend_string *from_encoding = NULL;
@ -2773,8 +2743,7 @@ PHP_FUNCTION(mb_strtolower)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_detect_encoding(string str [, mixed encoding_list [, bool strict]]) /* {{{ Encodings of the given string is returned (as a string) */
Encodings of the given string is returned (as a string) */
PHP_FUNCTION(mb_detect_encoding) PHP_FUNCTION(mb_detect_encoding)
{ {
char *str; char *str;
@ -2840,8 +2809,7 @@ PHP_FUNCTION(mb_detect_encoding)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mb_list_encodings() /* {{{ Returns an array of all supported entity encodings */
Returns an array of all supported entity encodings */
PHP_FUNCTION(mb_list_encodings) PHP_FUNCTION(mb_list_encodings)
{ {
const mbfl_encoding **encodings; const mbfl_encoding **encodings;
@ -2861,8 +2829,7 @@ PHP_FUNCTION(mb_list_encodings)
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_encoding_aliases(string encoding) /* {{{ Returns an array of the aliases of a given encoding name */
Returns an array of the aliases of a given encoding name */
PHP_FUNCTION(mb_encoding_aliases) PHP_FUNCTION(mb_encoding_aliases)
{ {
const mbfl_encoding *encoding; const mbfl_encoding *encoding;
@ -2887,8 +2854,7 @@ PHP_FUNCTION(mb_encoding_aliases)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed [, int indent]]]]) /* {{{ Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */
Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader) PHP_FUNCTION(mb_encode_mimeheader)
{ {
const mbfl_encoding *charset, *transenc; const mbfl_encoding *charset, *transenc;
@ -2939,8 +2905,7 @@ PHP_FUNCTION(mb_encode_mimeheader)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_decode_mimeheader(string string) /* {{{ Decodes the MIME "encoded-word" in the string */
Decodes the MIME "encoded-word" in the string */
PHP_FUNCTION(mb_decode_mimeheader) PHP_FUNCTION(mb_decode_mimeheader)
{ {
mbfl_string string, result, *ret; mbfl_string string, result, *ret;
@ -2960,8 +2925,7 @@ PHP_FUNCTION(mb_decode_mimeheader)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_convert_kana(string str [, string option] [, string encoding]) /* {{{ Conversion between full-width character and half-width character (Japanese) */
Conversion between full-width character and half-width character (Japanese) */
PHP_FUNCTION(mb_convert_kana) PHP_FUNCTION(mb_convert_kana)
{ {
int opt; int opt;
@ -3147,8 +3111,7 @@ static int mb_recursive_convert_variable(mbfl_buffer_converter *convd, zval *var
return 0; return 0;
} /* }}} */ } /* }}} */
/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding, mixed vars [, ...]) /* {{{ Converts the string resource in variables to desired encoding */
Converts the string resource in variables to desired encoding */
PHP_FUNCTION(mb_convert_variables) PHP_FUNCTION(mb_convert_variables)
{ {
zval *args; zval *args;
@ -3322,16 +3285,14 @@ php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_encode_numericentity(string string, array convmap [, string encoding [, bool is_hex]]) /* {{{ Converts specified characters to HTML numeric entities */
Converts specified characters to HTML numeric entities */
PHP_FUNCTION(mb_encode_numericentity) PHP_FUNCTION(mb_encode_numericentity)
{ {
php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_decode_numericentity(string string, array convmap [, string encoding]) /* {{{ Converts HTML numeric entities to character code */
Converts HTML numeric entities to character code */
PHP_FUNCTION(mb_decode_numericentity) PHP_FUNCTION(mb_decode_numericentity)
{ {
php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@ -3339,9 +3300,7 @@ PHP_FUNCTION(mb_decode_numericentity)
/* }}} */ /* }}} */
/* }}} */ /* }}} */
/* {{{ proto int mb_send_mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) /* {{{ Sends an email message with MIME scheme */
* Sends an email message with MIME scheme
*/
#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos) \ #define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos) \
if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) { \ if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) { \
@ -3810,8 +3769,7 @@ PHP_FUNCTION(mb_send_mail)
#undef PHP_MBSTR_MAIL_MIME_HEADER4 #undef PHP_MBSTR_MAIL_MIME_HEADER4
/* }}} */ /* }}} */
/* {{{ proto mixed mb_get_info([string type]) /* {{{ Returns the current settings of mbstring */
Returns the current settings of mbstring */
PHP_FUNCTION(mb_get_info) PHP_FUNCTION(mb_get_info)
{ {
char *typ = NULL; char *typ = NULL;
@ -4074,8 +4032,7 @@ static int php_mb_check_encoding_recursive(HashTable *vars, const mbfl_encoding
} }
/* {{{ proto bool mb_check_encoding([mixed var[, string encoding]]) /* {{{ Check if the string is valid for the specified encoding */
Check if the string is valid for the specified encoding */
PHP_FUNCTION(mb_check_encoding) PHP_FUNCTION(mb_check_encoding)
{ {
zend_string *input_str = NULL, *enc = NULL; zend_string *input_str = NULL, *enc = NULL;
@ -4160,7 +4117,7 @@ static inline zend_long php_mb_ord(const char *str, size_t str_len, zend_string
} }
/* {{{ proto int|false mb_ord([string str[, string encoding]]) */ /* {{{ */
PHP_FUNCTION(mb_ord) PHP_FUNCTION(mb_ord)
{ {
char *str; char *str;
@ -4277,7 +4234,7 @@ static inline zend_string *php_mb_chr(zend_long cp, zend_string *enc_name, uint3
} }
/* {{{ proto string|false mb_chr([int cp[, string encoding]]) */ /* {{{ */
PHP_FUNCTION(mb_chr) PHP_FUNCTION(mb_chr)
{ {
zend_long cp; zend_long cp;
@ -4299,7 +4256,7 @@ PHP_FUNCTION(mb_chr)
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_scrub([string str[, string encoding]]) */ /* {{{ */
PHP_FUNCTION(mb_scrub) PHP_FUNCTION(mb_scrub)
{ {
const mbfl_encoding *enc; const mbfl_encoding *enc;
@ -4436,8 +4393,7 @@ MBSTRING_API char *php_mb_safe_strrchr(const char *s, unsigned int c, size_t nby
} }
/* }}} */ /* }}} */
/* {{{ MBSTRING_API int php_mb_stripos() /* {{{ MBSTRING_API int php_mb_stripos() */
*/
MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t old_haystack_len, const char *old_needle, size_t old_needle_len, zend_long offset, const mbfl_encoding *enc) MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t old_haystack_len, const char *old_needle, size_t old_needle_len, zend_long offset, const mbfl_encoding *enc)
{ {
size_t n = (size_t) -1; size_t n = (size_t) -1;

48
ext/mbstring/php_mbregex.c
View file

@ -846,8 +846,7 @@ static inline void mb_regex_substitute(
* php functions * php functions
*/ */
/* {{{ proto string mb_regex_encoding([string encoding]) /* {{{ Returns the current encoding for regex as a string. */
Returns the current encoding for regex as a string. */
PHP_FUNCTION(mb_regex_encoding) PHP_FUNCTION(mb_regex_encoding)
{ {
char *encoding = NULL; char *encoding = NULL;
@ -982,16 +981,14 @@ out:
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_ereg(string pattern, string string [, array registers]) /* {{{ Regular expression match for multibyte string */
Regular expression match for multibyte string */
PHP_FUNCTION(mb_ereg) PHP_FUNCTION(mb_ereg)
{ {
_php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_eregi(string pattern, string string [, array registers]) /* {{{ Case-insensitive regular expression match for multibyte string */
Case-insensitive regular expression match for multibyte string */
PHP_FUNCTION(mb_eregi) PHP_FUNCTION(mb_eregi)
{ {
_php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@ -1178,32 +1175,28 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) /* {{{ Replace regular expression for multibyte string */
Replace regular expression for multibyte string */
PHP_FUNCTION(mb_ereg_replace) PHP_FUNCTION(mb_ereg_replace)
{ {
_php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_eregi_replace(string pattern, string replacement, string string) /* {{{ Case insensitive replace regular expression for multibyte string */
Case insensitive replace regular expression for multibyte string */
PHP_FUNCTION(mb_eregi_replace) PHP_FUNCTION(mb_eregi_replace)
{ {
_php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, ONIG_OPTION_IGNORECASE, 0); _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, ONIG_OPTION_IGNORECASE, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_ereg_replace_callback(string pattern, string callback, string string [, string option]) /* {{{ regular expression for multibyte string using replacement callback */
regular expression for multibyte string using replacement callback */
PHP_FUNCTION(mb_ereg_replace_callback) PHP_FUNCTION(mb_ereg_replace_callback)
{ {
_php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1); _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_split(string pattern, string string [, int limit]) /* {{{ split multibyte string into array by regular expression */
split multibyte string into array by regular expression */
PHP_FUNCTION(mb_split) PHP_FUNCTION(mb_split)
{ {
char *arg_pattern; char *arg_pattern;
@ -1285,8 +1278,7 @@ PHP_FUNCTION(mb_split)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mb_ereg_match(string pattern, string string [,string option]) /* {{{ Regular expression match for multibyte string */
Regular expression match for multibyte string */
PHP_FUNCTION(mb_ereg_match) PHP_FUNCTION(mb_ereg_match)
{ {
char *arg_pattern; char *arg_pattern;
@ -1463,32 +1455,28 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mb_ereg_search([string pattern[, string option]]) /* {{{ Regular expression search for multibyte string */
Regular expression search for multibyte string */
PHP_FUNCTION(mb_ereg_search) PHP_FUNCTION(mb_ereg_search)
{ {
_php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_ereg_search_pos([string pattern[, string option]]) /* {{{ Regular expression search for multibyte string */
Regular expression search for multibyte string */
PHP_FUNCTION(mb_ereg_search_pos) PHP_FUNCTION(mb_ereg_search_pos)
{ {
_php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_ereg_search_regs([string pattern[, string option]]) /* {{{ Regular expression search for multibyte string */
Regular expression search for multibyte string */
PHP_FUNCTION(mb_ereg_search_regs) PHP_FUNCTION(mb_ereg_search_regs)
{ {
_php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2); _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
} }
/* }}} */ /* }}} */
/* {{{ proto bool mb_ereg_search_init(string string [, string pattern[, string option]]) /* {{{ Initialize string and regular expression for search. */
Initialize string and regular expression for search. */
PHP_FUNCTION(mb_ereg_search_init) PHP_FUNCTION(mb_ereg_search_init)
{ {
zend_string *arg_str; zend_string *arg_str;
@ -1546,8 +1534,7 @@ PHP_FUNCTION(mb_ereg_search_init)
} }
/* }}} */ /* }}} */
/* {{{ proto array mb_ereg_search_getregs(void) /* {{{ Get matched substring of the last time */
Get matched substring of the last time */
PHP_FUNCTION(mb_ereg_search_getregs) PHP_FUNCTION(mb_ereg_search_getregs)
{ {
size_t n, i, len; size_t n, i, len;
@ -1589,8 +1576,7 @@ PHP_FUNCTION(mb_ereg_search_getregs)
} }
/* }}} */ /* }}} */
/* {{{ proto int mb_ereg_search_getpos(void) /* {{{ Get search start position */
Get search start position */
PHP_FUNCTION(mb_ereg_search_getpos) PHP_FUNCTION(mb_ereg_search_getpos)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -1601,8 +1587,7 @@ PHP_FUNCTION(mb_ereg_search_getpos)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mb_ereg_search_setpos(int position) /* {{{ Set search start position */
Set search start position */
PHP_FUNCTION(mb_ereg_search_setpos) PHP_FUNCTION(mb_ereg_search_setpos)
{ {
zend_long position; zend_long position;
@ -1641,8 +1626,7 @@ static void _php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *sy
} }
/* }}} */ /* }}} */
/* {{{ proto string mb_regex_set_options([string options]) /* {{{ Set or get the default options for mbregex functions */
Set or get the default options for mbregex functions */
PHP_FUNCTION(mb_regex_set_options) PHP_FUNCTION(mb_regex_set_options)
{ {
OnigOptionType opt, prev_opt; OnigOptionType opt, prev_opt;

48
ext/mysqli/mysqli.c
View file

@ -192,8 +192,7 @@ void php_clear_mysql(MY_MYSQL *mysql) {
} }
/* }}} */ /* }}} */
/* {{{ mysqli_objects_free_storage /* {{{ mysqli_objects_free_storage */
*/
static void mysqli_objects_free_storage(zend_object *object) static void mysqli_objects_free_storage(zend_object *object)
{ {
mysqli_object *intern = php_mysqli_fetch_object(object); mysqli_object *intern = php_mysqli_fetch_object(object);
@ -208,8 +207,7 @@ static void mysqli_objects_free_storage(zend_object *object)
/* mysqli_link_free_storage partly doubles the work of PHP_FUNCTION(mysqli_close) */ /* mysqli_link_free_storage partly doubles the work of PHP_FUNCTION(mysqli_close) */
/* {{{ mysqli_link_free_storage /* {{{ mysqli_link_free_storage */
*/
static void mysqli_link_free_storage(zend_object *object) static void mysqli_link_free_storage(zend_object *object)
{ {
mysqli_object *intern = php_mysqli_fetch_object(object); mysqli_object *intern = php_mysqli_fetch_object(object);
@ -235,8 +233,7 @@ static void mysqli_driver_free_storage(zend_object *object)
} }
/* }}} */ /* }}} */
/* {{{ mysqli_stmt_free_storage /* {{{ mysqli_stmt_free_storage */
*/
static void mysqli_stmt_free_storage(zend_object *object) static void mysqli_stmt_free_storage(zend_object *object)
{ {
mysqli_object *intern = php_mysqli_fetch_object(object); mysqli_object *intern = php_mysqli_fetch_object(object);
@ -250,8 +247,7 @@ static void mysqli_stmt_free_storage(zend_object *object)
} }
/* }}} */ /* }}} */
/* {{{ mysqli_result_free_storage /* {{{ mysqli_result_free_storage */
*/
static void mysqli_result_free_storage(zend_object *object) static void mysqli_result_free_storage(zend_object *object)
{ {
mysqli_object *intern = php_mysqli_fetch_object(object); mysqli_object *intern = php_mysqli_fetch_object(object);
@ -264,8 +260,7 @@ static void mysqli_result_free_storage(zend_object *object)
} }
/* }}} */ /* }}} */
/* {{{ mysqli_warning_free_storage /* {{{ mysqli_warning_free_storage */
*/
static void mysqli_warning_free_storage(zend_object *object) static void mysqli_warning_free_storage(zend_object *object)
{ {
mysqli_object *intern = php_mysqli_fetch_object(object); mysqli_object *intern = php_mysqli_fetch_object(object);
@ -421,8 +416,7 @@ HashTable *mysqli_object_get_debug_info(zend_object *object, int *is_temp)
return retval; return retval;
} }
/* {{{ mysqli_objects_new /* {{{ mysqli_objects_new */
*/
PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type) PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type)
{ {
mysqli_object *intern; mysqli_object *intern;
@ -487,8 +481,7 @@ static const MYSQLND_REVERSE_API mysqli_reverse_api = {
}; };
#endif #endif
/* {{{ PHP_INI_BEGIN /* {{{ PHP_INI_BEGIN */
*/
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX("mysqli.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mysqli.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_mysqli_globals, mysqli_globals, display_link_numbers)
@ -508,8 +501,7 @@ PHP_INI_BEGIN()
PHP_INI_END() PHP_INI_END()
/* }}} */ /* }}} */
/* {{{ PHP_GINIT_FUNCTION /* {{{ PHP_GINIT_FUNCTION */
*/
static PHP_GINIT_FUNCTION(mysqli) static PHP_GINIT_FUNCTION(mysqli)
{ {
#if defined(COMPILE_DL_MYSQLI) && defined(ZTS) #if defined(COMPILE_DL_MYSQLI) && defined(ZTS)
@ -535,8 +527,7 @@ static PHP_GINIT_FUNCTION(mysqli)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINIT_FUNCTION /* {{{ PHP_MINIT_FUNCTION */
*/
PHP_MINIT_FUNCTION(mysqli) PHP_MINIT_FUNCTION(mysqli)
{ {
zend_class_entry *ce,cex; zend_class_entry *ce,cex;
@ -840,8 +831,7 @@ PHP_MINIT_FUNCTION(mysqli)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION /* {{{ PHP_MSHUTDOWN_FUNCTION */
*/
PHP_MSHUTDOWN_FUNCTION(mysqli) PHP_MSHUTDOWN_FUNCTION(mysqli)
{ {
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
@ -871,8 +861,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
} }
/* }}} */ /* }}} */
/* {{{ PHP_RINIT_FUNCTION /* {{{ PHP_RINIT_FUNCTION */
*/
PHP_RINIT_FUNCTION(mysqli) PHP_RINIT_FUNCTION(mysqli)
{ {
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) #if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
@ -906,8 +895,7 @@ static int php_mysqli_persistent_helper_once(zend_rsrc_list_entry *le)
#endif #endif
/* {{{ PHP_RSHUTDOWN_FUNCTION /* {{{ PHP_RSHUTDOWN_FUNCTION */
*/
PHP_RSHUTDOWN_FUNCTION(mysqli) PHP_RSHUTDOWN_FUNCTION(mysqli)
{ {
/* check persistent connections, move used to free */ /* check persistent connections, move used to free */
@ -927,8 +915,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION /* {{{ PHP_MINFO_FUNCTION */
*/
PHP_MINFO_FUNCTION(mysqli) PHP_MINFO_FUNCTION(mysqli)
{ {
char buf[32]; char buf[32];
@ -962,8 +949,7 @@ static const zend_module_dep mysqli_deps[] = {
ZEND_MOD_END ZEND_MOD_END
}; };
/* {{{ mysqli_module_entry /* {{{ mysqli_module_entry */
*/
zend_module_entry mysqli_module_entry = { zend_module_entry mysqli_module_entry = {
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
mysqli_deps, mysqli_deps,
@ -1096,8 +1082,7 @@ PHP_METHOD(mysqli_result, getIterator)
zend_create_internal_iterator_zval(return_value, ZEND_THIS); zend_create_internal_iterator_zval(return_value, ZEND_THIS);
} }
/* {{{ php_mysqli_fetch_into_hash_aux /* {{{ php_mysqli_fetch_into_hash_aux */
*/
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype) void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype)
{ {
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
@ -1169,8 +1154,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend
} }
/* }}} */ /* }}} */
/* {{{ php_mysqli_fetch_into_hash /* {{{ php_mysqli_fetch_into_hash */
*/
void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object) void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object)
{ {
MYSQL_RES *result; MYSQL_RES *result;

235
ext/mysqli/mysqli_api.c
View file

@ -133,8 +133,7 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto mixed mysqli_affected_rows(object link) /* {{{ Get number of affected rows in previous MySQL operation */
Get number of affected rows in previous MySQL operation */
PHP_FUNCTION(mysqli_affected_rows) PHP_FUNCTION(mysqli_affected_rows)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -155,8 +154,7 @@ PHP_FUNCTION(mysqli_affected_rows)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_autocommit(object link, bool mode) /* {{{ Turn auto commit on or of */
Turn auto commit on or of */
PHP_FUNCTION(mysqli_autocommit) PHP_FUNCTION(mysqli_autocommit)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -311,8 +309,7 @@ end:
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed ...]) /* {{{ Bind variables to a prepared statement as parameters */
Bind variables to a prepared statement as parameters */
PHP_FUNCTION(mysqli_stmt_bind_param) PHP_FUNCTION(mysqli_stmt_bind_param)
{ {
zval *args; zval *args;
@ -574,8 +571,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc)
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var [,mixed ...]) /* {{{ Bind variables to a prepared statement for result storage */
Bind variables to a prepared statement for result storage */
PHP_FUNCTION(mysqli_stmt_bind_result) PHP_FUNCTION(mysqli_stmt_bind_result)
{ {
zval *args; zval *args;
@ -600,8 +596,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_change_user(object link, string user, string password, string database) /* {{{ Change logged-in user of the active connection */
Change logged-in user of the active connection */
PHP_FUNCTION(mysqli_change_user) PHP_FUNCTION(mysqli_change_user)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -647,8 +642,7 @@ PHP_FUNCTION(mysqli_change_user)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_character_set_name(object link) /* {{{ Returns the name of the character set used for this connection */
Returns the name of the character set used for this connection */
PHP_FUNCTION(mysqli_character_set_name) PHP_FUNCTION(mysqli_character_set_name)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -708,8 +702,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_close(object link) /* {{{ Close connection */
Close connection */
PHP_FUNCTION(mysqli_close) PHP_FUNCTION(mysqli_close)
{ {
zval *mysql_link; zval *mysql_link;
@ -730,8 +723,7 @@ PHP_FUNCTION(mysqli_close)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_commit(object link[, int flags [, string name ]]) /* {{{ Commit outstanding actions and close transaction */
Commit outstanding actions and close transaction */
PHP_FUNCTION(mysqli_commit) PHP_FUNCTION(mysqli_commit)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -756,8 +748,7 @@ PHP_FUNCTION(mysqli_commit)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_data_seek(object result, int offset) /* {{{ Move internal result pointer */
Move internal result pointer */
PHP_FUNCTION(mysqli_data_seek) PHP_FUNCTION(mysqli_data_seek)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -784,8 +775,7 @@ PHP_FUNCTION(mysqli_data_seek)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_debug(string debug) /* {{{ */
*/
PHP_FUNCTION(mysqli_debug) PHP_FUNCTION(mysqli_debug)
{ {
char *debug; char *debug;
@ -800,8 +790,7 @@ PHP_FUNCTION(mysqli_debug)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_dump_debug_info(object link) /* {{{ */
*/
PHP_FUNCTION(mysqli_dump_debug_info) PHP_FUNCTION(mysqli_dump_debug_info)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -816,8 +805,7 @@ PHP_FUNCTION(mysqli_dump_debug_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_errno(object link) /* {{{ Returns the numerical value of the error message from previous MySQL operation */
Returns the numerical value of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_errno) PHP_FUNCTION(mysqli_errno)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -831,8 +819,7 @@ PHP_FUNCTION(mysqli_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_error(object link) /* {{{ Returns the text of the error message from previous MySQL operation */
Returns the text of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_error) PHP_FUNCTION(mysqli_error)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -850,8 +837,7 @@ PHP_FUNCTION(mysqli_error)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_execute(object stmt) /* {{{ Execute a prepared statement */
Execute a prepared statement */
PHP_FUNCTION(mysqli_stmt_execute) PHP_FUNCTION(mysqli_stmt_execute)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -1121,8 +1107,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stmt_fetch(object stmt) /* {{{ Fetch results from a prepared statement into the bound variables */
Fetch results from a prepared statement into the bound variables */
PHP_FUNCTION(mysqli_stmt_fetch) PHP_FUNCTION(mysqli_stmt_fetch)
{ {
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
@ -1163,8 +1148,7 @@ static void php_add_field_properties(zval *value, const MYSQL_FIELD *field)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_field(object result) /* {{{ Get column information from a result and return as an object */
Get column information from a result and return as an object */
PHP_FUNCTION(mysqli_fetch_field) PHP_FUNCTION(mysqli_fetch_field)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1186,8 +1170,7 @@ PHP_FUNCTION(mysqli_fetch_field)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_fields(object result) /* {{{ Return array of objects containing field meta-data */
Return array of objects containing field meta-data */
PHP_FUNCTION(mysqli_fetch_fields) PHP_FUNCTION(mysqli_fetch_fields)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1216,8 +1199,7 @@ PHP_FUNCTION(mysqli_fetch_fields)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_field_direct(object result, int offset) /* {{{ Fetch meta-data for a single field */
Fetch meta-data for a single field */
PHP_FUNCTION(mysqli_fetch_field_direct) PHP_FUNCTION(mysqli_fetch_field_direct)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1245,8 +1227,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_lengths(object result) /* {{{ Get the length of each output in a result */
Get the length of each output in a result */
PHP_FUNCTION(mysqli_fetch_lengths) PHP_FUNCTION(mysqli_fetch_lengths)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1277,17 +1258,14 @@ PHP_FUNCTION(mysqli_fetch_lengths)
} }
/* }}} */ /* }}} */
/* {{{ proto array mysqli_fetch_row(object result) /* {{{ Get a result row as an enumerated array */
Get a result row as an enumerated array */
PHP_FUNCTION(mysqli_fetch_row) PHP_FUNCTION(mysqli_fetch_row)
{ {
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0); php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_field_count(object link) /* {{{ Fetch the number of fields returned by the last query for the given link */
Fetch the number of fields returned by the last query for the given link
*/
PHP_FUNCTION(mysqli_field_count) PHP_FUNCTION(mysqli_field_count)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1302,9 +1280,7 @@ PHP_FUNCTION(mysqli_field_count)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_field_seek(object result, int fieldnr) /* {{{ Set result pointer to a specified field offset */
Set result pointer to a specified field offset
*/
PHP_FUNCTION(mysqli_field_seek) PHP_FUNCTION(mysqli_field_seek)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1326,8 +1302,7 @@ PHP_FUNCTION(mysqli_field_seek)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_field_tell(object result) /* {{{ Get current field offset of result pointer */
Get current field offset of result pointer */
PHP_FUNCTION(mysqli_field_tell) PHP_FUNCTION(mysqli_field_tell)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1342,8 +1317,7 @@ PHP_FUNCTION(mysqli_field_tell)
} }
/* }}} */ /* }}} */
/* {{{ proto void mysqli_free_result(object result) /* {{{ Free query result memory for the given result handle */
Free query result memory for the given result handle */
PHP_FUNCTION(mysqli_free_result) PHP_FUNCTION(mysqli_free_result)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1359,8 +1333,7 @@ PHP_FUNCTION(mysqli_free_result)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_get_client_info(void) /* {{{ Get MySQL client info */
Get MySQL client info */
PHP_FUNCTION(mysqli_get_client_info) PHP_FUNCTION(mysqli_get_client_info)
{ {
if (getThis()) { if (getThis()) {
@ -1382,8 +1355,7 @@ PHP_FUNCTION(mysqli_get_client_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_get_client_version(void) /* {{{ Get MySQL client info */
Get MySQL client info */
PHP_FUNCTION(mysqli_get_client_version) PHP_FUNCTION(mysqli_get_client_version)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -1394,8 +1366,7 @@ PHP_FUNCTION(mysqli_get_client_version)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_get_host_info(object link) /* {{{ Get MySQL host info */
Get MySQL host info */
PHP_FUNCTION(mysqli_get_host_info) PHP_FUNCTION(mysqli_get_host_info)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1413,8 +1384,7 @@ PHP_FUNCTION(mysqli_get_host_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_get_proto_info(object link) /* {{{ Get MySQL protocol information */
Get MySQL protocol information */
PHP_FUNCTION(mysqli_get_proto_info) PHP_FUNCTION(mysqli_get_proto_info)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1428,8 +1398,7 @@ PHP_FUNCTION(mysqli_get_proto_info)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_get_server_info(object link) /* {{{ Get MySQL server info */
Get MySQL server info */
PHP_FUNCTION(mysqli_get_server_info) PHP_FUNCTION(mysqli_get_server_info)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1448,8 +1417,7 @@ PHP_FUNCTION(mysqli_get_server_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_get_server_version(object link) /* {{{ Return the MySQL version for the server referenced by the given link */
Return the MySQL version for the server referenced by the given link */
PHP_FUNCTION(mysqli_get_server_version) PHP_FUNCTION(mysqli_get_server_version)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1464,8 +1432,7 @@ PHP_FUNCTION(mysqli_get_server_version)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_info(object link) /* {{{ Get information about the most recent query */
Get information about the most recent query */
PHP_FUNCTION(mysqli_info) PHP_FUNCTION(mysqli_info)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1526,24 +1493,21 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_method)
} }
/* }}} */ /* }}} */
/* {{{ proto resource mysqli_init(void) /* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
Initialize mysqli and return a resource for use with mysql_real_connect */
PHP_FUNCTION(mysqli_init) PHP_FUNCTION(mysqli_init)
{ {
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE); php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
} }
/* }}} */ /* }}} */
/* {{{ proto resource mysqli::init(void) /* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
Initialize mysqli and return a resource for use with mysql_real_connect */
PHP_FUNCTION(mysqli_init_method) PHP_FUNCTION(mysqli_init_method)
{ {
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE); php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_insert_id(object link) /* {{{ Get the ID generated from the previous INSERT operation */
Get the ID generated from the previous INSERT operation */
PHP_FUNCTION(mysqli_insert_id) PHP_FUNCTION(mysqli_insert_id)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1559,8 +1523,7 @@ PHP_FUNCTION(mysqli_insert_id)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_kill(object link, int processid) /* {{{ Kill a mysql process on the server */
Kill a mysql process on the server */
PHP_FUNCTION(mysqli_kill) PHP_FUNCTION(mysqli_kill)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1585,8 +1548,7 @@ PHP_FUNCTION(mysqli_kill)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_more_results(object link) /* {{{ check if there any more query results from a multi query */
check if there any more query results from a multi query */
PHP_FUNCTION(mysqli_more_results) PHP_FUNCTION(mysqli_more_results)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1601,8 +1563,7 @@ PHP_FUNCTION(mysqli_more_results)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_next_result(object link) /* {{{ read next result from multi_query */
read next result from multi_query */
PHP_FUNCTION(mysqli_next_result) { PHP_FUNCTION(mysqli_next_result) {
MY_MYSQL *mysql; MY_MYSQL *mysql;
zval *mysql_link; zval *mysql_link;
@ -1617,8 +1578,7 @@ PHP_FUNCTION(mysqli_next_result) {
/* }}} */ /* }}} */
#if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND) #if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND)
/* {{{ proto bool mysqli_stmt_more_results(object link) /* {{{ check if there any more query results from a multi query */
check if there any more query results from a multi query */
PHP_FUNCTION(mysqli_stmt_more_results) PHP_FUNCTION(mysqli_stmt_more_results)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -1633,8 +1593,7 @@ PHP_FUNCTION(mysqli_stmt_more_results)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_next_result(object link) /* {{{ read next result from multi_query */
read next result from multi_query */
PHP_FUNCTION(mysqli_stmt_next_result) { PHP_FUNCTION(mysqli_stmt_next_result) {
MY_STMT *stmt; MY_STMT *stmt;
zval *mysql_stmt; zval *mysql_stmt;
@ -1649,8 +1608,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto int mysqli_num_fields(object result) /* {{{ Get number of fields in result */
Get number of fields in result */
PHP_FUNCTION(mysqli_num_fields) PHP_FUNCTION(mysqli_num_fields)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1665,8 +1623,7 @@ PHP_FUNCTION(mysqli_num_fields)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_num_rows(object result) /* {{{ Get number of rows in result */
Get number of rows in result */
PHP_FUNCTION(mysqli_num_rows) PHP_FUNCTION(mysqli_num_rows)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -1751,8 +1708,7 @@ static int mysqli_options_get_option_zval_type(int option)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_options(object link, int flags, mixed values) /* {{{ Set options */
Set options */
PHP_FUNCTION(mysqli_options) PHP_FUNCTION(mysqli_options)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1807,8 +1763,7 @@ PHP_FUNCTION(mysqli_options)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_ping(object link) /* {{{ Ping a server connection or reconnect if there is no connection */
Ping a server connection or reconnect if there is no connection */
PHP_FUNCTION(mysqli_ping) PHP_FUNCTION(mysqli_ping)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1826,8 +1781,7 @@ PHP_FUNCTION(mysqli_ping)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_prepare(object link, string query) /* {{{ Prepare a SQL statement for execution */
Prepare a SQL statement for execution */
PHP_FUNCTION(mysqli_prepare) PHP_FUNCTION(mysqli_prepare)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1910,16 +1864,14 @@ PHP_FUNCTION(mysqli_prepare)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]]) /* {{{ Open a connection to a mysql server */
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect) PHP_FUNCTION(mysqli_real_connect)
{ {
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE); mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_real_query(object link, string query) /* {{{ Binary-safe version of mysql_query() */
Binary-safe version of mysql_query() */
PHP_FUNCTION(mysqli_real_query) PHP_FUNCTION(mysqli_real_query)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1949,8 +1901,7 @@ PHP_FUNCTION(mysqli_real_query)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_real_escape_string(object link, string escapestr) /* {{{ Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */
Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */
PHP_FUNCTION(mysqli_real_escape_string) { PHP_FUNCTION(mysqli_real_escape_string) {
MY_MYSQL *mysql; MY_MYSQL *mysql;
zval *mysql_link = NULL; zval *mysql_link = NULL;
@ -1971,8 +1922,7 @@ PHP_FUNCTION(mysqli_real_escape_string) {
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_rollback(object link) /* {{{ Undo actions from current transaction */
Undo actions from current transaction */
PHP_FUNCTION(mysqli_rollback) PHP_FUNCTION(mysqli_rollback)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1997,8 +1947,7 @@ PHP_FUNCTION(mysqli_rollback)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_send_long_data(object stmt, int param_nr, string data) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_send_long_data) PHP_FUNCTION(mysqli_stmt_send_long_data)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2023,8 +1972,7 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
} }
/* }}} */ /* }}} */
/* {{{ proto string|int|false mysqli_stmt_affected_rows(object stmt) /* {{{ Return the number of rows affected in the last query for the given link. */
Return the number of rows affected in the last query for the given link. */
PHP_FUNCTION(mysqli_stmt_affected_rows) PHP_FUNCTION(mysqli_stmt_affected_rows)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2044,8 +1992,7 @@ PHP_FUNCTION(mysqli_stmt_affected_rows)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_close(object stmt) /* {{{ Close statement */
Close statement */
PHP_FUNCTION(mysqli_stmt_close) PHP_FUNCTION(mysqli_stmt_close)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2064,8 +2011,7 @@ PHP_FUNCTION(mysqli_stmt_close)
} }
/* }}} */ /* }}} */
/* {{{ proto void mysqli_stmt_data_seek(object stmt, int offset) /* {{{ Move internal result pointer */
Move internal result pointer */
PHP_FUNCTION(mysqli_stmt_data_seek) PHP_FUNCTION(mysqli_stmt_data_seek)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2086,8 +2032,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_stmt_field_count(object stmt) { /* {{{ Return the number of result columns for the given statement */
Return the number of result columns for the given statement */
PHP_FUNCTION(mysqli_stmt_field_count) PHP_FUNCTION(mysqli_stmt_field_count)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2102,8 +2047,7 @@ PHP_FUNCTION(mysqli_stmt_field_count)
} }
/* }}} */ /* }}} */
/* {{{ proto void mysqli_stmt_free_result(object stmt) /* {{{ Free stored result memory for the given statement handle */
Free stored result memory for the given statement handle */
PHP_FUNCTION(mysqli_stmt_free_result) PHP_FUNCTION(mysqli_stmt_free_result)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2119,8 +2063,7 @@ PHP_FUNCTION(mysqli_stmt_free_result)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stmt_insert_id(object stmt) /* {{{ Get the ID generated from the previous INSERT operation */
Get the ID generated from the previous INSERT operation */
PHP_FUNCTION(mysqli_stmt_insert_id) PHP_FUNCTION(mysqli_stmt_insert_id)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2136,8 +2079,7 @@ PHP_FUNCTION(mysqli_stmt_insert_id)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_stmt_param_count(object stmt) /* {{{ Return the number of parameter for the given statement */
Return the number of parameter for the given statement */
PHP_FUNCTION(mysqli_stmt_param_count) PHP_FUNCTION(mysqli_stmt_param_count)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2152,8 +2094,7 @@ PHP_FUNCTION(mysqli_stmt_param_count)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_reset(object stmt) /* {{{ reset a prepared statement */
reset a prepared statement */
PHP_FUNCTION(mysqli_stmt_reset) PHP_FUNCTION(mysqli_stmt_reset)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2172,8 +2113,7 @@ PHP_FUNCTION(mysqli_stmt_reset)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stmt_num_rows(object stmt) /* {{{ Return the number of rows in statements result set */
Return the number of rows in statements result set */
PHP_FUNCTION(mysqli_stmt_num_rows) PHP_FUNCTION(mysqli_stmt_num_rows)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2191,8 +2131,7 @@ PHP_FUNCTION(mysqli_stmt_num_rows)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_select_db(object link, string dbname) /* {{{ Select a MySQL database */
Select a MySQL database */
PHP_FUNCTION(mysqli_select_db) PHP_FUNCTION(mysqli_select_db)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2213,8 +2152,7 @@ PHP_FUNCTION(mysqli_select_db)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_sqlstate(object link) /* {{{ Returns the SQLSTATE error from previous MySQL operation */
Returns the SQLSTATE error from previous MySQL operation */
PHP_FUNCTION(mysqli_sqlstate) PHP_FUNCTION(mysqli_sqlstate)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2232,8 +2170,7 @@ PHP_FUNCTION(mysqli_sqlstate)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) /* {{{ */
*/
PHP_FUNCTION(mysqli_ssl_set) PHP_FUNCTION(mysqli_ssl_set)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2258,8 +2195,7 @@ PHP_FUNCTION(mysqli_ssl_set)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stat(object link) /* {{{ Get current system status */
Get current system status */
PHP_FUNCTION(mysqli_stat) PHP_FUNCTION(mysqli_stat)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2291,8 +2227,7 @@ PHP_FUNCTION(mysqli_stat)
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_refresh(object link, int options) /* {{{ Flush tables or caches, or reset replication server information */
Flush tables or caches, or reset replication server information */
PHP_FUNCTION(mysqli_refresh) PHP_FUNCTION(mysqli_refresh)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2311,8 +2246,7 @@ PHP_FUNCTION(mysqli_refresh)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_stmt_attr_set(object stmt, int attr, int mode) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_attr_set) PHP_FUNCTION(mysqli_stmt_attr_set)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2358,8 +2292,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_stmt_attr_get(object stmt, int attr) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_attr_get) PHP_FUNCTION(mysqli_stmt_attr_get)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2385,8 +2318,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_stmt_errno(object stmt) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_errno) PHP_FUNCTION(mysqli_stmt_errno)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2401,8 +2333,7 @@ PHP_FUNCTION(mysqli_stmt_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_stmt_error(object stmt) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_error) PHP_FUNCTION(mysqli_stmt_error)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2421,9 +2352,7 @@ PHP_FUNCTION(mysqli_stmt_error)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stmt_init(object link) /* {{{ Initialize statement object */
Initialize statement object
*/
PHP_FUNCTION(mysqli_stmt_init) PHP_FUNCTION(mysqli_stmt_init)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2453,9 +2382,7 @@ PHP_FUNCTION(mysqli_stmt_init)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_prepare(object stmt, string query) /* {{{ prepare server side statement with query */
prepare server side statement with query
*/
PHP_FUNCTION(mysqli_stmt_prepare) PHP_FUNCTION(mysqli_stmt_prepare)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2478,8 +2405,7 @@ PHP_FUNCTION(mysqli_stmt_prepare)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_stmt_result_metadata(object stmt) /* {{{ return result set from statement */
return result set from statement */
PHP_FUNCTION(mysqli_stmt_result_metadata) PHP_FUNCTION(mysqli_stmt_result_metadata)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2504,8 +2430,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_stmt_store_result(object stmt) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_store_result) PHP_FUNCTION(mysqli_stmt_store_result)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2553,8 +2478,7 @@ PHP_FUNCTION(mysqli_stmt_store_result)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_stmt_sqlstate(object stmt) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_sqlstate) PHP_FUNCTION(mysqli_stmt_sqlstate)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -2573,8 +2497,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate)
} }
/* }}} */ /* }}} */
/* {{{ proto object mysqli_store_result(object link [, int flags]) /* {{{ Buffer result set on client */
Buffer result set on client */
PHP_FUNCTION(mysqli_store_result) PHP_FUNCTION(mysqli_store_result)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2608,8 +2531,7 @@ PHP_FUNCTION(mysqli_store_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_thread_id(object link) /* {{{ Return the current thread ID */
Return the current thread ID */
PHP_FUNCTION(mysqli_thread_id) PHP_FUNCTION(mysqli_thread_id)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2624,8 +2546,7 @@ PHP_FUNCTION(mysqli_thread_id)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_thread_safe(void) /* {{{ Return whether thread safety is given or not */
Return whether thread safety is given or not */
PHP_FUNCTION(mysqli_thread_safe) PHP_FUNCTION(mysqli_thread_safe)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -2636,8 +2557,7 @@ PHP_FUNCTION(mysqli_thread_safe)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_use_result(object link) /* {{{ Directly retrieve query results - do not buffer results on client side */
Directly retrieve query results - do not buffer results on client side */
PHP_FUNCTION(mysqli_use_result) PHP_FUNCTION(mysqli_use_result)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -2665,8 +2585,7 @@ PHP_FUNCTION(mysqli_use_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_warning_count(object link) /* {{{ Return number of warnings from the last query for the given link */
Return number of warnings from the last query for the given link */
PHP_FUNCTION(mysqli_warning_count) PHP_FUNCTION(mysqli_warning_count)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;

79
ext/mysqli/mysqli_nonapi.c
View file

@ -31,8 +31,7 @@
#define SAFE_STR(a) ((a)?a:"") #define SAFE_STR(a) ((a)?a:"")
/* {{{ php_mysqli_set_error /* {{{ php_mysqli_set_error */
*/
static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err) static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err)
{ {
MyG(error_no) = mysql_errno; MyG(error_no) = mysql_errno;
@ -370,24 +369,21 @@ err:
RETVAL_FALSE; RETVAL_FALSE;
} /* }}} */ } /* }}} */
/* {{{ proto object mysqli_connect([string hostname [,string username [,string passwd [,string dbname [,int port [,string socket]]]]]]) /* {{{ Open a connection to a mysql server */
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect) PHP_FUNCTION(mysqli_connect)
{ {
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE); mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE);
} }
/* }}} */ /* }}} */
/* {{{ proto object mysqli_link_construct() /* {{{ */
*/
PHP_FUNCTION(mysqli_link_construct) PHP_FUNCTION(mysqli_link_construct)
{ {
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE); mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE);
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_connect_errno(void) /* {{{ Returns the numerical value of the error message from last connect command */
Returns the numerical value of the error message from last connect command */
PHP_FUNCTION(mysqli_connect_errno) PHP_FUNCTION(mysqli_connect_errno)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -398,8 +394,7 @@ PHP_FUNCTION(mysqli_connect_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_connect_error(void) /* {{{ Returns the text of the error message from previous MySQL operation */
Returns the text of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_connect_error) PHP_FUNCTION(mysqli_connect_error)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -414,24 +409,21 @@ PHP_FUNCTION(mysqli_connect_error)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_array(object result [,int resulttype]) /* {{{ Fetch a result row as an associative array, a numeric array, or both */
Fetch a result row as an associative array, a numeric array, or both */
PHP_FUNCTION(mysqli_fetch_array) PHP_FUNCTION(mysqli_fetch_array)
{ {
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_assoc(object result) /* {{{ Fetch a result row as an associative array */
Fetch a result row as an associative array */
PHP_FUNCTION(mysqli_fetch_assoc) PHP_FUNCTION(mysqli_fetch_assoc)
{ {
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0); php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0);
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_all(object result [,int resulttype]) /* {{{ Fetches all result rows as an associative array, a numeric array, or both */
Fetches all result rows as an associative array, a numeric array, or both */
#ifdef MYSQLI_USE_MYSQLND #ifdef MYSQLI_USE_MYSQLND
PHP_FUNCTION(mysqli_fetch_all) PHP_FUNCTION(mysqli_fetch_all)
{ {
@ -454,8 +446,7 @@ PHP_FUNCTION(mysqli_fetch_all)
} }
/* }}} */ /* }}} */
/* {{{ proto array mysqli_get_client_stats(void) /* {{{ Returns statistics about the zval cache */
Returns statistics about the zval cache */
PHP_FUNCTION(mysqli_get_client_stats) PHP_FUNCTION(mysqli_get_client_stats)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
@ -465,8 +456,7 @@ PHP_FUNCTION(mysqli_get_client_stats)
} }
/* }}} */ /* }}} */
/* {{{ proto array mysqli_get_connection_stats(void) /* {{{ Returns statistics about the zval cache */
Returns statistics about the zval cache */
PHP_FUNCTION(mysqli_get_connection_stats) PHP_FUNCTION(mysqli_get_connection_stats)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -483,8 +473,7 @@ PHP_FUNCTION(mysqli_get_connection_stats)
#endif #endif
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_error_list(object connection) /* {{{ Fetches all client errors */
Fetches all client errors */
PHP_FUNCTION(mysqli_error_list) PHP_FUNCTION(mysqli_error_list)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -529,8 +518,7 @@ PHP_FUNCTION(mysqli_error_list)
} }
/* }}} */ /* }}} */
/* {{{ proto string mysqli_stmt_error_list(object stmt) /* {{{ */
*/
PHP_FUNCTION(mysqli_stmt_error_list) PHP_FUNCTION(mysqli_stmt_error_list)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -575,16 +563,14 @@ PHP_FUNCTION(mysqli_stmt_error_list)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_fetch_object(object result [, string class_name [, NULL|array ctor_params]]) /* {{{ Fetch a result row as an object */
Fetch a result row as an object */
PHP_FUNCTION(mysqli_fetch_object) PHP_FUNCTION(mysqli_fetch_object)
{ {
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1); php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1);
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_multi_query(object link, string query) /* {{{ allows to execute multiple queries */
allows to execute multiple queries */
PHP_FUNCTION(mysqli_multi_query) PHP_FUNCTION(mysqli_multi_query)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -631,7 +617,7 @@ PHP_FUNCTION(mysqli_multi_query)
} }
/* }}} */ /* }}} */
/* {{{ proto mixed mysqli_query(object link, string query [,int resultmode]) */ /* {{{ */
PHP_FUNCTION(mysqli_query) PHP_FUNCTION(mysqli_query)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -835,8 +821,7 @@ static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, z
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_poll(array read, array write, array error, int sec [, int usec]) U /* {{{ Poll connections */
Poll connections */
PHP_FUNCTION(mysqli_poll) PHP_FUNCTION(mysqli_poll)
{ {
zval *r_array, *e_array, *dont_poll_array; zval *r_array, *e_array, *dont_poll_array;
@ -899,8 +884,7 @@ PHP_FUNCTION(mysqli_poll)
} }
/* }}} */ /* }}} */
/* {{{ proto int mysqli_reap_async_query(object link) U /* {{{ Poll connections */
Poll connections */
PHP_FUNCTION(mysqli_reap_async_query) PHP_FUNCTION(mysqli_reap_async_query)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -952,8 +936,7 @@ PHP_FUNCTION(mysqli_reap_async_query)
} }
/* }}} */ /* }}} */
/* {{{ proto object mysqli_stmt_get_result(object link) U /* {{{ Buffer result set on client */
Buffer result set on client */
PHP_FUNCTION(mysqli_stmt_get_result) PHP_FUNCTION(mysqli_stmt_get_result)
{ {
MYSQL_RES *result; MYSQL_RES *result;
@ -979,7 +962,7 @@ PHP_FUNCTION(mysqli_stmt_get_result)
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto object mysqli_get_warnings(object link) */ /* {{{ */
PHP_FUNCTION(mysqli_get_warnings) PHP_FUNCTION(mysqli_get_warnings)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1009,7 +992,7 @@ PHP_FUNCTION(mysqli_get_warnings)
} }
/* }}} */ /* }}} */
/* {{{ proto object mysqli_stmt_get_warnings(object link) */ /* {{{ */
PHP_FUNCTION(mysqli_stmt_get_warnings) PHP_FUNCTION(mysqli_stmt_get_warnings)
{ {
MY_STMT *stmt; MY_STMT *stmt;
@ -1035,8 +1018,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_set_charset(object link, string csname) /* {{{ sets client character set */
sets client character set */
PHP_FUNCTION(mysqli_set_charset) PHP_FUNCTION(mysqli_set_charset)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1056,8 +1038,7 @@ PHP_FUNCTION(mysqli_set_charset)
} }
/* }}} */ /* }}} */
/* {{{ proto object mysqli_get_charset(object link) U /* {{{ returns a character set object */
returns a character set object */
PHP_FUNCTION(mysqli_get_charset) PHP_FUNCTION(mysqli_get_charset)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1116,7 +1097,7 @@ PHP_FUNCTION(mysqli_get_charset)
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name); extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name);
/* {{{ proto bool mysqli_begin_transaction_libmysql */ /* {{{ */
static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name) static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name)
{ {
int ret; int ret;
@ -1165,8 +1146,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto bool mysqli_begin_transaction(object link, [int flags [, string name]]) /* {{{ Starts a transaction */
Starts a transaction */
PHP_FUNCTION(mysqli_begin_transaction) PHP_FUNCTION(mysqli_begin_transaction)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1206,7 +1186,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
/* }}} */ /* }}} */
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
/* {{{ proto bool mysqli_savepoint_libmysql */ /* {{{ */
static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release) static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release)
{ {
int ret; int ret;
@ -1219,8 +1199,7 @@ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend
/* }}} */ /* }}} */
#endif #endif
/* {{{ proto bool mysqli_savepoint(object link, string name) /* {{{ Starts a transaction */
Starts a transaction */
PHP_FUNCTION(mysqli_savepoint) PHP_FUNCTION(mysqli_savepoint)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1248,8 +1227,7 @@ PHP_FUNCTION(mysqli_savepoint)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_release_savepoint(object link, string name) /* {{{ Starts a transaction */
Starts a transaction */
PHP_FUNCTION(mysqli_release_savepoint) PHP_FUNCTION(mysqli_release_savepoint)
{ {
MY_MYSQL *mysql; MY_MYSQL *mysql;
@ -1276,8 +1254,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
} }
/* }}} */ /* }}} */
/* {{{ proto bool mysqli_get_links_stats() /* {{{ Returns information about open and cached links */
Returns information about open and cached links */
PHP_FUNCTION(mysqli_get_links_stats) PHP_FUNCTION(mysqli_get_links_stats)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {

3
ext/mysqli/mysqli_report.c
View file

@ -25,8 +25,7 @@
extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...); extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...);
/* {{{ proto bool mysqli_report(int flags) /* {{{ sets report level */
sets report level */
PHP_FUNCTION(mysqli_report) PHP_FUNCTION(mysqli_report)
{ {
zend_long flags; zend_long flags;

3
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -41,8 +41,7 @@ const char mysqlnd_read_body_name[] = "mysqlnd_read_body";
#define ERROR_MARKER 0xFF #define ERROR_MARKER 0xFF
#define EODATA_MARKER 0xFE #define EODATA_MARKER 0xFE
/* {{{ mysqlnd_command_to_text /* {{{ mysqlnd_command_to_text */
*/
const char * const mysqlnd_command_to_text[COM_END] = const char * const mysqlnd_command_to_text[COM_END] =
{ {
"SLEEP", "QUIT", "INIT_DB", "QUERY", "FIELD_LIST", "SLEEP", "QUIT", "INIT_DB", "QUERY", "FIELD_LIST",

Some files were not shown because too many files have changed in this diff Show more