From ec420c3df8c68cf7a601798ec4fcdeb951e39147 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 26 Jun 2006 18:48:56 +0000 Subject: Updated protos & vim folding --- ext/standard/array.c | 21 +++++++++++---------- ext/standard/formatted_print.c | 3 ++- ext/standard/levenshtein.c | 2 +- ext/standard/metaphone.c | 2 +- ext/standard/streamsfuncs.c | 1 + ext/standard/string.c | 4 ++-- ext/standard/url.c | 2 +- ext/standard/uuencode.c | 4 ++-- ext/standard/versioning.c | 2 -- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index e6f803b85c..a0324302d9 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -224,7 +224,7 @@ static int array_reverse_key_compare(const void *a, const void *b TSRMLS_DC) return array_key_compare(a, b TSRMLS_CC) * -1; } -/* {{{ proto bool krsort(array array_arg [, int sort_flags]) +/* {{{ proto bool krsort(array &array_arg [, int sort_flags]) Sort an array by key value in reverse order */ PHP_FUNCTION(krsort) { @@ -246,7 +246,7 @@ PHP_FUNCTION(krsort) } /* }}} */ -/* {{{ proto bool ksort(array array_arg [, int sort_flags]) +/* {{{ proto bool ksort(array &array_arg [, int sort_flags]) Sort an array by key */ PHP_FUNCTION(ksort) { @@ -459,7 +459,7 @@ static void php_natsort(INTERNAL_FUNCTION_PARAMETERS, int fold_case) } -/* {{{ proto void natsort(array array_arg) +/* {{{ proto void natsort(array &array_arg) Sort an array using natural sort */ PHP_FUNCTION(natsort) { @@ -468,7 +468,7 @@ PHP_FUNCTION(natsort) /* }}} */ -/* {{{ proto void natcasesort(array array_arg) +/* {{{ proto void natcasesort(array &array_arg) Sort an array using case-insensitive natural sort */ PHP_FUNCTION(natcasesort) { @@ -477,7 +477,7 @@ PHP_FUNCTION(natcasesort) /* }}} */ -/* {{{ proto bool asort(array array_arg [, int sort_flags]) +/* {{{ proto bool asort(array &array_arg [, int sort_flags]) Sort an array and maintain index association */ PHP_FUNCTION(asort) { @@ -499,7 +499,7 @@ PHP_FUNCTION(asort) } /* }}} */ -/* {{{ proto bool arsort(array array_arg [, int sort_flags]) +/* {{{ proto bool arsort(array &array_arg [, int sort_flags]) Sort an array in reverse order and maintain index association */ PHP_FUNCTION(arsort) { @@ -521,7 +521,7 @@ PHP_FUNCTION(arsort) } /* }}} */ -/* {{{ proto bool sort(array array_arg [, int sort_flags]) +/* {{{ proto bool sort(array &array_arg [, int sort_flags]) Sort an array */ PHP_FUNCTION(sort) { @@ -543,7 +543,7 @@ PHP_FUNCTION(sort) } /* }}} */ -/* {{{ proto bool rsort(array array_arg [, int sort_flags]) +/* {{{ proto bool rsort(array &array_arg [, int sort_flags]) Sort an array in reverse order */ PHP_FUNCTION(rsort) { @@ -2151,7 +2151,7 @@ PHP_FUNCTION(array_splice) /* }}} */ -/* {{{ proto array array_slice(array input, int offset [, int length]) +/* {{{ proto array array_slice(array input, int offset [, int length [, bool preserve_keys]]) Returns elements specified by offset and length */ PHP_FUNCTION(array_slice) { @@ -3179,6 +3179,7 @@ PHP_FUNCTION(array_intersect_key) php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY, INTERSECT_COMP_DATA_INTERNAL, INTERSECT_COMP_KEY_INTERNAL); } +/* }}} */ /* {{{ proto array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) Returns the entries of arr1 that have keys which are present in all the other arguments. Kind of equivalent to array_diff(array_keys($arr1), array_keys($arr2)[,array_keys(...)]). The comparison of the keys is performed by a user supplied function. Equivalent of array_intersect_uassoc() but does not do compare of the data. */ @@ -3187,7 +3188,7 @@ PHP_FUNCTION(array_intersect_ukey) php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY, INTERSECT_COMP_DATA_INTERNAL, INTERSECT_COMP_KEY_USER); } - +/* }}} */ /* {{{ proto array array_intersect(array arr1, array arr2 [, array ...]) Returns the entries of arr1 that have values which are present in all the other arguments */ diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 9b02814676..454eacdc06 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -853,6 +853,7 @@ PHP_FUNCTION(fprintf) RETURN_LONG(len); } +/* }}} */ /* {{{ proto int vfprintf(resource stream, string format, array args) Output a formatted string into a stream */ @@ -883,7 +884,7 @@ PHP_FUNCTION(vfprintf) RETURN_LONG(len); } - +/* }}} */ /* diff --git a/ext/standard/levenshtein.c b/ext/standard/levenshtein.c index 89e8cd15e9..613b3d8a8f 100644 --- a/ext/standard/levenshtein.c +++ b/ext/standard/levenshtein.c @@ -79,7 +79,7 @@ static int custom_levdist(char *str1, char *str2, char *callback_name TSRMLS_DC) } /* }}} */ -/* {{{ proto int levenshtein(string str1, string str2) +/* {{{ proto int levenshtein(string str1, string str2[, int cost_ins, int cost_rep, int cost_del]) Calculate Levenshtein distance between two strings */ PHP_FUNCTION(levenshtein) { diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 7cf3b52cdc..5f163eb6a6 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -29,7 +29,7 @@ static int metaphone(char *word, int word_len, int max_phonemes, char **phoned_w PHP_FUNCTION(metaphone); -/* {{{ proto string metaphone(string text, int phones) +/* {{{ proto string metaphone(string text[, int phones]) Break english phrases down into their phonemes */ PHP_FUNCTION(metaphone) { diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 6fb8f17b14..c2b07d6a28 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1117,6 +1117,7 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) RETURN_FALSE; } } +/* }}} */ /* {{{ proto resource stream_filter_prepend(resource stream, string filtername[, int read_write[, string filterparams]]) Prepend a filter to a stream */ diff --git a/ext/standard/string.c b/ext/standard/string.c index e28b7c1419..cccf4a5c50 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1333,7 +1333,7 @@ PHP_FUNCTION(dirname) } /* }}} */ -/* {{{ proto array pathinfo(string path) +/* {{{ proto array pathinfo(string path[, int options]) Returns information about a certain string */ PHP_FUNCTION(pathinfo) { @@ -2503,7 +2503,7 @@ static void php_strtr_array(zval *return_value, char *str, int slen, HashTable * } /* }}} */ -/* {{{ proto string strtr(string str, string from, string to) +/* {{{ proto string strtr(string str, string from[, string to]) Translates characters in str using given translation tables */ PHP_FUNCTION(strtr) { diff --git a/ext/standard/url.c b/ext/standard/url.c index d425e985c7..5087f21133 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -653,7 +653,7 @@ PHPAPI int php_raw_url_decode(char *str, int len) } /* }}} */ -/* {{{ proto array get_headers(string url) +/* {{{ proto array get_headers(string url[, int format]) fetches all the headers sent by the server in response to a HTTP request */ PHP_FUNCTION(get_headers) { diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index 2ad224ad39..536ad4038b 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -183,7 +183,7 @@ err: return -1; } -/* {{{ proto string uuencode(string data) +/* {{{ proto string convert_uuencode(string data) uuencode a string */ PHP_FUNCTION(convert_uuencode) { @@ -200,7 +200,7 @@ PHP_FUNCTION(convert_uuencode) } /* }}} */ -/* {{{ proto string uudecode(string data) +/* {{{ proto string convert_uudecode(string data) decode a uuencoded string */ PHP_FUNCTION(convert_uudecode) { diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c index d1f8754672..ef0240e630 100644 --- a/ext/standard/versioning.c +++ b/ext/standard/versioning.c @@ -204,8 +204,6 @@ php_version_compare(const char *orig_ver1, const char *orig_ver2) } /* }}} */ -/* {{{ do_version_compare() */ - /* {{{ proto int version_compare(string ver1, string ver2 [, string oper]) Compares two "PHP-standardized" version number strings */ -- cgit v1.2.1