[PHP-CVS] cvs: php4(PHP_4_3) /ext/mysql php_mysql.c
andrey Tue Jun 10 10:46:01 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mysql php_mysql.c
Log:
proto fixes
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.174.2.17 php4/ext/mysql/php_mysql.c:1.174.2.18
--- php4/ext/mysql/php_mysql.c:1.174.2.17 Sat May 31 02:54:53 2003
+++ php4/ext/mysql/php_mysql.c Tue Jun 10 10:46:00 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.174.2.17 2003/05/31 06:54:53 georg Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.18 2003/06/10 14:46:00 andrey Exp $ */
/* TODO:
*
@@ -1710,7 +1710,7 @@
/* }}} */
-/* {{{ proto mixed mysql_result(int result, int row [, mixed field])
+/* {{{ proto mixed mysql_result(resource result, int row [, mixed field])
Gets result data */
PHP_FUNCTION(mysql_result)
{
@@ -1813,7 +1813,7 @@
/* }}} */
-/* {{{ proto int mysql_num_rows(int result)
+/* {{{ proto int mysql_num_rows(resource result)
Gets number of rows in a result */
PHP_FUNCTION(mysql_num_rows)
{
@@ -1832,7 +1832,7 @@
}
/* }}} */
-/* {{{ proto int mysql_num_fields(int result)
+/* {{{ proto int mysql_num_fields(resource result)
Gets number of fields in a result */
PHP_FUNCTION(mysql_num_fields)
{
@@ -1939,7 +1939,7 @@
}
/* }}} */
-/* {{{ proto array mysql_fetch_row(int result)
+/* {{{ proto array mysql_fetch_row(resource result)
Gets a result row as an enumerated array */
PHP_FUNCTION(mysql_fetch_row)
{
@@ -1948,7 +1948,7 @@
/* }}} */
-/* {{{ proto object mysql_fetch_object(int result [, int result_type])
+/* {{{ proto object mysql_fetch_object(resource result [, int result_type])
Fetch a result row as an object */
PHP_FUNCTION(mysql_fetch_object)
{
@@ -1961,7 +1961,7 @@
/* }}} */
-/* {{{ proto array mysql_fetch_array(int result [, int result_type])
+/* {{{ proto array mysql_fetch_array(resource result [, int result_type])
Fetch a result row as an array (associative, numeric or both) */
PHP_FUNCTION(mysql_fetch_array)
{
@@ -1970,7 +1970,7 @@
/* }}} */
-/* {{{ proto array mysql_fetch_assoc(int result)
+/* {{{ proto array mysql_fetch_assoc(resource result)
Fetch a result row as an associative array */
PHP_FUNCTION(mysql_fetch_assoc)
{
@@ -1978,7 +1978,7 @@
}
/* }}} */
-/* {{{ proto bool mysql_data_seek(int result, int row_number)
+/* {{{ proto bool mysql_data_seek(resource result, int row_number)
Move internal result pointer */
PHP_FUNCTION(mysql_data_seek)
{
@@ -2002,7 +2002,7 @@
/* }}} */
-/* {{{ proto array mysql_fetch_lengths(int result)
+/* {{{ proto array mysql_fetch_lengths(resource result)
Gets max data size of each column in a result */
PHP_FUNCTION(mysql_fetch_lengths)
{
@@ -2088,7 +2088,7 @@
}
/* }}} */
-/* {{{ proto object mysql_fetch_field(int result [, int field_offset])
+/* {{{ proto object mysql_fetch_field(resource result [, int field_offset])
Gets column information from a result and return as an object */
PHP_FUNCTION(mysql_fetch_field)
{
@@ -2145,7 +2145,7 @@
/* }}} */
-/* {{{ proto bool mysql_field_seek(int result, int field_offset)
+/* {{{ proto bool mysql_field_seek(resource result, int field_offset)
Sets result pointer to a specific field offset */
PHP_FUNCTION(mysql_field_seek)
{
@@ -2302,7 +2302,7 @@
}
/* }}} */
-/* {{{ proto string mysql_field_name(int result, int field_index)
+/* {{{ proto string mysql_field_name(resource result, int field_index)
Gets the name of the specified field in a result */
PHP_FUNCTION(mysql_field_name)
{
@@ -2311,7 +2311,7 @@
/* }}} */
-/* {{{ proto string mysql_field_table(int result, int field_offset)
+/* {{{ proto string mysql_field_table(resource result, int field_offset)
Gets name of the table the specified field is in */
PHP_FUNCTION(mysql_field_table)
{
@@ -2320,7 +2320,7 @@
/* }}} */
-/* {{{ proto int mysql_field_len(int result, int field_offset)
+/* {{{ proto int mysql_field_len(resource result, int field_offset)
Returns the length of the specified field */
PHP_FUNCTION(mysql_field_len)
{
@@ -2329,7 +2329,7 @@
/* }}} */
-/* {{{ proto string mysql_field_type(int result, int field_offset)
+/* {{{ proto string mysql_field_type(resource result, int field_offset)
Gets the type of the specified field in a result */
PHP_FUNCTION(mysql_field_type)
{
@@ -2338,7 +2338,7 @@
/* }}} */
-/* {{{ proto string mysql_field_flags(int result, int field_offset)
+/* {{{ proto string mysql_field_flags(resource result, int field_offset)
Gets the flags associated with the specified field in a result */
PHP_FUNCTION(mysql_field_flags)
{
@@ -2347,7 +2347,7 @@
/* }}} */
-/* {{{ proto bool mysql_free_result(int result)
+/* {{{ proto bool mysql_free_result(resource result)
Free result memory */
PHP_FUNCTION(mysql_free_result)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng TODO
hholzgraTue Jun 10 13:48:10 2003 EDT Modified files: /php4/scripts/ext_skel_ng TODO Log: new TODO item: VisualStudio.net project files Index: php4/scripts/ext_skel_ng/TODO diff -u php4/scripts/ext_skel_ng/TODO:1.6 php4/scripts/ext_skel_ng/TODO:1.7 --- php4/scripts/ext_skel_ng/TODO:1.6 Tue May 20 09:38:08 2003 +++ php4/scripts/ext_skel_ng/TODO Tue Jun 10 13:48:10 2003 @@ -23,4 +23,5 @@ - ... - dual/multiple licensing? - full support for stream wrappers and filters -- DTD support for creating custom tests \ No newline at end of file +- DTD support for creating custom tests +- VC++ 7 (VS.net) project files -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
andiTue Jun 10 15:26:03 2003 EDT Modified files: /CVSROOTavail Log: - Add imajes to Zend. License commit coming up Index: CVSROOT/avail diff -u CVSROOT/avail:1.685 CVSROOT/avail:1.686 --- CVSROOT/avail:1.685 Thu Jun 5 12:42:06 2003 +++ CVSROOT/avail Tue Jun 10 15:26:02 2003 @@ -21,7 +21,7 @@ # People who work on the Engine -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php4 / header run-tests.php run-tests2.php /build build.mk build2.mk buildcheck.sh mkdep.awk /ext/bcmath bcmath.c php_bcmath.h /ext/calendar cal_unix.c calendar.c easter.c /ext/cpdf cpdf.c php_cpdf.h /ext/crack crack.c php_crack.h
imajesTue Jun 10 16:03:55 2003 EDT Modified files: /php4 header run-tests.php run-tests2.php /TSRM tsrm_nw.c tsrm_nw.h tsrm_virtual_cwd.c snip Log: updating license information in the headers. This should not do anything serious to your working copies. Just do a cvs update whenever, it should only change lines in the header portion of files. -- james -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom text.c
rrichards Tue Jun 10 18:24:54 2003 EDT
Modified files:
/php4/ext/dom text.c
Log:
Fixed memleaks
Index: php4/ext/dom/text.c
diff -u php4/ext/dom/text.c:1.5 php4/ext/dom/text.c:1.6
--- php4/ext/dom/text.c:1.5 Tue Jun 10 16:03:27 2003
+++ php4/ext/dom/text.c Tue Jun 10 18:24:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: text.c,v 1.5 2003/06/10 20:03:27 imajes Exp $ */
+/* $Id: text.c,v 1.6 2003/06/10 22:24:54 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -82,12 +82,16 @@
int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC)
{
xmlNodePtr node;
-
+ xmlChar *wholetext;
+
node = obj-ptr;
ALLOC_ZVAL(*retval);
- ZVAL_STRING(*retval, xmlNodeListGetString(node-doc, node, 1), 1);
-
+ wholetext = xmlNodeListGetString(node-doc, node, 1);
+ ZVAL_STRING(*retval, wholetext, 1);
+
+ xmlFree(wholetext);
+
return SUCCESS;
}
@@ -129,6 +133,7 @@
length = xmlStrlen(cur);
if (offset length || offset 0) {
+ xmlFree(cur);
RETURN_FALSE;
}
@@ -139,6 +144,9 @@
xmlNodeSetContentLen(node, first, offset);
nnode = xmlNewText(second);
+
+ xmlFree(first);
+ xmlFree(second);
nnode-type = XML_ELEMENT_NODE;
xmlAddNextSibling(node, nnode);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
iliaa Tue Jun 10 22:16:19 2003 EDT
Modified files:
/php4/ext/standard string.c
Log:
fixed proto
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.389 php4/ext/standard/string.c:1.390
--- php4/ext/standard/string.c:1.389Tue Jun 10 16:03:38 2003
+++ php4/ext/standard/string.c Tue Jun 10 22:16:19 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.389 2003/06/10 20:03:38 imajes Exp $ */
+/* $Id: string.c,v 1.390 2003/06/11 02:16:19 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4477,7 +4477,7 @@
}
/* }}} */
-/* {{{ proto void str_word_count(string str, [int format])
+/* {{{ proto mixed str_word_count(string str, [int format])
Counts the number of words inside a string. If format of 1 is specified,
then the function will return an array containing all the words
found inside the string. If format of 2 is specified, then the function
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard string.c
iliaa Tue Jun 10 22:16:50 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard string.c
Log:
MFH: proto fix
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.29 php4/ext/standard/string.c:1.333.2.30
--- php4/ext/standard/string.c:1.333.2.29 Mon May 26 16:56:01 2003
+++ php4/ext/standard/string.c Tue Jun 10 22:16:49 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.29 2003/05/26 20:56:01 msopacua Exp $ */
+/* $Id: string.c,v 1.333.2.30 2003/06/11 02:16:49 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4024,7 +4024,7 @@
}
/* }}} */
-/* {{{ proto void str_word_count(string str, [int format])
+/* {{{ proto mixed str_word_count(string str, [int format])
Counts the number of words inside a string. If format of 1 is specified,
then the function will return an array containing all the words
found inside the string. If format of 2 is specified, then the function
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
