CVS update: php3/functions

Date: Monday January 4, 1999 @ 4:24 Author: jah Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv134/functions Modified Files: basic_functions.c browscap.c image.c iptc.c oracle.c pdf.c post.c rand.c string.c Log Message: Add protos and fix typos in existing ones. Index: php3/functions/basic_functions.c diff -c php3/functions/basic_functions.c:1.247 php3/functions/basic_functions.c:1.248 *** php3/functions/basic_functions.c:1.247 Sun Jan 3 22:42:57 1999 --- php3/functions/basic_functions.c Mon Jan 4 04:24:42 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: basic_functions.c,v 1.247 1999/01/04 03:42:57 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: basic_functions.c,v 1.248 1999/01/04 09:24:42 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 655,660 **** --- 655,664 ---- * user functions should NOT look like. It's a hack, until we get * unset() to work right in 3.1 */ + /* {{{ proto int sizeof(mixed var) + Dummy */ + /* }}} */ + /* {{{ proto int count(mixed var) Count the number of elements in a variable (usually an array) */ void php3_count(INTERNAL_FUNCTION_PARAMETERS) *************** *** 1154,1161 **** pval_copy_constructor(return_value); } /* }}} */ ! /* proto mixed current(array array_arg) Return the element currently pointed to by the internal array pointer */ void array_current(INTERNAL_FUNCTION_PARAMETERS) { --- 1158,1169 ---- pval_copy_constructor(return_value); } /* }}} */ + + /* {{{ proto mixed pos(array array_arg) + Dummy */ + /* }}} */ ! /* {{{ proto mixed current(array array_arg) Return the element currently pointed to by the internal array pointer */ void array_current(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1547,1553 **** } /* }}} */ ! /* proto int set_magic_quotes_runtime(int new_setting) Set the current active configuration setting of magic_quotes_runtime and return previous */ void php3_set_magic_quotes_runtime(INTERNAL_FUNCTION_PARAMETERS) { --- 1555,1561 ---- } /* }}} */ ! /* {{{ proto int set_magic_quotes_runtime(int new_setting) Set the current active configuration setting of magic_quotes_runtime and return previous */ void php3_set_magic_quotes_runtime(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1563,1569 **** } /* }}} */ ! /* proto int get_magic_quotes_runtime(void) Get the current active configuration setting of magic_quotes_runtime */ void php3_get_magic_quotes_runtime(INTERNAL_FUNCTION_PARAMETERS) { --- 1571,1577 ---- } /* }}} */ ! /* {{{ proto int get_magic_quotes_runtime(void) Get the current active configuration setting of magic_quotes_runtime */ void php3_get_magic_quotes_runtime(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1592,1619 **** RETURN_FALSE; } } ! /* {{{ proto int is_long(mixed var) Returns true if variable is a long (integer) */ void php3_is_long(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); } /* }}} */ ! /* {{{ proto int is_double(mixed var) Returns true if variable is a double */ void php3_is_double(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); } /* }}} */ ! /* {{{ proto int is_string(mixed var) Returns true if variable is a string */ void php3_is_string(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); } /* }}} */ ! /* {{{ proto int is_array(mixed var) Returns true if variable is an array */ void php3_is_array(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); } /* }}} */ ! /* {{{ proto int is_object(mixed var) Returns true if variable is an object */ void php3_is_object(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); } /* }}} */ --- 1600,1643 ---- RETURN_FALSE; } } + + /* {{{ proto bool is_int(mixed var) + Dummy */ + /* }}} */ ! /* {{{ proto bool is_integer(mixed var) ! Dummy */ ! /* }}} */ ! ! /* {{{ proto bool is_long(mixed var) Returns true if variable is a long (integer) */ void php3_is_long(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); } /* }}} */ + + /* {{{ proto bool is_float(mixed var) + Dummy */ + /* }}} */ + + /* {{{ proto bool is_real(mixed var) + Dummy */ + /* }}} */ ! /* {{{ proto bool is_double(mixed var) Returns true if variable is a double */ void php3_is_double(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); } /* }}} */ ! /* {{{ proto bool is_string(mixed var) Returns true if variable is a string */ void php3_is_string(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); } /* }}} */ ! /* {{{ proto bool is_array(mixed var) Returns true if variable is an array */ void php3_is_array(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); } /* }}} */ ! /* {{{ proto bool is_object(mixed var) Returns true if variable is an object */ void php3_is_object(INTERNAL_FUNCTION_PARAMETERS) { php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); } /* }}} */ Index: php3/functions/browscap.c diff -c php3/functions/browscap.c:1.20 php3/functions/browscap.c:1.21 *** php3/functions/browscap.c:1.20 Fri Jan 1 12:59:07 1999 --- php3/functions/browscap.c Mon Jan 4 04:24:42 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: browscap.c,v 1.20 1999/01/01 17:59:07 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: browscap.c,v 1.21 1999/01/04 09:24:42 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 74,79 **** --- 74,81 ---- return 0; } + /* {{{ proto object get_browser([string browser_name]) + */ void php3_get_browser(INTERNAL_FUNCTION_PARAMETERS) { pval *agent_name,*agent,tmp; *************** *** 126,131 **** --- 128,134 ---- _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval)); } } + /* }}} */ /* Index: php3/functions/image.c diff -c php3/functions/image.c:1.44 php3/functions/image.c:1.45 *** php3/functions/image.c:1.44 Fri Jan 1 12:59:11 1999 --- php3/functions/image.c Mon Jan 4 04:24:42 1999 *************** *** 26,32 **** | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ ! /* $Id: image.c,v 1.44 1999/01/01 17:59:11 zeev Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. --- 26,32 ---- | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ ! /* $Id: image.c,v 1.45 1999/01/04 09:24:42 jah Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. *************** *** 305,310 **** --- 305,312 ---- } /* main function */ + /* {{{ proto array getimagesize(string imagefile[, array info]) + */ void php3_getimagesize(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1,*info = 0; *************** *** 385,387 **** --- 387,397 ---- efree(result); } } + /* }}} */ + + /* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ Index: php3/functions/iptc.c diff -c php3/functions/iptc.c:1.8 php3/functions/iptc.c:1.9 *** php3/functions/iptc.c:1.8 Fri Jan 1 12:59:12 1999 --- php3/functions/iptc.c Mon Jan 4 04:24:42 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: iptc.c,v 1.8 1999/01/01 17:59:12 zeev Exp $ */ /* * Functions to parse & compse IPTC data. --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: iptc.c,v 1.9 1999/01/04 09:24:42 jah Exp $ */ /* * Functions to parse & compse IPTC data. *************** *** 45,50 **** --- 45,52 ---- #include "internal_functions.h" #include "php3_iptc.h" + /* {{{ proto array iptcparse(string jpeg_image) + */ void php3_iptcparse(INTERNAL_FUNCTION_PARAMETERS) { unsigned int length, inx, len, inheader, tagsfound; *************** *** 124,129 **** --- 126,132 ---- RETURN_FALSE; } } + /* }}} */ /* * Local variables: Index: php3/functions/oracle.c diff -c php3/functions/oracle.c:1.88 php3/functions/oracle.c:1.89 *** php3/functions/oracle.c:1.88 Fri Jan 1 12:59:14 1999 --- php3/functions/oracle.c Mon Jan 4 04:24:42 1999 *************** *** 30,36 **** +----------------------------------------------------------------------+ */ ! /* $Id: oracle.c,v 1.88 1999/01/01 17:59:14 zeev Exp $ */ #if defined(COMPILE_DL) # if PHP_31 --- 30,36 ---- +----------------------------------------------------------------------+ */ ! /* $Id: oracle.c,v 1.89 1999/01/04 09:24:42 jah Exp $ */ #if defined(COMPILE_DL) # if PHP_31 *************** *** 1060,1066 **** } /* }}} */ ! /* {{{ proto int ora_fetchinto(int cursor, array result) Fetch a row into the specified result array */ void php3_Ora_FetchInto(INTERNAL_FUNCTION_PARAMETERS) { /* cursor_index, array ref */ --- 1060,1066 ---- } /* }}} */ ! /* {{{ proto int ora_fetch_into(int cursor, array result) Fetch a row into the specified result array */ void php3_Ora_FetchInto(INTERNAL_FUNCTION_PARAMETERS) { /* cursor_index, array ref */ Index: php3/functions/pdf.c diff -c php3/functions/pdf.c:1.13 php3/functions/pdf.c:1.14 *** php3/functions/pdf.c:1.13 Fri Jan 1 12:59:14 1999 --- php3/functions/pdf.c Mon Jan 4 04:24:42 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: pdf.c,v 1.13 1999/01/01 17:59:14 zeev Exp $ */ /* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: pdf.c,v 1.14 1999/01/04 09:24:42 jah Exp $ */ /* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ *************** *** 1390,1396 **** } /* }}} */ ! /* {{{ proto void pdf_closepath_stroke(int pdfdoc) Draw line along path path */ void php3_pdf_stroke(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1; --- 1390,1396 ---- } /* }}} */ ! /* {{{ proto void pdf_stroke(int pdfdoc) Draw line along path path */ void php3_pdf_stroke(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1; Index: php3/functions/post.c diff -c php3/functions/post.c:1.112 php3/functions/post.c:1.113 *** php3/functions/post.c:1.112 Fri Jan 1 12:59:17 1999 --- php3/functions/post.c Mon Jan 4 04:24:42 1999 *************** *** 468,473 **** --- 468,475 ---- #endif } + /* {{{ proto void parse_str(string str) + */ void php3_parsestr(INTERNAL_FUNCTION_PARAMETERS) { pval *arg; *************** *** 482,487 **** --- 484,490 ---- } php3_treat_data(PARSE_STRING, res); } + /* }}} */ /* * Local variables: Index: php3/functions/rand.c diff -c php3/functions/rand.c:1.31 php3/functions/rand.c:1.32 *** php3/functions/rand.c:1.31 Fri Jan 1 12:59:17 1999 --- php3/functions/rand.c Mon Jan 4 04:24:42 1999 *************** *** 30,36 **** | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | +----------------------------------------------------------------------+ */ ! /* $Id: rand.c,v 1.31 1999/01/01 17:59:17 zeev Exp $ */ #include <stdlib.h> --- 30,36 ---- | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | +----------------------------------------------------------------------+ */ ! /* $Id: rand.c,v 1.32 1999/01/04 09:24:42 jah Exp $ */ #include <stdlib.h> *************** *** 213,218 **** --- 213,220 ---- #define PHP_RAND_MAX RAND_MAX #endif + /* {{{ proto void srand(int seed) + */ void php3_srand(INTERNAL_FUNCTION_PARAMETERS) { pval *arg; *************** *** 231,237 **** --- 233,242 ---- #endif #endif } + /* }}} */ + /* {{{ proto void mt_srand(int seed) + */ void php3_mt_srand(INTERNAL_FUNCTION_PARAMETERS) { pval *arg; *************** *** 241,247 **** --- 246,255 ---- convert_to_long(arg); seedMT(arg->value.lval); } + /* }}} */ + /* {{{ proto int rand([int min, int max]) + */ void php3_rand(INTERNAL_FUNCTION_PARAMETERS) { pval *p_min=NULL, *p_max=NULL; *************** *** 280,286 **** --- 288,297 ---- (int)((double)p_max->value.lval * return_value->value.lval/(PHP_RAND_MAX+(double)p_min->value.lval)); } } + /* }}} */ + /* {{{ proto int mt_rand([int min, int max]) + */ void php3_mt_rand(INTERNAL_FUNCTION_PARAMETERS) { pval *p_min=NULL, *p_max=NULL; *************** *** 319,331 **** --- 330,348 ---- (int)((double)p_max->value.lval * return_value->value.lval/(PHP_RAND_MAX+(double)p_min->value.lval)); } } + /* }}} */ + /* {{{ proto int getrandmax(void) + */ void php3_getrandmax(INTERNAL_FUNCTION_PARAMETERS) { return_value->type = IS_LONG; return_value->value.lval = PHP_RAND_MAX; } + /* }}} */ + /* {{{ proto int mt_getrandmax(void) + */ void php3_mt_getrandmax(INTERNAL_FUNCTION_PARAMETERS) { return_value->type = IS_LONG; *************** *** 335,340 **** --- 352,358 ---- */ return_value->value.lval = 2147483647; /* 2^^31 */ } + /* }}} */ /* * Local variables: Index: php3/functions/string.c diff -c php3/functions/string.c:1.162 php3/functions/string.c:1.163 *** php3/functions/string.c:1.162 Mon Jan 4 02:38:15 1999 --- php3/functions/string.c Mon Jan 4 04:24:43 1999 *************** *** 30,36 **** */ ! /* $Id: string.c,v 1.162 1999/01/04 07:38:15 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 30,36 ---- */ ! /* $Id: string.c,v 1.163 1999/01/04 09:24:43 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 228,234 **** } /* }}} */ ! /* {{{ proto array(string separator, string str) Split a string on string separator and return array of components */ void php3_explode(INTERNAL_FUNCTION_PARAMETERS) { --- 228,234 ---- } /* }}} */ ! /* {{{ proto array explode(string separator, string str) Split a string on string separator and return array of components */ void php3_explode(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 266,271 **** --- 266,275 ---- } /* }}} */ + /* {{{ proto string join(array src, string glue) + Dummy */ + /* }}} */ + /* {{{ proto string implode(array src, string glue) Join array elements placing glue string between items and return one string */ void php3_implode(INTERNAL_FUNCTION_PARAMETERS) *************** *** 1569,1575 **** } /* }}} */ ! /* {{{ proto string hebrev(string str [, int max_chars_per_line]) Convert logical Hebrew text to visual text with newline conversion */ void php3_hebrev_with_conversion(INTERNAL_FUNCTION_PARAMETERS) { --- 1573,1579 ---- } /* }}} */ ! /* {{{ proto string hebrevc(string str [, int max_chars_per_line]) Convert logical Hebrew text to visual text with newline conversion */ void php3_hebrev_with_conversion(INTERNAL_FUNCTION_PARAMETERS) { -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net