archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix folding and clean up some extensions

Browse source
This commit is contained in:
Rasmus Lerdorf 2001-06-06 13:06:12 +00:00
parent 3bfd50f4f1
commit 81e2cf03ac
161 changed files with 1610 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/aspell/aspell.c
View file

@ -221,5 +221,6 @@ PHP_MINFO_FUNCTION(aspell)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

2
ext/bcmath/bcmath.c
View file

@ -499,4 +499,6 @@ PHP_FUNCTION(bcscale)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

8
ext/calendar/cal_unix.c
View file

@ -78,3 +78,11 @@ PHP_FUNCTION(jdtounix)
} }
/* }}} */ /* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/calendar/calendar.c
View file

@ -289,7 +289,6 @@ PHP_FUNCTION(jdtogregorian)
} }
/* }}} */ /* }}} */
/* {{{ proto string jdmonthname(int juliandaycount, int mode) /* {{{ 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)
@ -339,3 +338,11 @@ PHP_FUNCTION(jdtogregorian)
} }
/* }}} */ /* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/calendar/dow.c
View file

@ -65,3 +65,12 @@ char *DayNameLong[7] =
"Friday", "Friday",
"Saturday" "Saturday"
}; };
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

10
ext/calendar/french.c
View file

@ -148,3 +148,13 @@ char *FrenchMonthName[14] =
"Fructidor", "Fructidor",
"Extra" "Extra"
}; };
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/calendar/jewish.c
View file

@ -730,3 +730,12 @@ long int JewishToSdn(
} }
return (sdn + SDN_OFFSET); return (sdn + SDN_OFFSET);
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/calendar/julian.c
View file

@ -238,3 +238,12 @@ long int JulianToSdn(
+ inputDay + inputDay
- SDN_OFFSET); - SDN_OFFSET);
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

10
ext/ccvs/ccvs.c
View file

@ -593,3 +593,13 @@ PHP_MINFO_FUNCTION(ccvs)
*/ */
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

31
ext/cpdf/cpdf.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de> | | Authors: Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -2721,4 +2710,6 @@ PHP_FUNCTION(cpdf_add_outline) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

21
ext/crack/crack.c
View file

@ -1,3 +1,21 @@
/*
+----------------------------------------------------------------------+
| PHP version 4.0 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -259,5 +277,6 @@ ZEND_FUNCTION(crack_getlastmessage)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

4
ext/ctype/ctype.c
View file

@ -13,7 +13,6 @@
| license@php.net so we can mail you a copy immediately. | | license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Hartmut Holzgraefe <hartmut@six.de> | | Authors: Hartmut Holzgraefe <hartmut@six.de> |
| |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
@ -326,5 +325,6 @@ PHP_FUNCTION(ctype_xdigit)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/curl/curl.c
View file

@ -979,5 +979,6 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/cybercash/cybercash.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997,1998 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Evan Klinger <evan715@sirius.com> | | Authors: Evan Klinger <evan715@sirius.com> |
| Timothy Whitfield <timothy@ametro.net> | | Timothy Whitfield <timothy@ametro.net> |
@ -234,5 +223,6 @@ PHP_FUNCTION(cybercash_base64_decode)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/cybermut/cybermut.c
View file

@ -178,5 +178,6 @@ PHP_FUNCTION(cybermut_creerreponsecm)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/db/db.c
View file

@ -1242,5 +1242,6 @@ ZEND_GET_MODULE(dbm)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -524,5 +513,6 @@ PHP_FUNCTION(dba_sync)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_cdb.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -224,5 +213,6 @@ DBA_SYNC_FUNC(cdb)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_db2.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -205,5 +194,6 @@ DBA_SYNC_FUNC(db2)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_db3.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -212,5 +201,6 @@ DBA_SYNC_FUNC(db3)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_dbm.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -190,5 +179,6 @@ DBA_SYNC_FUNC(dbm)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_gdbm.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -193,5 +182,6 @@ DBA_SYNC_FUNC(gdbm)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/dba/dba_ndbm.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Sascha Schumann <sascha@schumann.cx> | | Authors: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -170,5 +159,6 @@ DBA_SYNC_FUNC(ndbm)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/dbase/dbase.c
View file

@ -779,5 +779,6 @@ BOOL WINAPI DllMain(HANDLE hModule,
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

9
ext/dbase/dbf_head.c
View file

@ -260,3 +260,12 @@ void dbf_head_info(dbhead_t *dbh)
cur_f->db_type, cur_f->db_flen, cur_f->db_fdc); cur_f->db_type, cur_f->db_flen, cur_f->db_fdc);
} }
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/dbase/dbf_misc.c
View file

@ -168,3 +168,12 @@ char *db_cur_date(char *cp)
return cp; return cp;
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

8
ext/dbase/dbf_ndx.c
View file

@ -181,3 +181,11 @@ ndx_record_t *ndx_get_next_rec(ndx_header_t *hp, ndx_record_t *rp)
return rp; return rp;
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/dbase/dbf_rec.c
View file

@ -180,3 +180,12 @@ char *dbf_get_next(dbhead_t *dbh)
{ {
return get_dbf_record(dbh, dbh->db_cur_rec + 1); return get_dbf_record(dbh, dbh->db_cur_rec + 1);
} }
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

22
ext/ereg/ereg.c
View file

@ -46,6 +46,8 @@ typedef struct {
int cflags; int cflags;
} reg_cache; } reg_cache;
/* {{{ _php_regcomp
*/
static int _php_regcomp(regex_t *preg, const char *pattern, int cflags) static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
{ {
int r = 0; int r = 0;
@ -70,6 +72,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
return r; return r;
} }
/* }}} */
static void _free_reg_cache(reg_cache *rc) static void _free_reg_cache(reg_cache *rc)
{ {
@ -119,7 +122,7 @@ PHP_MINFO_FUNCTION(regex)
call to ereg() or eregi() with the optional third argument. */ call to ereg() or eregi() with the optional third argument. */
#define NS 10 #define NS 10
/* /* {{{ php_reg_eprint
* php_reg_eprint - convert error number to name * php_reg_eprint - convert error number to name
*/ */
static void php_reg_eprint(int err, regex_t *re) { static void php_reg_eprint(int err, regex_t *re) {
@ -158,7 +161,10 @@ static void php_reg_eprint(int err, regex_t *re) {
STR_FREE(buf); STR_FREE(buf);
STR_FREE(message); STR_FREE(message);
} }
/* }}} */
/* {{{ php_ereg
*/
static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase) static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
{ {
pval **regex, /* Regular expression */ pval **regex, /* Regular expression */
@ -263,6 +269,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
} }
regfree(&re); regfree(&re);
} }
/* }}} */
/* {{{ proto int ereg(string pattern, string string [, array registers]) /* {{{ proto int ereg(string pattern, string string [, array registers])
Regular expression match */ Regular expression match */
@ -280,7 +287,8 @@ PHP_FUNCTION(eregi)
} }
/* }}} */ /* }}} */
/* this is the meat and potatoes of regex replacement! */ /* {{{ php_reg_replace
* this is the meat and potatoes of regex replacement! */
char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended) char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended)
{ {
regex_t re; regex_t re;
@ -418,7 +426,10 @@ char *php_reg_replace(const char *pattern, const char *replace, const char *stri
/* whew. */ /* whew. */
return (buf); return (buf);
} }
/* }}} */
/* {{{ php_ereg_replace
*/
static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase) static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
{ {
pval **arg_pattern, pval **arg_pattern,
@ -475,6 +486,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
STR_FREE(replace); STR_FREE(replace);
STR_FREE(pattern); STR_FREE(pattern);
} }
/* }}} */
/* {{{ proto string ereg_replace(string pattern, string replacement, string string) /* {{{ proto string ereg_replace(string pattern, string replacement, string string)
Replace regular expression */ Replace regular expression */
@ -492,6 +504,8 @@ PHP_FUNCTION(eregi_replace)
} }
/* }}} */ /* }}} */
/* {{{ php_split
*/
static void php_split(INTERNAL_FUNCTION_PARAMETERS, int icase) static void php_split(INTERNAL_FUNCTION_PARAMETERS, int icase)
{ {
pval **spliton, **str, **arg_count = NULL; pval **spliton, **str, **arg_count = NULL;
@ -586,6 +600,7 @@ static void php_split(INTERNAL_FUNCTION_PARAMETERS, int icase)
regfree(&re); regfree(&re);
} }
/* }}} */
/* ("root", "passwd", "uid", "gid", "other:stuff:like:/bin/sh") /* ("root", "passwd", "uid", "gid", "other:stuff:like:/bin/sh")
= split(":", $passwd_file, 5); */ = split(":", $passwd_file, 5); */
@ -650,5 +665,6 @@ PHPAPI PHP_FUNCTION(sql_regcase)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

2
ext/exif/exif.c
View file

@ -1227,4 +1227,6 @@ PHP_FUNCTION(read_exif_data) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

84
ext/fbsql/php_fbsql.c
View file

@ -154,7 +154,8 @@ struct PHPFBLink
#define FBSQL_NUM 1<<1 #define FBSQL_NUM 1<<1
#define FBSQL_BOTH (FBSQL_ASSOC|FBSQL_NUM) #define FBSQL_BOTH (FBSQL_ASSOC|FBSQL_NUM)
/* {{{ fbsql_functions[]
*/
function_entry fbsql_functions[] = { function_entry fbsql_functions[] = {
PHP_FE(fbsql_connect, NULL) PHP_FE(fbsql_connect, NULL)
PHP_FE(fbsql_pconnect, NULL) PHP_FE(fbsql_pconnect, NULL)
@ -210,6 +211,7 @@ function_entry fbsql_functions[] = {
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
zend_module_entry fbsql_module_entry = { zend_module_entry fbsql_module_entry = {
"fbsql", "fbsql",
@ -319,6 +321,8 @@ static int php_fbsql_get_default_link(INTERNAL_FUNCTION_PARAMETERS FBSQLLS_DC)
static int phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link); static int phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link);
/* {{{ PHP_INI
*/
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN ("fbsql.allow_persistant", "1", PHP_INI_SYSTEM, OnUpdateInt, allowPersistent, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_BOOLEAN ("fbsql.allow_persistant", "1", PHP_INI_SYSTEM, OnUpdateInt, allowPersistent, zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0", PHP_INI_SYSTEM, OnUpdateInt, generateWarnings, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0", PHP_INI_SYSTEM, OnUpdateInt, generateWarnings, zend_fbsql_globals, fbsql_globals)
@ -334,7 +338,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY ("fbsql.default_database", "", PHP_INI_SYSTEM, OnUpdateString, databaseName, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_ENTRY ("fbsql.default_database", "", PHP_INI_SYSTEM, OnUpdateString, databaseName, zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_ENTRY ("fbsql.default_database_password", "", PHP_INI_SYSTEM, OnUpdateString, databasePassword, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_ENTRY ("fbsql.default_database_password", "", PHP_INI_SYSTEM, OnUpdateString, databasePassword, zend_fbsql_globals, fbsql_globals)
PHP_INI_END() PHP_INI_END()
/* }}} */
static void php_fbsql_init_globals(zend_fbsql_globals *fbsql_globals) static void php_fbsql_init_globals(zend_fbsql_globals *fbsql_globals)
{ {
@ -419,6 +423,8 @@ PHP_MINFO_FUNCTION(fbsql)
DISPLAY_INI_ENTRIES(); DISPLAY_INI_ENTRIES();
} }
/* {{{ php_fbsql_do_connect
*/
static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistant) static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistant)
{ {
PHPFBLink* phpLink; PHPFBLink* phpLink;
@ -568,7 +574,7 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistant)
} }
php_fbsql_set_default_link(return_value->value.lval); php_fbsql_set_default_link(return_value->value.lval);
} }
/* }}} */
int phpfbFetchRow(PHPFBResult* result, int row) int phpfbFetchRow(PHPFBResult* result, int row)
{ {
@ -600,7 +606,6 @@ PHP_FUNCTION(fbsql_connect)
} }
/* }}} */ /* }}} */
/* {{{ proto resource fbsql_pconnect([string hostname [, string username [, string password]]]); /* {{{ proto resource fbsql_pconnect([string hostname [, string username [, string password]]]);
*/ */
PHP_FUNCTION(fbsql_pconnect) PHP_FUNCTION(fbsql_pconnect)
@ -649,6 +654,8 @@ PHP_FUNCTION(fbsql_close)
} }
/* }}} */ /* }}} */
/* {{{ php_fbsql_select_db
*/
static int php_fbsql_select_db(char *databaseName, PHPFBLink *link) static int php_fbsql_select_db(char *databaseName, PHPFBLink *link)
{ {
unsigned port; unsigned port;
@ -710,6 +717,8 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link)
} }
/* }}} */ /* }}} */
/* {{{ phpfbestrdup
*/
void phpfbestrdup(const char * s, int* length, char** value) void phpfbestrdup(const char * s, int* length, char** value)
{ {
int l = s?strlen(s):0; int l = s?strlen(s):0;
@ -724,9 +733,10 @@ void phpfbestrdup(const char * s, int* length, char** value)
} }
*length = l; *length = l;
} }
/* }}} */
/* {{{ proto bool fbsql_autocommit(int link_identifier [, bool OnOff]) /* {{{ proto bool fbsql_autocommit(int link_identifier [, bool OnOff])
*/ Turn on auto-commit */
PHP_FUNCTION(fbsql_autocommit) PHP_FUNCTION(fbsql_autocommit)
{ {
PHPFBLink* phpLink = NULL; PHPFBLink* phpLink = NULL;
@ -843,7 +853,6 @@ PHP_FUNCTION(fbsql_rollback)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_hostname(int link_identifier [, string host_name]) /* {{{ proto string fbsql_hostname(int link_identifier [, string host_name])
*/ */
PHP_FUNCTION(fbsql_hostname) PHP_FUNCTION(fbsql_hostname)
@ -879,7 +888,6 @@ PHP_FUNCTION(fbsql_hostname)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_database(int link_identifier [, string database]) /* {{{ proto string fbsql_database(int link_identifier [, string database])
*/ */
PHP_FUNCTION(fbsql_database) PHP_FUNCTION(fbsql_database)
@ -915,7 +923,6 @@ PHP_FUNCTION(fbsql_database)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_database_password(int link_identifier [, string database_password]) /* {{{ proto string fbsql_database_password(int link_identifier [, string database_password])
*/ */
PHP_FUNCTION(fbsql_database_password) PHP_FUNCTION(fbsql_database_password)
@ -951,7 +958,6 @@ PHP_FUNCTION(fbsql_database_password)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_username(int link_identifier [, string username]) /* {{{ proto string fbsql_username(int link_identifier [, string username])
*/ */
PHP_FUNCTION(fbsql_username) PHP_FUNCTION(fbsql_username)
@ -987,7 +993,6 @@ PHP_FUNCTION(fbsql_username)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_password(int link_identifier [, string password]) /* {{{ proto string fbsql_password(int link_identifier [, string password])
*/ */
PHP_FUNCTION(fbsql_password) PHP_FUNCTION(fbsql_password)
@ -1023,7 +1028,6 @@ PHP_FUNCTION(fbsql_password)
} }
/* }}} */ /* }}} */
/* {{{ proto bool fbsql_select_db([string database_name [, int link_identifier]]) /* {{{ proto bool fbsql_select_db([string database_name [, int link_identifier]])
*/ */
PHP_FUNCTION(fbsql_select_db) PHP_FUNCTION(fbsql_select_db)
@ -1079,7 +1083,6 @@ PHP_FUNCTION(fbsql_select_db)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_change_user(string user, string password [, string database [, int link_identifier]]); /* {{{ proto int fbsql_change_user(string user, string password [, string database [, int link_identifier]]);
*/ */
PHP_FUNCTION(fbsql_change_user) PHP_FUNCTION(fbsql_change_user)
@ -1140,7 +1143,6 @@ PHP_FUNCTION(fbsql_change_user)
} }
/* }}} */ /* }}} */
/* {{{ proto bool fbsql_create_db(string database_name [, int link_identifier]) /* {{{ proto bool fbsql_create_db(string database_name [, int link_identifier])
*/ */
PHP_FUNCTION(fbsql_create_db) PHP_FUNCTION(fbsql_create_db)
@ -1212,7 +1214,6 @@ PHP_FUNCTION(fbsql_create_db)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_drop_db(string database_name [, int link_identifier]) /* {{{ proto int fbsql_drop_db(string database_name [, int link_identifier])
*/ */
PHP_FUNCTION(fbsql_drop_db) PHP_FUNCTION(fbsql_drop_db)
@ -1361,7 +1362,6 @@ PHP_FUNCTION(fbsql_start_db)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_stop_db(string database_name [, int link_identifier]) /* {{{ proto int fbsql_stop_db(string database_name [, int link_identifier])
*/ */
PHP_FUNCTION(fbsql_stop_db) PHP_FUNCTION(fbsql_stop_db)
@ -1419,7 +1419,6 @@ PHP_FUNCTION(fbsql_stop_db)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_db_status(string database_name [, int link_identifier]) /* {{{ proto int fbsql_db_status(string database_name [, int link_identifier])
Get the status (Stoped, Starting, Started, Stopping) for a given database*/ Get the status (Stoped, Starting, Started, Stopping) for a given database*/
PHP_FUNCTION(fbsql_db_status) PHP_FUNCTION(fbsql_db_status)
@ -1462,6 +1461,8 @@ PHP_FUNCTION(fbsql_db_status)
} }
/* }}} */ /* }}} */
/* {{{ mdOk
*/
int mdOk(PHPFBLink* link, FBCMetaData* md) int mdOk(PHPFBLink* link, FBCMetaData* md)
{ {
FBCDatabaseConnection* c = link->connection; FBCDatabaseConnection* c = link->connection;
@ -1500,7 +1501,10 @@ int mdOk(PHPFBLink* link, FBCMetaData* md)
} }
return result; return result;
} }
/* }}} */
/* {{{ phpfbQuery
*/
static int phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link) static int phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link)
{ {
PHPFBResult* result = NULL; PHPFBResult* result = NULL;
@ -1584,6 +1588,7 @@ static int phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link)
if (link) link->affectedRows = fbcmdRowCount(md); if (link) link->affectedRows = fbcmdRowCount(md);
return 1; return 1;
} }
/* }}} */
/* {{{ proto resource fbsql_query(string query [, int link_identifier]) /* {{{ proto resource fbsql_query(string query [, int link_identifier])
*/ */
@ -1620,7 +1625,6 @@ PHP_FUNCTION(fbsql_query)
} }
/* }}} */ /* }}} */
/* {{{ proto resource fbsql_db_query(string database_name, string query [, int link_identifier]) /* {{{ proto resource fbsql_db_query(string database_name, string query [, int link_identifier])
*/ */
PHP_FUNCTION(fbsql_db_query) PHP_FUNCTION(fbsql_db_query)
@ -1664,7 +1668,6 @@ PHP_FUNCTION(fbsql_db_query)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_list_dbs([int link_identifier]) /* {{{ proto int fbsql_list_dbs([int link_identifier])
*/ */
PHP_FUNCTION(fbsql_list_dbs) PHP_FUNCTION(fbsql_list_dbs)
@ -1711,7 +1714,6 @@ PHP_FUNCTION(fbsql_list_dbs)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_list_tables(string database, int [link_identifier]); /* {{{ proto int fbsql_list_tables(string database, int [link_identifier]);
*/ */
PHP_FUNCTION(fbsql_list_tables) PHP_FUNCTION(fbsql_list_tables)
@ -1759,7 +1761,6 @@ PHP_FUNCTION(fbsql_list_tables)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_list_fields(string database_name, string table_name [, int link_identifier]) /* {{{ proto int fbsql_list_fields(string database_name, string table_name [, int link_identifier])
*/ */
PHP_FUNCTION(fbsql_list_fields) PHP_FUNCTION(fbsql_list_fields)
@ -1804,7 +1805,6 @@ PHP_FUNCTION(fbsql_list_fields)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_error([int link_identifier]) /* {{{ proto string fbsql_error([int link_identifier])
*/ */
PHP_FUNCTION(fbsql_error) PHP_FUNCTION(fbsql_error)
@ -1840,7 +1840,6 @@ PHP_FUNCTION(fbsql_error)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_errno([int link_identifier]) /* {{{ proto int fbsql_errno([int link_identifier])
*/ */
PHP_FUNCTION(fbsql_errno) PHP_FUNCTION(fbsql_errno)
@ -1871,7 +1870,6 @@ PHP_FUNCTION(fbsql_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto bool fbsql_warnings([int flag]); /* {{{ proto bool fbsql_warnings([int flag]);
*/ */
PHP_FUNCTION(fbsql_warnings) PHP_FUNCTION(fbsql_warnings)
@ -1891,7 +1889,6 @@ PHP_FUNCTION(fbsql_warnings)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_affected_rows([int link_identifier]) /* {{{ proto int fbsql_affected_rows([int link_identifier])
*/ */
PHP_FUNCTION(fbsql_affected_rows) PHP_FUNCTION(fbsql_affected_rows)
@ -1952,7 +1949,8 @@ PHP_FUNCTION(fbsql_insert_id)
} }
/* }}} */ /* }}} */
/* {{{ phpSizeOfInt
*/
int phpSizeOfInt (int i) int phpSizeOfInt (int i)
{ {
int s = 1; int s = 1;
@ -1964,7 +1962,10 @@ int phpSizeOfInt (int i)
while ((i = i / 10)) s++; while ((i = i / 10)) s++;
return s; return s;
} }
/* }}} */
/* {{{ phpfbColumnAsString
*/
void phpfbColumnAsString (PHPFBResult* result, int column, void* data ,int* length, char** value) void phpfbColumnAsString (PHPFBResult* result, int column, void* data ,int* length, char** value)
{ {
FBCMetaData* md = result->metaData; FBCMetaData* md = result->metaData;
@ -2146,7 +2147,10 @@ void phpfbColumnAsString (PHPFBResult* result, int column, void* data ,int* leng
break; break;
} }
} }
/* }}} */
/* {{{ phpfbSqlResult
*/
void phpfbSqlResult (INTERNAL_FUNCTION_PARAMETERS, PHPFBResult* result, int rowIndex, int columnIndex) void phpfbSqlResult (INTERNAL_FUNCTION_PARAMETERS, PHPFBResult* result, int rowIndex, int columnIndex)
{ {
void** row; void** row;
@ -2210,6 +2214,7 @@ void phpfbSqlResult (INTERNAL_FUNCTION_PARAMETERS, PHPFBResult* result, int rowI
} }
} }
} }
/* }}} */
/* {{{ proto mixed fbsql_result(int result [, int row [, mixed field]]) /* {{{ proto mixed fbsql_result(int result [, int row [, mixed field]])
*/ */
@ -2286,7 +2291,6 @@ PHP_FUNCTION(fbsql_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_next_result(int result) /* {{{ proto int fbsql_next_result(int result)
*/ */
PHP_FUNCTION(fbsql_next_result) PHP_FUNCTION(fbsql_next_result)
@ -2336,7 +2340,6 @@ PHP_FUNCTION(fbsql_next_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_num_rows(int result) /* {{{ proto int fbsql_num_rows(int result)
*/ */
PHP_FUNCTION(fbsql_num_rows) PHP_FUNCTION(fbsql_num_rows)
@ -2372,7 +2375,6 @@ PHP_FUNCTION(fbsql_num_rows)
} }
/* }}} */ /* }}} */
/* {{{ proto int fbsql_num_fields(int result) /* {{{ proto int fbsql_num_fields(int result)
*/ */
PHP_FUNCTION(fbsql_num_fields) PHP_FUNCTION(fbsql_num_fields)
@ -2397,7 +2399,6 @@ PHP_FUNCTION(fbsql_num_fields)
} }
/* }}} */ /* }}} */
/* {{{ proto array fbsql_fetch_row(int result) /* {{{ proto array fbsql_fetch_row(int result)
*/ */
PHP_FUNCTION(fbsql_fetch_row) PHP_FUNCTION(fbsql_fetch_row)
@ -2406,7 +2407,6 @@ PHP_FUNCTION(fbsql_fetch_row)
} }
/* }}} */ /* }}} */
/* {{{ proto object fbsql_fetch_assoc(int result) /* {{{ proto object fbsql_fetch_assoc(int result)
*/ */
PHP_FUNCTION(fbsql_fetch_assoc) PHP_FUNCTION(fbsql_fetch_assoc)
@ -2415,7 +2415,6 @@ PHP_FUNCTION(fbsql_fetch_assoc)
} }
/* }}} */ /* }}} */
/* {{{ proto object fbsql_fetch_object(int result [, int result_type]) /* {{{ proto object fbsql_fetch_object(int result [, int result_type])
*/ */
PHP_FUNCTION(fbsql_fetch_object) PHP_FUNCTION(fbsql_fetch_object)
@ -2430,7 +2429,6 @@ PHP_FUNCTION(fbsql_fetch_object)
} }
/* }}} */ /* }}} */
/* {{{ proto array fbsql_fetch_array(int result [, int result_type]) /* {{{ proto array fbsql_fetch_array(int result [, int result_type])
Fetch a result row as an array (associative, numeric or both)*/ Fetch a result row as an array (associative, numeric or both)*/
PHP_FUNCTION(fbsql_fetch_array) PHP_FUNCTION(fbsql_fetch_array)
@ -2439,6 +2437,8 @@ PHP_FUNCTION(fbsql_fetch_array)
} }
/* }}} */ /* }}} */
/* {{{ php_fbsql_fetch_hash
*/
static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
{ {
@ -2548,7 +2548,7 @@ static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
result->rowIndex = result->rowIndex+1; result->rowIndex = result->rowIndex+1;
result->columnIndex = 0; result->columnIndex = 0;
} }
/* }}} */
/* {{{ proto int fbsql_data_seek(int result, int row_number) /* {{{ proto int fbsql_data_seek(int result, int row_number)
*/ */
@ -2588,7 +2588,6 @@ PHP_FUNCTION(fbsql_data_seek)
} }
/* }}} */ /* }}} */
/* {{{ proto array fbsql_fetch_lengths(int result) /* {{{ proto array fbsql_fetch_lengths(int result)
*/ */
PHP_FUNCTION(fbsql_fetch_lengths) PHP_FUNCTION(fbsql_fetch_lengths)
@ -2621,7 +2620,6 @@ PHP_FUNCTION(fbsql_fetch_lengths)
} }
/* }}} */ /* }}} */
/* {{{ proto object fbsql_fetch_field(int result [, int field_index]) /* {{{ proto object fbsql_fetch_field(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_fetch_field) PHP_FUNCTION(fbsql_fetch_field)
@ -2679,7 +2677,6 @@ PHP_FUNCTION(fbsql_fetch_field)
} }
/* }}} */ /* }}} */
/* {{{ proto bool fbsql_field_seek(int result [, int field_index]) /* {{{ proto bool fbsql_field_seek(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_seek) PHP_FUNCTION(fbsql_field_seek)
@ -2723,7 +2720,6 @@ PHP_FUNCTION(fbsql_field_seek)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_field_name(int result [, int field_index]) /* {{{ proto string fbsql_field_name(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_name) PHP_FUNCTION(fbsql_field_name)
@ -2773,7 +2769,6 @@ PHP_FUNCTION(fbsql_field_name)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_field_table(int result [, int field_index]) /* {{{ proto string fbsql_field_table(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_table) PHP_FUNCTION(fbsql_field_table)
@ -2815,7 +2810,6 @@ PHP_FUNCTION(fbsql_field_table)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_field_len(int result [, int field_index]) /* {{{ proto string fbsql_field_len(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_len) PHP_FUNCTION(fbsql_field_len)
@ -2871,7 +2865,6 @@ PHP_FUNCTION(fbsql_field_len)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_field_type(int result [, int field_index]) /* {{{ proto string fbsql_field_type(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_type) PHP_FUNCTION(fbsql_field_type)
@ -2924,7 +2917,6 @@ PHP_FUNCTION(fbsql_field_type)
} }
/* }}} */ /* }}} */
/* {{{ proto string fbsql_field_flags(int result [, int field_index]) /* {{{ proto string fbsql_field_flags(int result [, int field_index])
*/ */
PHP_FUNCTION(fbsql_field_flags) PHP_FUNCTION(fbsql_field_flags)
@ -3010,7 +3002,6 @@ PHP_FUNCTION(fbsql_field_flags)
} }
/* }}} */ /* }}} */
/* {{{ proto bool fbsql_free_result(int result) /* {{{ proto bool fbsql_free_result(int result)
*/ */
PHP_FUNCTION(fbsql_free_result) PHP_FUNCTION(fbsql_free_result)
@ -3037,3 +3028,12 @@ PHP_FUNCTION(fbsql_free_result)
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

3
ext/fdf/fdf.c
View file

@ -764,5 +764,6 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/filepro/filepro.c
View file

@ -572,5 +572,6 @@ PHP_FUNCTION(filepro_retrieve)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/fribidi/fribidi.c
View file

@ -250,5 +250,6 @@ PHP_FUNCTION(fribidi_log2vis)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/ftp/ftp.c
View file

@ -1298,5 +1298,6 @@ bail:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/gd/gd.c
View file

@ -3499,5 +3499,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type ) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

5
ext/gettext/gettext.c
View file

@ -31,6 +31,8 @@
#include <libintl.h> #include <libintl.h>
#include "ext/standard/info.h" #include "ext/standard/info.h"
/* {{{ php_gettext_functions[]
*/
function_entry php_gettext_functions[] = { function_entry php_gettext_functions[] = {
PHP_FE(textdomain, NULL) PHP_FE(textdomain, NULL)
PHP_FE(gettext, NULL) PHP_FE(gettext, NULL)
@ -40,6 +42,7 @@ function_entry php_gettext_functions[] = {
PHP_FE(bindtextdomain, NULL) PHP_FE(bindtextdomain, NULL)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
zend_module_entry php_gettext_module_entry = { zend_module_entry php_gettext_module_entry = {
"gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES "gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES
@ -173,4 +176,6 @@ PHP_FUNCTION(bindtextdomain)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/gmp/gmp.c
View file

@ -1215,5 +1215,6 @@ static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

30
ext/hyperwave/hw.c
View file

@ -230,7 +230,8 @@ PHP_MSHUTDOWN_FUNCTION(hw)
return SUCCESS; return SUCCESS;
} }
/* creates an array in return value and frees all memory /* {{{ make_return_objrec
* creates an array in return value and frees all memory
* Also adds as an assoc. array at the end of the return array with * Also adds as an assoc. array at the end of the return array with
* statistics. * statistics.
*/ */
@ -290,8 +291,9 @@ int make_return_objrec(pval **return_value, char **objrecs, int count)
return 0; return 0;
} }
/* }}} */
/* /* {{{ make2_return_array_from_objrec
** creates an array return value from object record ** creates an array return value from object record
*/ */
int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr) { int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr) {
@ -400,7 +402,10 @@ int make2_return_array_from_objrec(pval **return_value, char *objrec, zval *sarr
return(0); return(0);
} }
/* }}} */
/* {{{ make_return_array_from_objrec
*/
int make_return_array_from_objrec(pval **return_value, char *objrec) { int make_return_array_from_objrec(pval **return_value, char *objrec) {
char *attrname, *str, *temp, language[3], *title; char *attrname, *str, *temp, language[3], *title;
int iTitle, iDesc, iKeyword, iGroup; int iTitle, iDesc, iKeyword, iGroup;
@ -542,8 +547,11 @@ int make_return_array_from_objrec(pval **return_value, char *objrec) {
return(0); return(0);
} }
/* }}} */
#define BUFFERLEN 1024 #define BUFFERLEN 1024
/* {{{ make_objrec_from_array
*/
static char * make_objrec_from_array(HashTable *lht) { static char * make_objrec_from_array(HashTable *lht) {
int i, count, keytype; int i, count, keytype;
ulong length; ulong length;
@ -617,8 +625,11 @@ static char * make_objrec_from_array(HashTable *lht) {
} }
return objrec; return objrec;
} }
/* }}} */
#undef BUFFERLEN #undef BUFFERLEN
/* {{{ make_ints_from_array
*/
static int * make_ints_from_array(HashTable *lht) { static int * make_ints_from_array(HashTable *lht) {
int i, count; int i, count;
int *objids = NULL; int *objids = NULL;
@ -646,7 +657,10 @@ static int * make_ints_from_array(HashTable *lht) {
} }
return objids; return objids;
} }
/* }}} */
/* {{{ make_strs_from_array
*/
static char **make_strs_from_array(HashTable *arrht) { static char **make_strs_from_array(HashTable *arrht) {
char **carr = NULL; char **carr = NULL;
char **ptr; char **ptr;
@ -674,8 +688,11 @@ static char **make_strs_from_array(HashTable *arrht) {
} }
return(carr); return(carr);
} }
/* }}} */
#define BUFFERLEN 30 #define BUFFERLEN 30
/* {{{ php_hw_do_connect
*/
static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
zval **argv[4]; zval **argv[4];
@ -933,6 +950,7 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
ptr->username = NULL; ptr->username = NULL;
efree(userdata); efree(userdata);
} }
/* }}} */
#undef BUFFERLEN #undef BUFFERLEN
/* Start of user level functions */ /* Start of user level functions */
@ -1319,6 +1337,8 @@ PHP_FUNCTION(hw_root)
} }
/* }}} */ /* }}} */
/* {{{ php_hw_command
*/
char *php_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) { char *php_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
pval **arg1; pval **arg1;
int link, type; int link, type;
@ -1344,6 +1364,7 @@ char *php_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
return object; return object;
} }
} }
/* }}} */
/* {{{ proto string hw_stat(int link) /* {{{ proto string hw_stat(int link)
Returns status string */ Returns status string */
@ -2037,6 +2058,8 @@ PHP_FUNCTION(hw_modifyobject) {
#undef BUFFERLEN #undef BUFFERLEN
/* }}} */ /* }}} */
/* {{{ php_hw_mvcp
*/
void php_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) { void php_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) {
pval *arg1, *arg2, *arg3, *arg4; pval *arg1, *arg2, *arg3, *arg4;
int link, type, dest=0, from=0, count; int link, type, dest=0, from=0, count;
@ -2127,6 +2150,7 @@ void php_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) {
RETURN_LONG(docIDcount + collIDcount); RETURN_LONG(docIDcount + collIDcount);
} }
/* }}} */
/* {{{ proto void hw_mv(int link, array objrec, int from, int dest) /* {{{ proto void hw_mv(int link, array objrec, int from, int dest)
Moves object */ Moves object */
@ -4445,4 +4469,6 @@ void print_msg(hg_msg *msg, char *str, int txt)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/iconv/iconv.c
View file

@ -295,5 +295,6 @@ PHP_FUNCTION(iconv_get_encoding)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

80
ext/imap/php_imap.c
View file

@ -391,7 +391,8 @@ void mail_free_messagelist(MESSAGELIST **msglist)
} }
} }
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(imap) PHP_MINFO_FUNCTION(imap)
{ {
php_info_print_table_start(); php_info_print_table_start();
@ -411,7 +412,7 @@ PHP_MINFO_FUNCTION(imap)
#endif #endif
php_info_print_table_end(); php_info_print_table_end();
} }
/* }}} */
static void php_imap_init_globals(zend_imap_globals *imap_globals) static void php_imap_init_globals(zend_imap_globals *imap_globals)
{ {
@ -853,7 +854,6 @@ PHP_FUNCTION(imap_open)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_popen(string mailbox, string user, string password [, int options]) /* {{{ proto int imap_popen(string mailbox, string user, string password [, int options])
Open a persistant IMAP stream to a mailbox */ Open a persistant IMAP stream to a mailbox */
PHP_FUNCTION(imap_popen) PHP_FUNCTION(imap_popen)
@ -867,7 +867,6 @@ PHP_FUNCTION(imap_popen)
#endif #endif
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_reopen(int stream_id, string mailbox [, int options]) /* {{{ proto int imap_reopen(int stream_id, string mailbox [, int options])
Reopen an IMAP stream to a new mailbox */ Reopen an IMAP stream to a new mailbox */
@ -915,7 +914,6 @@ PHP_FUNCTION(imap_reopen)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_append(int stream_id, string folder, string message [, string flags]) /* {{{ proto int imap_append(int stream_id, string folder, string message [, string flags])
Append a new message to a specified mailbox */ Append a new message to a specified mailbox */
PHP_FUNCTION(imap_append) PHP_FUNCTION(imap_append)
@ -953,7 +951,6 @@ PHP_FUNCTION(imap_append)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_num_msg(int stream_id) /* {{{ proto int imap_num_msg(int 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)
@ -981,7 +978,6 @@ PHP_FUNCTION(imap_num_msg)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_ping(int stream_id) /* {{{ proto int imap_ping(int 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)
@ -1006,7 +1002,6 @@ PHP_FUNCTION(imap_ping)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_num_recent(int stream_id) /* {{{ proto int imap_num_recent(int 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)
@ -1072,7 +1067,6 @@ PHP_FUNCTION(imap_get_quota)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_set_quota(int stream_id, string qroot, int mailbox_size) /* {{{ proto int imap_set_quota(int 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)
@ -1135,7 +1129,6 @@ PHP_FUNCTION(imap_expunge)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_close(int stream_id [, int options]) /* {{{ proto int imap_close(int stream_id [, int options])
Close an IMAP stream */ Close an IMAP stream */
PHP_FUNCTION(imap_close) PHP_FUNCTION(imap_close)
@ -1172,7 +1165,6 @@ PHP_FUNCTION(imap_close)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_headers(int stream_id) /* {{{ proto array imap_headers(int 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)
@ -1233,7 +1225,6 @@ PHP_FUNCTION(imap_headers)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_body(int stream_id, int msg_no [, int options]) /* {{{ proto string imap_body(int stream_id, int msg_no [, int options])
Read the message body */ Read the message body */
PHP_FUNCTION(imap_body) PHP_FUNCTION(imap_body)
@ -1276,7 +1267,6 @@ PHP_FUNCTION(imap_body)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchtext_full(int stream_id, int msg_no [, int options]) /* {{{ proto string imap_fetchtext_full(int stream_id, int msg_no [, int options])
Read the full text of a message */ Read the full text of a message */
PHP_FUNCTION(imap_fetchtext_full) PHP_FUNCTION(imap_fetchtext_full)
@ -1305,7 +1295,6 @@ PHP_FUNCTION(imap_fetchtext_full)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_mail_copy(int stream_id, int msg_no, string mailbox [, int options]) /* {{{ proto int imap_mail_copy(int stream_id, int msg_no, 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)
@ -1341,7 +1330,6 @@ PHP_FUNCTION(imap_mail_copy)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_mail_move(int stream_id, int msg_no, string mailbox [, int options]) /* {{{ proto int imap_mail_move(int stream_id, int msg_no, 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)
@ -1378,7 +1366,6 @@ PHP_FUNCTION(imap_mail_move)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_createmailbox(int stream_id, string mailbox) /* {{{ proto int imap_createmailbox(int stream_id, string mailbox)
Create a new mailbox */ Create a new mailbox */
PHP_FUNCTION(imap_createmailbox) PHP_FUNCTION(imap_createmailbox)
@ -1409,7 +1396,6 @@ PHP_FUNCTION(imap_createmailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_renamemailbox(int stream_id, string old_name, string new_name) /* {{{ proto int imap_renamemailbox(int stream_id, string old_name, string new_name)
Rename a mailbox */ Rename a mailbox */
PHP_FUNCTION(imap_renamemailbox) PHP_FUNCTION(imap_renamemailbox)
@ -1441,7 +1427,6 @@ PHP_FUNCTION(imap_renamemailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_deletemailbox(int stream_id, string mailbox) /* {{{ proto int imap_deletemailbox(int stream_id, string mailbox)
Delete a mailbox */ Delete a mailbox */
PHP_FUNCTION(imap_deletemailbox) PHP_FUNCTION(imap_deletemailbox)
@ -1472,7 +1457,6 @@ PHP_FUNCTION(imap_deletemailbox)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_list(int stream_id, string ref, string pattern) /* {{{ proto array imap_list(int stream_id, string ref, string pattern)
Read the list of mailboxes */ Read the list of mailboxes */
PHP_FUNCTION(imap_list) PHP_FUNCTION(imap_list)
@ -1518,7 +1502,6 @@ PHP_FUNCTION(imap_list)
/* }}} */ /* }}} */
/* {{{ proto array imap_getmailboxes(int stream_id, string ref, string pattern) /* {{{ proto array imap_getmailboxes(int 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 */
@ -1580,7 +1563,6 @@ PHP_FUNCTION(imap_list_full)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_scan(int stream_id, string ref, string pattern, string content) /* {{{ proto array imap_scan(int 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)
@ -1623,7 +1605,6 @@ PHP_FUNCTION(imap_listscan)
/* }}} */ /* }}} */
/* {{{ proto object imap_check(int stream_id) /* {{{ proto object imap_check(int stream_id)
Get mailbox properties */ Get mailbox properties */
PHP_FUNCTION(imap_check) PHP_FUNCTION(imap_check)
@ -1664,7 +1645,6 @@ PHP_FUNCTION(imap_check)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_delete(int stream_id, int msg_no [, int flags]) /* {{{ proto int imap_delete(int stream_id, int msg_no [, int flags])
Mark a message for deletion */ Mark a message for deletion */
PHP_FUNCTION(imap_delete) PHP_FUNCTION(imap_delete)
@ -1697,7 +1677,6 @@ PHP_FUNCTION(imap_delete)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_undelete(int stream_id, int msg_no) /* {{{ proto int imap_undelete(int stream_id, int msg_no)
Remove the delete flag from a message */ Remove the delete flag from a message */
PHP_FUNCTION(imap_undelete) PHP_FUNCTION(imap_undelete)
@ -1730,7 +1709,6 @@ PHP_FUNCTION(imap_undelete)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_headerinfo(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]]) /* {{{ proto object imap_headerinfo(int 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)
@ -1829,7 +1807,6 @@ PHP_FUNCTION(imap_headerinfo)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_rfc822_parse_headers(string headers [, string default_host]) /* {{{ 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)
@ -1906,7 +1883,6 @@ PHP_FUNCTION(imap_lsub)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_getsubscribed(int stream_id, string ref, string pattern) /* {{{ proto array imap_getsubscribed(int 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 */
@ -1968,7 +1944,6 @@ PHP_FUNCTION(imap_lsub_full)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_subscribe(int stream_id, string mailbox) /* {{{ proto int imap_subscribe(int stream_id, string mailbox)
Subscribe to a mailbox */ Subscribe to a mailbox */
PHP_FUNCTION(imap_subscribe) PHP_FUNCTION(imap_subscribe)
@ -1999,7 +1974,6 @@ PHP_FUNCTION(imap_subscribe)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_unsubscribe(int stream_id, string mailbox) /* {{{ proto int imap_unsubscribe(int stream_id, string mailbox)
Unsubscribe from a mailbox */ Unsubscribe from a mailbox */
PHP_FUNCTION(imap_unsubscribe) PHP_FUNCTION(imap_unsubscribe)
@ -2029,7 +2003,6 @@ PHP_FUNCTION(imap_unsubscribe)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_fetchstructure(int stream_id, int msg_no [, int options]) /* {{{ proto object imap_fetchstructure(int 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)
@ -2087,7 +2060,6 @@ PHP_FUNCTION(imap_fetchstructure)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchbody(int stream_id, int msg_no, int section [, int options]) /* {{{ proto string imap_fetchbody(int stream_id, int msg_no, int section [, int options])
Get a specific body section */ Get a specific body section */
PHP_FUNCTION(imap_fetchbody) PHP_FUNCTION(imap_fetchbody)
@ -2129,7 +2101,6 @@ PHP_FUNCTION(imap_fetchbody)
/* }}} */ /* }}} */
/* {{{ proto string imap_base64(string text) /* {{{ proto string imap_base64(string text)
Decode BASE64 encoded text */ Decode BASE64 encoded text */
PHP_FUNCTION(imap_base64) PHP_FUNCTION(imap_base64)
@ -2153,7 +2124,6 @@ PHP_FUNCTION(imap_base64)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_qprint(string text) /* {{{ 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)
@ -2177,7 +2147,6 @@ PHP_FUNCTION(imap_qprint)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_8bit(string text) /* {{{ 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)
@ -2198,7 +2167,6 @@ PHP_FUNCTION(imap_8bit)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_binary(string text) /* {{{ 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)
@ -2217,7 +2185,6 @@ PHP_FUNCTION(imap_binary)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_mailboxmsginfo(int stream_id) /* {{{ proto object imap_mailboxmsginfo(int stream_id)
Returns info about the current mailbox */ Returns info about the current mailbox */
PHP_FUNCTION(imap_mailboxmsginfo) PHP_FUNCTION(imap_mailboxmsginfo)
@ -2271,7 +2238,6 @@ PHP_FUNCTION(imap_mailboxmsginfo)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal) /* {{{ 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)
@ -2308,7 +2274,6 @@ PHP_FUNCTION(imap_rfc822_write_address)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host) /* {{{ 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)
@ -2350,7 +2315,6 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_utf8(string string) /* {{{ proto string imap_utf8(string string)
Convert a string to UTF-8 */ Convert a string to UTF-8 */
PHP_FUNCTION(imap_utf8) PHP_FUNCTION(imap_utf8)
@ -2545,7 +2509,6 @@ PHP_FUNCTION(imap_utf7_decode)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_utf7_encode(string buf) /* {{{ 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)
@ -2703,7 +2666,6 @@ PHP_FUNCTION(imap_setflag_full)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_clearflag_full(int stream_id, string sequence, string flag [, int options]) /* {{{ proto int imap_clearflag_full(int 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)
@ -2733,7 +2695,6 @@ PHP_FUNCTION(imap_clearflag_full)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_sort(int stream_id, int criteria, int reverse [, int options [, string search_criteria]]) /* {{{ proto array imap_sort(int stream_id, int criteria, int reverse [, int options [, string search_criteria]])
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)
@ -2794,7 +2755,6 @@ PHP_FUNCTION(imap_sort)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_fetchheader(int stream_id, int msg_no [, int options]) /* {{{ proto string imap_fetchheader(int 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)
@ -2838,7 +2798,6 @@ PHP_FUNCTION(imap_fetchheader)
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_uid(int stream_id, int msg_no) /* {{{ proto int imap_uid(int 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)
@ -2872,7 +2831,6 @@ PHP_FUNCTION(imap_uid)
RETURN_LONG(mail_uid(imap_le_struct->imap_stream, Z_LVAL_PP(msgno))); RETURN_LONG(mail_uid(imap_le_struct->imap_stream, Z_LVAL_PP(msgno)));
} }
/* }}} */ /* }}} */
/* {{{ proto int imap_msgno(int stream_id, int unique_msg_id) /* {{{ proto int imap_msgno(int stream_id, int unique_msg_id)
Get the sequence number associated with a UID */ Get the sequence number associated with a UID */
@ -2902,7 +2860,6 @@ PHP_FUNCTION(imap_msgno)
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_status(int stream_id, string mailbox, int options) /* {{{ proto object imap_status(int 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)
@ -2955,7 +2912,6 @@ PHP_FUNCTION(imap_status)
} }
} }
/* }}} */ /* }}} */
/* {{{ proto object imap_bodystruct(int stream_id, int msg_no, int section) /* {{{ proto object imap_bodystruct(int stream_id, int msg_no, int 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 */
@ -3077,7 +3033,6 @@ PHP_FUNCTION(imap_bodystruct)
/* }}} */ /* }}} */
/* {{{ proto array imap_fetch_overview(int stream_id, int msg_no) /* {{{ proto array imap_fetch_overview(int stream_id, int msg_no)
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)
@ -3176,7 +3131,6 @@ PHP_FUNCTION(imap_fetch_overview)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_mail_compose(array envelope, array body) /* {{{ 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)
@ -3533,6 +3487,8 @@ PHP_FUNCTION(imap_mail_compose)
#ifndef PHP_WIN32 #ifndef PHP_WIN32
/* {{{ _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
@ -3575,10 +3531,9 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
#endif #endif
return 1; return 1;
} }
/* }}} */
#endif #endif
#ifndef PHP_WIN32 #ifndef PHP_WIN32
/* {{{ proto int imap_mail(string to, string subject, string message [, string additional_headers [, string cc [, string bcc [, string rpath]]]]) /* {{{ proto int 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 */
@ -3707,7 +3662,6 @@ PHP_FUNCTION(imap_search)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_alerts(void) /* {{{ 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 */
@ -3736,7 +3690,6 @@ PHP_FUNCTION(imap_alerts)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_errors(void) /* {{{ 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 */
@ -3765,7 +3718,6 @@ PHP_FUNCTION(imap_errors)
} }
/* }}} */ /* }}} */
/* {{{ proto string imap_last_error(void) /* {{{ 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 */
@ -3793,7 +3745,6 @@ PHP_FUNCTION(imap_last_error)
} }
/* }}} */ /* }}} */
/* {{{ proto array imap_mime_header_decode(string str) /* {{{ 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)
@ -3896,6 +3847,8 @@ PHP_FUNCTION(imap_mime_header_decode)
/* Support Functions */ /* Support Functions */
/* {{{ _php_imap_parse_address
*/
void _php_imap_parse_address (ADDRESS *addresslist, char *fulladdress, zval *paddress) void _php_imap_parse_address (ADDRESS *addresslist, char *fulladdress, zval *paddress)
{ {
ADDRESS *addresstmp, *addresstmp2; ADDRESS *addresstmp, *addresstmp2;
@ -3934,7 +3887,10 @@ void _php_imap_parse_address (ADDRESS *addresslist, char *fulladdress, zval *pad
add_next_index_object(paddress, tmpvals); add_next_index_object(paddress, tmpvals);
} while ((addresstmp = addresstmp->next)); } while ((addresstmp = addresstmp->next));
} }
/* }}} */
/* {{{ _php_make_header_object
*/
void _php_make_header_object(zval *myzvalue, ENVELOPE *en) void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
{ {
zval *paddress; zval *paddress;
@ -4010,7 +3966,10 @@ void _php_make_header_object(zval *myzvalue, ENVELOPE *en)
} }
} }
/* }}} */
/* {{{ _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;
@ -4125,7 +4084,7 @@ void _php_imap_add_body(zval *arg, BODY *body)
add_assoc_object(arg, "parts", parametres); add_assoc_object(arg, "parts", parametres);
} }
} }
/* }}} */
/* Interfaces to C-client */ /* Interfaces to C-client */
void mm_searched(MAILSTREAM *stream,unsigned long number) void mm_searched(MAILSTREAM *stream,unsigned long number)
@ -4463,4 +4422,11 @@ PHP_FUNCTION (imap_thread)
} }
/* }}} */ /* }}} */
/* end IMAP_THREAD functionality */ /*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

51
ext/interbase/interbase.c
View file

@ -134,7 +134,6 @@ ZEND_DECLARE_MODULE_GLOBALS(ibase)
/* }}} */ /* }}} */
/* {{{ internal macros, functions and structures */ /* {{{ internal macros, functions and structures */
#define IB_STATUS (IBG(status)) #define IB_STATUS (IBG(status))
@ -247,7 +246,6 @@ PHP_FUNCTION(ibase_errmsg)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_error() /* {{{ _php_ibase_error()
print interbase error and save it for ibase_errmsg() */ print interbase error and save it for ibase_errmsg() */
static void _php_ibase_error(void) static void _php_ibase_error(void)
@ -266,7 +264,6 @@ static void _php_ibase_error(void)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_module_error() /* {{{ _php_ibase_module_error()
print php interbase module error and save it for ibase_errmsg() */ print php interbase module error and save it for ibase_errmsg() */
static void _php_ibase_module_error(char *msg, ...) static void _php_ibase_module_error(char *msg, ...)
@ -287,7 +284,6 @@ static void _php_ibase_module_error(char *msg, ...)
/* destructors ---------------------- */ /* destructors ---------------------- */
/* {{{ _php_ibase_free_xsqlda() */ /* {{{ _php_ibase_free_xsqlda() */
/* not actual destructor ... */ /* not actual destructor ... */
static void _php_ibase_free_xsqlda(XSQLDA *sqlda) static void _php_ibase_free_xsqlda(XSQLDA *sqlda)
@ -309,7 +305,6 @@ static void _php_ibase_free_xsqlda(XSQLDA *sqlda)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_commit_link() */ /* {{{ _php_ibase_commit_link() */
static void _php_ibase_commit_link(ibase_db_link *link) static void _php_ibase_commit_link(ibase_db_link *link)
{ {
@ -356,7 +351,6 @@ static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_close_plink() */ /* {{{ _php_ibase_close_plink() */
static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc) static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc)
{ {
@ -372,7 +366,6 @@ static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_free_result() */ /* {{{ _php_ibase_free_result() */
static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc) static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc)
{ {
@ -407,7 +400,6 @@ static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_free_query() */ /* {{{ _php_ibase_free_query() */
static void _php_ibase_free_query(ibase_query *ib_query) static void _php_ibase_free_query(ibase_query *ib_query)
{ {
@ -459,7 +451,6 @@ static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_free_trans() */ /* {{{ _php_ibase_free_trans() */
static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc) static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc)
{ {
@ -483,7 +474,6 @@ static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc)
} }
/* }}} */ /* }}} */
/* {{{ startup, shutdown and info functions */ /* {{{ startup, shutdown and info functions */
PHP_INI_BEGIN() PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("ibase.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt, allow_persistent, zend_ibase_globals, ibase_globals) STD_PHP_INI_BOOLEAN("ibase.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt, allow_persistent, zend_ibase_globals, ibase_globals)
@ -630,7 +620,6 @@ PHP_MINFO_FUNCTION(ibase)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_attach_db() */ /* {{{ _php_ibase_attach_db() */
static int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, int buffers, char *role, isc_db_handle *db) static int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, int buffers, char *role, isc_db_handle *db)
{ {
@ -692,7 +681,6 @@ static int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *c
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_connect() */ /* {{{ _php_ibase_connect() */
static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
@ -891,7 +879,6 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_connect(string database [, string username] [, string password] [, string charset] [, int buffers] [, int dialect] [, string role]) /* {{{ proto int ibase_connect(string database [, string username] [, string password] [, string charset] [, int buffers] [, int dialect] [, string role])
Open a connection to an InterBase database */ Open a connection to an InterBase database */
PHP_FUNCTION(ibase_connect) PHP_FUNCTION(ibase_connect)
@ -900,7 +887,6 @@ PHP_FUNCTION(ibase_connect)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_pconnect(string database [, string username] [, string password] [, string charset] [, int buffers] [, int dialect] [, string role]) /* {{{ proto int ibase_pconnect(string database [, string username] [, string password] [, string charset] [, int buffers] [, int dialect] [, string role])
Open a persistent connection to an InterBase database */ Open a persistent connection to an InterBase database */
PHP_FUNCTION(ibase_pconnect) PHP_FUNCTION(ibase_pconnect)
@ -909,7 +895,6 @@ PHP_FUNCTION(ibase_pconnect)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_close([int link_identifier]) /* {{{ proto int ibase_close([int link_identifier])
Close an InterBase connection */ Close an InterBase connection */
PHP_FUNCTION(ibase_close) PHP_FUNCTION(ibase_close)
@ -1039,7 +1024,6 @@ static int _php_ibase_alloc_array(ibase_array **ib_arrayp, int *array_cntp,
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_alloc_query() */ /* {{{ _php_ibase_alloc_query() */
/* allocate and prepare query */ /* allocate and prepare query */
static int _php_ibase_alloc_query(ibase_query **ib_queryp, isc_db_handle link, isc_tr_handle trans, char *query, unsigned short dialect) static int _php_ibase_alloc_query(ibase_query **ib_queryp, isc_db_handle link, isc_tr_handle trans, char *query, unsigned short dialect)
@ -1144,7 +1128,6 @@ _php_ibase_alloc_query_error:
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_bind() /* {{{ _php_ibase_bind()
Bind parameter placeholders in a previously prepared query */ Bind parameter placeholders in a previously prepared query */
static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf)
@ -1313,7 +1296,6 @@ static int _php_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_alloc_xsqlda() */ /* {{{ _php_ibase_alloc_xsqlda() */
static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda) static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda)
{ {
@ -1372,7 +1354,6 @@ static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_exec() */ /* {{{ _php_ibase_exec() */
static int _php_ibase_exec(ibase_result **ib_resultp, ibase_query *ib_query, int argc, pval **args) static int _php_ibase_exec(ibase_result **ib_resultp, ibase_query *ib_query, int argc, pval **args)
{ {
@ -1450,7 +1431,6 @@ _php_ibase_exec_error: /* I'm a bad boy... */
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_trans([int trans_args [, int link_identifier]]) /* {{{ proto int ibase_trans([int trans_args [, int link_identifier]])
Start transaction */ Start transaction */
PHP_FUNCTION(ibase_trans) PHP_FUNCTION(ibase_trans)
@ -1542,7 +1522,6 @@ PHP_FUNCTION(ibase_trans)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_def_trans() */ /* {{{ _php_ibase_def_trans() */
/* open default transaction */ /* open default transaction */
static int _php_ibase_def_trans(ibase_db_link * ib_link, int trans_n) static int _php_ibase_def_trans(ibase_db_link * ib_link, int trans_n)
@ -1559,7 +1538,6 @@ static int _php_ibase_def_trans(ibase_db_link * ib_link, int trans_n)
} }
/*}}}*/ /*}}}*/
/* {{{ _php_ibase_trans_end() */ /* {{{ _php_ibase_trans_end() */
#define COMMIT 1 #define COMMIT 1
#define ROLLBACK 0 #define ROLLBACK 0
@ -1615,7 +1593,6 @@ static void _php_ibase_trans_end(INTERNAL_FUNCTION_PARAMETERS, int commit)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_commit([int link_identifier,] int trans_number) /* {{{ proto int ibase_commit([int link_identifier,] int trans_number)
Commit transaction */ Commit transaction */
PHP_FUNCTION(ibase_commit) PHP_FUNCTION(ibase_commit)
@ -1624,7 +1601,6 @@ PHP_FUNCTION(ibase_commit)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_rollback([int link_identifier,] int trans_number) /* {{{ proto int ibase_rollback([int link_identifier,] int trans_number)
Roolback transaction */ Roolback transaction */
PHP_FUNCTION(ibase_rollback) PHP_FUNCTION(ibase_rollback)
@ -1633,7 +1609,6 @@ PHP_FUNCTION(ibase_rollback)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_query([int link_identifier,] string query [, int bind_args]) /* {{{ proto int ibase_query([int link_identifier,] string query [, int bind_args])
Execute a query */ Execute a query */
PHP_FUNCTION(ibase_query) PHP_FUNCTION(ibase_query)
@ -1716,7 +1691,6 @@ PHP_FUNCTION(ibase_query)
} }
/* }}} */ /* }}} */
/* {{{ _php_ibase_var_pval() */ /* {{{ _php_ibase_var_pval() */
static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int scale, int flag) static int _php_ibase_var_pval(pval *val, void *data, int type, int len, int scale, int flag)
{ {
@ -1899,7 +1873,7 @@ static int _php_ibase_arr_pval(pval *ar_pval, char **datap, ibase_array *ib_arra
} }
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ _php_ibase_fetch_hash() */ /* {{{ _php_ibase_fetch_hash() */
@ -2120,7 +2094,6 @@ break;
} }
/* }}} */ /* }}} */
/* {{{ proto array ibase_fetch_row(int result [, int blob_flag]) /* {{{ proto array ibase_fetch_row(int result [, int blob_flag])
Fetch a row from the results of a query */ Fetch a row from the results of a query */
PHP_FUNCTION(ibase_fetch_row) PHP_FUNCTION(ibase_fetch_row)
@ -2129,7 +2102,6 @@ PHP_FUNCTION(ibase_fetch_row)
} }
/* }}} */ /* }}} */
/* {{{ proto object ibase_fetch_object(int result [, int blob_flag]) /* {{{ proto object ibase_fetch_object(int result [, int blob_flag])
Fetch a object from the results of a query */ Fetch a object from the results of a query */
PHP_FUNCTION(ibase_fetch_object) PHP_FUNCTION(ibase_fetch_object)
@ -2138,7 +2110,6 @@ PHP_FUNCTION(ibase_fetch_object)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_free_result(int result) /* {{{ proto int ibase_free_result(int result)
Free the memory used by a result */ Free the memory used by a result */
PHP_FUNCTION(ibase_free_result) PHP_FUNCTION(ibase_free_result)
@ -2159,7 +2130,6 @@ PHP_FUNCTION(ibase_free_result)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_prepare([int link_identifier,] string query) /* {{{ proto int ibase_prepare([int link_identifier,] string query)
Prepare a query for later execution */ Prepare a query for later execution */
PHP_FUNCTION(ibase_prepare) PHP_FUNCTION(ibase_prepare)
@ -2212,7 +2182,6 @@ PHP_FUNCTION(ibase_prepare)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_execute(int query [, int bind_args [, int ...]]) /* {{{ proto int ibase_execute(int query [, int bind_args [, int ...]])
Execute a previously prepared query */ Execute a previously prepared query */
PHP_FUNCTION(ibase_execute) PHP_FUNCTION(ibase_execute)
@ -2266,7 +2235,6 @@ PHP_FUNCTION(ibase_execute)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_free_query(int query) /* {{{ proto int ibase_free_query(int query)
Free memory used by a query */ Free memory used by a query */
PHP_FUNCTION(ibase_free_query) PHP_FUNCTION(ibase_free_query)
@ -2287,7 +2255,6 @@ PHP_FUNCTION(ibase_free_query)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_timefmt(string format) /* {{{ proto int ibase_timefmt(string format)
Sets the format of timestamp, date and time columns returned from queries */ Sets the format of timestamp, date and time columns returned from queries */
PHP_FUNCTION(ibase_timefmt) PHP_FUNCTION(ibase_timefmt)
@ -2347,7 +2314,6 @@ PHP_FUNCTION(ibase_timefmt)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_num_fields(int result) /* {{{ proto int ibase_num_fields(int result)
Get the number of fields in result */ Get the number of fields in result */
PHP_FUNCTION(ibase_num_fields) PHP_FUNCTION(ibase_num_fields)
@ -2373,7 +2339,6 @@ PHP_FUNCTION(ibase_num_fields)
} }
/* }}} */ /* }}} */
/* {{{ proto array ibase_field_info(int result, int field_number) /* {{{ proto array ibase_field_info(int result, int field_number)
Get information about a field */ Get information about a field */
PHP_FUNCTION(ibase_field_info) PHP_FUNCTION(ibase_field_info)
@ -2453,10 +2418,8 @@ PHP_FUNCTION(ibase_field_info)
} }
/* }}} */ /* }}} */
/* blobs ----------------------------------- */ /* blobs ----------------------------------- */
/* {{{ _php_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) */ /* {{{ _php_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) */
static int _php_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) static int _php_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info)
{ {
@ -2513,7 +2476,6 @@ static int _php_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_inf
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_create([int link_identifier]) /* {{{ proto int ibase_blob_create([int link_identifier])
Create blob for adding data */ Create blob for adding data */
PHP_FUNCTION(ibase_blob_create) PHP_FUNCTION(ibase_blob_create)
@ -2562,7 +2524,6 @@ PHP_FUNCTION(ibase_blob_create)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_open(string blob_id) /* {{{ proto int ibase_blob_open(string blob_id)
Open blob for retriving data parts */ Open blob for retriving data parts */
PHP_FUNCTION(ibase_blob_open) PHP_FUNCTION(ibase_blob_open)
@ -2600,7 +2561,6 @@ PHP_FUNCTION(ibase_blob_open)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_add(int blob_id, string data) /* {{{ proto int ibase_blob_add(int blob_id, string data)
Add data into created blob */ Add data into created blob */
PHP_FUNCTION(ibase_blob_add) PHP_FUNCTION(ibase_blob_add)
@ -2627,7 +2587,6 @@ PHP_FUNCTION(ibase_blob_add)
} }
/* }}} */ /* }}} */
/* {{{ proto string ibase_blob_get(int blob_id, int len) /* {{{ proto string ibase_blob_get(int blob_id, int len)
Get len bytes data from open blob */ Get len bytes data from open blob */
PHP_FUNCTION(ibase_blob_get) PHP_FUNCTION(ibase_blob_get)
@ -2677,7 +2636,6 @@ PHP_FUNCTION(ibase_blob_get)
} }
/* }}} */ /* }}} */
#define BLOB_CLOSE 1 #define BLOB_CLOSE 1
#define BLOB_CANCEL 2 #define BLOB_CANCEL 2
@ -2719,7 +2677,6 @@ static void _php_ibase_blob_end(INTERNAL_FUNCTION_PARAMETERS, int bl_end)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_close(int blob_id) /* {{{ proto int ibase_blob_close(int blob_id)
Close blob */ Close blob */
PHP_FUNCTION(ibase_blob_close) PHP_FUNCTION(ibase_blob_close)
@ -2728,7 +2685,6 @@ PHP_FUNCTION(ibase_blob_close)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_cancel(int blob_id) /* {{{ proto int ibase_blob_cancel(int blob_id)
Cancel creating blob */ Cancel creating blob */
PHP_FUNCTION(ibase_blob_cancel) PHP_FUNCTION(ibase_blob_cancel)
@ -2737,7 +2693,6 @@ PHP_FUNCTION(ibase_blob_cancel)
} }
/* }}} */ /* }}} */
/* {{{ proto object ibase_blob_info(string blob_id_str) /* {{{ proto object ibase_blob_info(string blob_id_str)
Return blob length and other useful info */ Return blob length and other useful info */
PHP_FUNCTION(ibase_blob_info) PHP_FUNCTION(ibase_blob_info)
@ -2812,7 +2767,6 @@ PHP_FUNCTION(ibase_blob_info)
} }
/* }}} */ /* }}} */
/* {{{ proto int ibase_blob_echo(string blob_id_str) /* {{{ proto int ibase_blob_echo(string blob_id_str)
Output blob contents to browser */ Output blob contents to browser */
PHP_FUNCTION(ibase_blob_echo) PHP_FUNCTION(ibase_blob_echo)
@ -2971,5 +2925,6 @@ PHP_FUNCTION(ibase_blob_import)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/ldap/ldap.c
View file

@ -1991,5 +1991,6 @@ PHP_FUNCTION(ldap_8859_to_t61) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

4
ext/mailparse/mailparse.c
View file

@ -760,7 +760,6 @@ PHP_FUNCTION(mailparse_msg_get_part_data)
} }
/* }}} */ /* }}} */
/* {{{ proto long mailparse_msg_get_part(resource rfc2045, string mimesection) /* {{{ proto long mailparse_msg_get_part(resource rfc2045, string mimesection)
Return a handle on a given section in a mimemessage Return a handle on a given section in a mimemessage
*/ */
@ -796,5 +795,6 @@ PHP_FUNCTION(mailparse_msg_get_part)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: tw=78 ts=4 sw=4 * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

10
ext/mailparse/rfc2045.c
View file

@ -1163,6 +1163,12 @@ unsigned rfc2045_mimepartcount(const struct rfc2045 *p)
for (q=p->firstpart; q; q=q->next) ++n; for (q=p->firstpart; q; q=q->next) ++n;
return (n); return (n);
} }
/* /*
* vim:tw=78 sw=4 ts=4 * Local variables:
* */ * tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/mailparse/rfc2045appendurl.c
View file

@ -33,6 +33,8 @@
** --------------------------------------------------------------------- ** ---------------------------------------------------------------------
*/ */
/* {{{ get_method_path
*/
static void get_method_path(const char *p, static void get_method_path(const char *p,
const char **method, const char **method,
unsigned *methodl, unsigned *methodl,
@ -58,7 +60,10 @@ static void get_method_path(const char *p,
*methodl=0; *methodl=0;
*path=p; *path=p;
} }
/* }}} */
/* {{{ rfc2045_append_url
*/
char *rfc2045_append_url(const char *base, const char *loc) char *rfc2045_append_url(const char *base, const char *loc)
{ {
const char *base_method; const char *base_method;
@ -115,6 +120,7 @@ char *rfc2045_append_url(const char *base, const char *loc)
return (buf); return (buf);
} }
/* }}} */
char *rfc2045_content_base(struct rfc2045 *p) char *rfc2045_content_base(struct rfc2045 *p)
{ {
@ -126,5 +132,6 @@ char *rfc2045_content_base(struct rfc2045 *p)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: tw=78 ts=4 sw=4 * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

21
ext/mcrypt/mcrypt.c
View file

@ -1341,7 +1341,7 @@ PHP_FUNCTION(mcrypt_encrypt)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_ENCRYPT, return_value);
} }
/* }}} */
/* {{{ proto string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv) /* {{{ proto string mcrypt_decrypt(string cipher, string key, string data, string mode, string iv)
OFB crypt/decrypt data using key key with cipher cipher starting with iv */ OFB crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1359,7 +1359,7 @@ PHP_FUNCTION(mcrypt_decrypt)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, Z_STRVAL_PP(mode), iv, argc, MCRYPT_DECRYPT, return_value);
} }
/* }}} */
/* {{{ proto string mcrypt_ecb(int cipher, string key, string data, int mode, string iv) /* {{{ proto string mcrypt_ecb(int cipher, string key, string data, int mode, string iv)
ECB crypt/decrypt data using key key with cipher cipher starting with iv */ ECB crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1378,7 +1378,7 @@ PHP_FUNCTION(mcrypt_ecb)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ecb", iv, argc, Z_LVAL_PP(mode), return_value);
} }
/* }}} */
/* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode, string iv) /* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode, string iv)
CBC crypt/decrypt data using key key with cipher cipher starting with iv */ CBC crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1397,7 +1397,7 @@ PHP_FUNCTION(mcrypt_cbc)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cbc", iv, argc, Z_LVAL_PP(mode), return_value);
} }
/* }}} */
/* {{{ proto string mcrypt_cfb(int cipher, string key, string data, int mode, string iv) /* {{{ proto string mcrypt_cfb(int cipher, string key, string data, int mode, string iv)
CFB crypt/decrypt data using key key with cipher cipher starting with iv */ CFB crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1416,7 +1416,7 @@ PHP_FUNCTION(mcrypt_cfb)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "cfb", iv, argc, Z_LVAL_PP(mode), return_value);
} }
/* }}} */
/* {{{ proto string mcrypt_ofb(int cipher, string key, string data, int mode, string iv) /* {{{ proto string mcrypt_ofb(int cipher, string key, string data, int mode, string iv)
OFB crypt/decrypt data using key key with cipher cipher starting with iv */ OFB crypt/decrypt data using key key with cipher cipher starting with iv */
@ -1435,6 +1435,7 @@ PHP_FUNCTION(mcrypt_ofb)
php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value); php_mcrypt_do_crypt (Z_STRVAL_PP(cipher), key, data, "ofb", iv, argc, Z_LVAL_PP(mode), return_value);
} }
/* }}} */
#endif #endif
@ -1597,7 +1598,6 @@ PHP_FUNCTION(mcrypt_cfb)
} }
/* }}} */ /* }}} */
/* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode [, string iv]) /* {{{ proto string mcrypt_cbc(int cipher, string key, string data, int mode [, string iv])
CBC crypt/decrypt data using key key with cipher cipher using optional iv */ CBC crypt/decrypt data using key key with cipher cipher using optional iv */
PHP_FUNCTION(mcrypt_cbc) PHP_FUNCTION(mcrypt_cbc)
@ -1652,3 +1652,12 @@ PHP_FUNCTION(mcrypt_ecb)
#endif /* MCRYPT_2_2 */ #endif /* MCRYPT_2_2 */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

11
ext/mhash/mhash.c
View file

@ -266,8 +266,15 @@ PHP_FUNCTION(mhash_keygen_s2k)
RETURN_FALSE; RETURN_FALSE;
} }
} }
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

9
ext/ming/ming.c
View file

@ -3035,3 +3035,12 @@ PHP_MINIT_FUNCTION(ming)
/* }}} */ /* }}} */
#endif #endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

32
ext/mnogosearch/php_mnogo.c
View file

@ -15,7 +15,7 @@
| obtain it through the world-wide-web, please send a note to | | obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. | | license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: | | Authors: |
| Initial version by Alex Barkov <bar@izhcom.ru> | | Initial version by Alex Barkov <bar@izhcom.ru> |
| and Ramil Kalimullin <ram@izhcom.ru> | | and Ramil Kalimullin <ram@izhcom.ru> |
| Further development by Sergey Kartashoff <gluke@biosys.net> | | Further development by Sergey Kartashoff <gluke@biosys.net> |
@ -108,6 +108,8 @@ static int le_link,le_res;
#include <udm_config.h> #include <udm_config.h>
#include <udmsearch.h> #include <udmsearch.h>
/* {{{ mnogosearch_functions[]
*/
function_entry mnogosearch_functions[] = { function_entry mnogosearch_functions[] = {
PHP_FE(udm_api_version, NULL) PHP_FE(udm_api_version, NULL)
@ -139,7 +141,7 @@ function_entry mnogosearch_functions[] = {
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
zend_module_entry mnogosearch_module_entry = { zend_module_entry mnogosearch_module_entry = {
"mnogosearch", "mnogosearch",
@ -168,6 +170,8 @@ static void _free_udm_res(zend_rsrc_list_entry *rsrc){
UdmFreeResult(Res); UdmFreeResult(Res);
} }
/* {{{ PHP_MINIT_FUNCTION
*/
DLEXPORT PHP_MINIT_FUNCTION(mnogosearch) DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
{ {
UdmInit(); UdmInit();
@ -288,7 +292,7 @@ DLEXPORT PHP_MINIT_FUNCTION(mnogosearch)
return SUCCESS; return SUCCESS;
} }
/* }}} */
DLEXPORT PHP_MSHUTDOWN_FUNCTION(mnogosearch) DLEXPORT PHP_MSHUTDOWN_FUNCTION(mnogosearch)
{ {
@ -373,7 +377,6 @@ DLEXPORT PHP_FUNCTION(udm_alloc_agent)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_set_agent_param(int agent, int var, string val) /* {{{ proto int udm_set_agent_param(int agent, int var, string val)
Set mnoGoSearch agent session parameters */ Set mnoGoSearch agent session parameters */
DLEXPORT PHP_FUNCTION(udm_set_agent_param) DLEXPORT PHP_FUNCTION(udm_set_agent_param)
@ -606,7 +609,6 @@ DLEXPORT PHP_FUNCTION(udm_set_agent_param)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_load_ispell_data(int agent, int var, string val1, string val2, int flag) /* {{{ proto int udm_load_ispell_data(int agent, int var, string val1, string val2, int flag)
Load ispell data */ Load ispell data */
DLEXPORT PHP_FUNCTION(udm_load_ispell_data) DLEXPORT PHP_FUNCTION(udm_load_ispell_data)
@ -707,7 +709,6 @@ DLEXPORT PHP_FUNCTION(udm_load_ispell_data)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_free_ispell_data(int agent) /* {{{ proto int udm_free_ispell_data(int agent)
Free memory allocated for ispell data */ Free memory allocated for ispell data */
DLEXPORT PHP_FUNCTION(udm_free_ispell_data) DLEXPORT PHP_FUNCTION(udm_free_ispell_data)
@ -735,7 +736,6 @@ DLEXPORT PHP_FUNCTION(udm_free_ispell_data)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_add_search_limit(int agent, int var, string val) /* {{{ proto int udm_add_search_limit(int agent, int var, string val)
Add mnoGoSearch search restrictions */ Add mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_add_search_limit) DLEXPORT PHP_FUNCTION(udm_add_search_limit)
@ -811,7 +811,6 @@ DLEXPORT PHP_FUNCTION(udm_add_search_limit)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_clear_search_limits(int agent) /* {{{ proto int udm_clear_search_limits(int agent)
Clear all mnoGoSearch search restrictions */ Clear all mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_clear_search_limits) DLEXPORT PHP_FUNCTION(udm_clear_search_limits)
@ -837,7 +836,6 @@ DLEXPORT PHP_FUNCTION(udm_clear_search_limits)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_find(int agent, string query) /* {{{ proto int udm_find(int agent, string query)
Perform search */ Perform search */
DLEXPORT PHP_FUNCTION(udm_find) DLEXPORT PHP_FUNCTION(udm_find)
@ -869,7 +867,6 @@ DLEXPORT PHP_FUNCTION(udm_find)
} }
/* }}} */ /* }}} */
/* {{{ proto string udm_get_res_field(int res, int row, int field) /* {{{ proto string udm_get_res_field(int res, int row, int field)
Fetch mnoGoSearch result field */ Fetch mnoGoSearch result field */
DLEXPORT PHP_FUNCTION(udm_get_res_field){ DLEXPORT PHP_FUNCTION(udm_get_res_field){
@ -960,7 +957,6 @@ DLEXPORT PHP_FUNCTION(udm_get_res_field){
} }
/* }}} */ /* }}} */
/* {{{ proto string udm_get_res_param(int res, int param) /* {{{ proto string udm_get_res_param(int res, int param)
Get mnoGoSearch result parameters */ Get mnoGoSearch result parameters */
DLEXPORT PHP_FUNCTION(udm_get_res_param) DLEXPORT PHP_FUNCTION(udm_get_res_param)
@ -1015,7 +1011,6 @@ DLEXPORT PHP_FUNCTION(udm_get_res_param)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_free_res(int res) /* {{{ proto int udm_free_res(int res)
mnoGoSearch free result */ mnoGoSearch free result */
DLEXPORT PHP_FUNCTION(udm_free_res) DLEXPORT PHP_FUNCTION(udm_free_res)
@ -1040,7 +1035,6 @@ DLEXPORT PHP_FUNCTION(udm_free_res)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_free_agent(int agent) /* {{{ proto int udm_free_agent(int agent)
Free mnoGoSearch session */ Free mnoGoSearch session */
DLEXPORT PHP_FUNCTION(udm_free_agent) DLEXPORT PHP_FUNCTION(udm_free_agent)
@ -1065,7 +1059,6 @@ DLEXPORT PHP_FUNCTION(udm_free_agent)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_errno(int agent) /* {{{ proto int udm_errno(int agent)
Get mnoGoSearch error number */ Get mnoGoSearch error number */
DLEXPORT PHP_FUNCTION(udm_errno) DLEXPORT PHP_FUNCTION(udm_errno)
@ -1088,7 +1081,6 @@ DLEXPORT PHP_FUNCTION(udm_errno)
} }
/* }}} */ /* }}} */
/* {{{ proto string udm_error(int agent) /* {{{ proto string udm_error(int agent)
Get mnoGoSearch error message */ Get mnoGoSearch error message */
DLEXPORT PHP_FUNCTION(udm_error) DLEXPORT PHP_FUNCTION(udm_error)
@ -1112,7 +1104,6 @@ DLEXPORT PHP_FUNCTION(udm_error)
} }
/* }}} */ /* }}} */
/* {{{ proto int udm_api_version() /* {{{ proto int udm_api_version()
Get mnoGoSearch API version */ Get mnoGoSearch API version */
DLEXPORT PHP_FUNCTION(udm_api_version) DLEXPORT PHP_FUNCTION(udm_api_version)
@ -1121,7 +1112,6 @@ DLEXPORT PHP_FUNCTION(udm_api_version)
} }
/* }}} */ /* }}} */
/* {{{ proto array udm_cat_list(int agent, string category) /* {{{ proto array udm_cat_list(int agent, string category)
Get mnoGoSearch categories list with the same root */ Get mnoGoSearch categories list with the same root */
DLEXPORT PHP_FUNCTION(udm_cat_list) DLEXPORT PHP_FUNCTION(udm_cat_list)
@ -1171,7 +1161,6 @@ DLEXPORT PHP_FUNCTION(udm_cat_list)
} }
/* }}} */ /* }}} */
/* {{{ proto array udm_cat_path(int agent, string category) /* {{{ proto array udm_cat_path(int agent, string category)
Get mnoGoSearch categories path from the root to the given catgory */ Get mnoGoSearch categories path from the root to the given catgory */
DLEXPORT PHP_FUNCTION(udm_cat_path) DLEXPORT PHP_FUNCTION(udm_cat_path)
@ -1221,7 +1210,6 @@ DLEXPORT PHP_FUNCTION(udm_cat_path)
} }
/* }}} */ /* }}} */
#if UDM_VERSION_ID > 30110 #if UDM_VERSION_ID > 30110
/* {{{ proto int udm_get_doc_count(int agent) /* {{{ proto int udm_get_doc_count(int agent)
Get total number of documents in database */ Get total number of documents in database */
@ -1251,9 +1239,11 @@ DLEXPORT PHP_FUNCTION(udm_get_doc_count)
#endif #endif
/* /*
* Local variables: * Local variables:
* tab-width: 4
* c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/msql/php_msql.c
View file

@ -1318,5 +1318,6 @@ PHP_FUNCTION(msql_affected_rows)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

1
ext/muscat/EXPERIMENTAL Normal file
View file

@ -0,0 +1 @@
This extension cannot be distributed with PHP - It is GPL'ed

2
ext/mysql/php_mysql.c
View file

@ -2061,4 +2061,6 @@ PHP_FUNCTION(mysql_free_result)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

7
ext/oci8/oci8.c
View file

@ -4239,6 +4239,7 @@ PHP_FUNCTION(ocistatementtype)
RETVAL_STRING("UNKNOWN",1); RETVAL_STRING("UNKNOWN",1);
} }
} }
/* }}} */
/* {{{ proto int ocirowcount(int stmt) /* {{{ proto int ocirowcount(int stmt)
Return the row count of an OCI statement */ Return the row count of an OCI statement */
@ -4290,8 +4291,7 @@ static oci_collection *oci_get_coll(int ind)
return (oci_collection *) NULL; return (oci_collection *) NULL;
} }
} }
/* }}} */
/* {{{ proto string ocifreecollection(object lob) /* {{{ proto string ocifreecollection(object lob)
Deletes collection object*/ Deletes collection object*/
@ -4922,5 +4922,6 @@ PHP_FUNCTION(ocinewcollection)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/odbc/php_odbc.c
View file

@ -3519,5 +3519,6 @@ PHP_FUNCTION(odbc_tableprivileges)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/openssl/openssl.c
View file

@ -1874,5 +1874,6 @@ static void _php_x509_free(zend_rsrc_list_entry *rsrc)
* tab-width: 8 * tab-width: 8
* c-basic-offset: 8 * c-basic-offset: 8
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

68
ext/oracle/oracle.c
View file

@ -20,6 +20,8 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Id$ */
/* comment out the next line if you're on Oracle 7.x and don't have the olog /* comment out the next line if you're on Oracle 7.x and don't have the olog
call. */ call. */
@ -78,6 +80,8 @@ void ora_do_logon(INTERNAL_FUNCTION_PARAMETERS, int persistent);
static int le_conn, le_pconn, le_cursor; static int le_conn, le_pconn, le_cursor;
/* {{{ prototypes
*/
PHP_FUNCTION(ora_bind); PHP_FUNCTION(ora_bind);
PHP_FUNCTION(ora_close); PHP_FUNCTION(ora_close);
PHP_FUNCTION(ora_commit); PHP_FUNCTION(ora_commit);
@ -107,7 +111,10 @@ PHP_RINIT_FUNCTION(oracle);
PHP_MSHUTDOWN_FUNCTION(oracle); PHP_MSHUTDOWN_FUNCTION(oracle);
PHP_RSHUTDOWN_FUNCTION(oracle); PHP_RSHUTDOWN_FUNCTION(oracle);
PHP_MINFO_FUNCTION(oracle); PHP_MINFO_FUNCTION(oracle);
/* }}} */
/* {{{ oracle_functions[]
*/
function_entry oracle_functions[] = { function_entry oracle_functions[] = {
PHP_FE(ora_bind, NULL) PHP_FE(ora_bind, NULL)
PHP_FE(ora_close, NULL) PHP_FE(ora_close, NULL)
@ -134,7 +141,10 @@ function_entry oracle_functions[] = {
PHP_FE(ora_rollback, NULL) PHP_FE(ora_rollback, NULL)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
/* {{{ oracle_module_entry
*/
zend_module_entry oracle_module_entry = { zend_module_entry oracle_module_entry = {
"oracle", "oracle",
oracle_functions, oracle_functions,
@ -145,7 +155,10 @@ zend_module_entry oracle_module_entry = {
PHP_MINFO(oracle), PHP_MINFO(oracle),
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
/* }}} */
/* {{{ ora_func_tab[]
*/
static const text *ora_func_tab[] = static const text *ora_func_tab[] =
{(text *) "unused", {(text *) "unused",
/* 1, 2 */ (text *) "unused", (text *) "OSQL", /* 1, 2 */ (text *) "unused", (text *) "OSQL",
@ -180,11 +193,14 @@ static const text *ora_func_tab[] =
/* 59, 60 */ (text *) "unused", (text *) "ODESCR", /* 59, 60 */ (text *) "unused", (text *) "ODESCR",
/* 61, 62 */ (text *) "unused", (text *) "OBNDRA" /* 61, 62 */ (text *) "unused", (text *) "OBNDRA"
}; };
/* }}} */
#ifdef COMPILE_DL_ORACLE #ifdef COMPILE_DL_ORACLE
ZEND_GET_MODULE(oracle) ZEND_GET_MODULE(oracle)
#endif #endif
/* {{{ _close_oraconn
*/
static int _close_oraconn(zend_rsrc_list_entry *rsrc) static int _close_oraconn(zend_rsrc_list_entry *rsrc)
{ {
oraConnection *conn = (oraConnection *)rsrc->ptr; oraConnection *conn = (oraConnection *)rsrc->ptr;
@ -206,7 +222,10 @@ static int _close_oraconn(zend_rsrc_list_entry *rsrc)
return 1; return 1;
} }
/* }}} */
/* {{{ pval_ora_param_destructor
*/
static void static void
pval_ora_param_destructor(oraParam *param) pval_ora_param_destructor(oraParam *param)
{ {
@ -214,8 +233,10 @@ pval_ora_param_destructor(oraParam *param)
efree(param->progv); efree(param->progv);
} }
} }
/* }}} */
/* {{{ _close_oracur
*/
static int _close_oracur(oraCursor *cur) static int _close_oracur(oraCursor *cur)
{ {
int i; int i;
@ -252,13 +273,19 @@ static int _close_oracur(oraCursor *cur)
return 1; return 1;
} }
/* }}} */
/* {{{ php_close_ora_cursor
*/
static void php_close_ora_cursor(zend_rsrc_list_entry *rsrc) static void php_close_ora_cursor(zend_rsrc_list_entry *rsrc)
{ {
oraCursor *cur = (oraCursor *)rsrc->ptr; oraCursor *cur = (oraCursor *)rsrc->ptr;
_close_oracur(cur); _close_oracur(cur);
} }
/* }}} */
/* {{{ php_ora_init_globals
*/
static void php_ora_init_globals(ORALS_D) static void php_ora_init_globals(ORALS_D)
{ {
if (cfg_get_long("oracle.allow_persistent", if (cfg_get_long("oracle.allow_persistent",
@ -284,7 +311,10 @@ static void php_ora_init_globals(ORALS_D)
memset((void*) &ORA(db_err_conn),0,sizeof(ORA(db_err_conn))); memset((void*) &ORA(db_err_conn),0,sizeof(ORA(db_err_conn)));
} }
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(oracle) PHP_MINIT_FUNCTION(oracle)
{ {
@ -311,7 +341,10 @@ PHP_MINIT_FUNCTION(oracle)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_RINIT_FUNCTION
*/
PHP_RINIT_FUNCTION(oracle) PHP_RINIT_FUNCTION(oracle)
{ {
ORALS_FETCH(); ORALS_FETCH();
@ -325,8 +358,10 @@ PHP_RINIT_FUNCTION(oracle)
*/ */
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
PHP_MSHUTDOWN_FUNCTION(oracle) PHP_MSHUTDOWN_FUNCTION(oracle)
{ {
ORALS_FETCH(); ORALS_FETCH();
@ -336,13 +371,18 @@ PHP_MSHUTDOWN_FUNCTION(oracle)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION
*/
PHP_RSHUTDOWN_FUNCTION(oracle) PHP_RSHUTDOWN_FUNCTION(oracle)
{ {
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ _ora_ping
*/
static int _ora_ping(oraConnection *conn) static int _ora_ping(oraConnection *conn)
{ {
Cda_Def cda; Cda_Def cda;
@ -360,6 +400,7 @@ static int _ora_ping(oraConnection *conn)
return 1; return 1;
} }
/* }}} */
/* /*
** PHP functions ** PHP functions
@ -381,6 +422,8 @@ PHP_FUNCTION(ora_plogon)
} }
/* }}} */ /* }}} */
/* {{{ ora_do_logon
*/
void ora_do_logon(INTERNAL_FUNCTION_PARAMETERS, int persistent) void ora_do_logon(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
char *user,*passwd; char *user,*passwd;
@ -553,6 +596,7 @@ void ora_do_logon(INTERNAL_FUNCTION_PARAMETERS, int persistent)
efree(hashed_details); efree(hashed_details);
} }
/* }}} */
/* {{{ proto int ora_logoff(int connection) /* {{{ proto int ora_logoff(int connection)
Close an Oracle connection */ Close an Oracle connection */
@ -1528,6 +1572,8 @@ PHP_FUNCTION(ora_errorcode)
} }
/* }}} */ /* }}} */
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(oracle) PHP_MINFO_FUNCTION(oracle)
{ {
@ -1540,12 +1586,14 @@ PHP_MINFO_FUNCTION(oracle)
#endif #endif
php_info_print_table_end(); php_info_print_table_end();
} }
/* }}} */
/* /*
** Functions internal to this module. ** Functions internal to this module.
*/ */
/* {{{ ora_get_cursor
*/
static oraCursor * static oraCursor *
ora_get_cursor(HashTable *list, pval **ind) ora_get_cursor(HashTable *list, pval **ind)
{ {
@ -1565,7 +1613,10 @@ ora_get_cursor(HashTable *list, pval **ind)
return cursor; return cursor;
} }
/* }}} */
/* {{{ ora_error
*/
static char * static char *
ora_error(Cda_Def * cda) ora_error(Cda_Def * cda)
{ {
@ -1586,7 +1637,10 @@ ora_error(Cda_Def * cda)
} }
return (char *) errmsg; return (char *) errmsg;
} }
/* }}} */
/* {{{ ora_describe_define
*/
static sword static sword
ora_describe_define(oraCursor * cursor) ora_describe_define(oraCursor * cursor)
{ {
@ -1677,7 +1731,10 @@ ora_describe_define(oraCursor * cursor)
} }
return 1; return 1;
} }
/* }}} */
/* {{{ ora_set_param_values
*/
int ora_set_param_values(oraCursor *cursor, int isout) int ora_set_param_values(oraCursor *cursor, int isout)
{ {
char *paramname; char *paramname;
@ -1732,6 +1789,7 @@ int ora_set_param_values(oraCursor *cursor, int isout)
return 1; return 1;
} }
/* }}} */
#endif /* HAVE_ORACLE */ #endif /* HAVE_ORACLE */
@ -1740,4 +1798,6 @@ int ora_set_param_values(oraCursor *cursor, int isout)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

21
ext/ovrimos/ovrimos.c
View file

@ -5,11 +5,11 @@
| Copyright (c) 1997-2001 The PHP Group | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, | | This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at | | available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. | | http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to | | If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to | | obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. | | license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Dimitris Souflis <dsouflis@acm.org>, <dsouflis@ovrimos.com> | | Authors: Dimitris Souflis <dsouflis@acm.org>, <dsouflis@ovrimos.com> |
@ -17,6 +17,8 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Id$ */
#include <php.h> #include <php.h>
#include <php_globals.h> #include <php_globals.h>
#include <zend_API.h> #include <zend_API.h>
@ -319,6 +321,8 @@ PHP_FUNCTION(ovrimos_exec)
/* }}} */ /* }}} */
/* {{{ column_to_string
*/
static void column_to_string(SQLS stmt, int i, char *buffer, int *len) static void column_to_string(SQLS stmt, int i, char *buffer, int *len)
{ {
const char *bf = sqlColValue(stmt, i, 0); const char *bf = sqlColValue(stmt, i, 0);
@ -446,6 +450,7 @@ static void column_to_string(SQLS stmt, int i, char *buffer, int *len)
break; break;
} }
} }
/* }}} */
/* {{{ proto int ovrimos_fetch_into(int result_id, array result_array [, string how, [int rownumber]]) /* {{{ proto int ovrimos_fetch_into(int result_id, array result_array [, string how, [int rownumber]])
Fetch one result row into an array Fetch one result row into an array
@ -1039,6 +1044,8 @@ PHP_FUNCTION(ovrimos_setoption)
/* }}} */ /* }}} */
#endif #endif
/* {{{ ovrimos_functions[]
*/
function_entry ovrimos_functions[] = { function_entry ovrimos_functions[] = {
/* PHP_FE(ovrimos_setoption, NULL)*/ /* PHP_FE(ovrimos_setoption, NULL)*/
/* PHP_FE(ovrimos_autocommit, NULL)*/ /* PHP_FE(ovrimos_autocommit, NULL)*/
@ -1066,6 +1073,7 @@ function_entry ovrimos_functions[] = {
PHP_FE(ovrimos_longreadlen, NULL) PHP_FE(ovrimos_longreadlen, NULL)
PHP_FALIAS(ovrimos_do, ovrimos_exec, NULL) {NULL, NULL, NULL} PHP_FALIAS(ovrimos_do, ovrimos_exec, NULL) {NULL, NULL, NULL}
}; };
/* }}} */
zend_module_entry ovrimos_module_entry = { zend_module_entry ovrimos_module_entry = {
"Ovrimos", "Ovrimos",
@ -1082,3 +1090,12 @@ DLEXPORT zend_module_entry *get_module()
{ {
return &ovrimos_module_entry; return &ovrimos_module_entry;
}; };
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

3
ext/pcre/php_pcre.c
View file

@ -1413,5 +1413,6 @@ ZEND_GET_MODULE(pcre)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/pfpro/pfpro.c
View file

@ -599,5 +599,6 @@ PHP_FUNCTION(pfpro_process)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

2
ext/pgsql/pgsql.c
View file

@ -1957,4 +1957,6 @@ PHP_FUNCTION(pg_client_encoding)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

32
ext/posix/posix.c
View file

@ -1,27 +1,16 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 | | PHP version 4.0 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-1999 PHP Development Team (See Credits file) | | Copyright (c) 1997-2001 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify | | This source file is subject to version 2.02 of the PHP license, |
| it under the terms of one of the following licenses: | | that is bundled with this package in the file LICENSE, and is |
| | | available at through the world-wide-web at |
| A) the GNU General Public License as published by the Free Software | | http://www.php.net/license/2_02.txt. |
| Foundation; either version 2 of the License, or (at your option) | | If you did not receive a copy of the PHP license and are unable to |
| any later version. | | obtain it through the world-wide-web, please send a note to |
| | | license@php.net so we can mail you a copy immediately. |
| B) the PHP License as published by the PHP Development Team and |
| included in the distribution in the file: LICENSE |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU General Public License for more details. |
| |
| You should have received a copy of both licenses referred to here. |
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Kristian Koehntopp <kris@koehntopp.de> | | Authors: Kristian Koehntopp <kris@koehntopp.de> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -968,5 +957,6 @@ PHP_FUNCTION(posix_getrlimit)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/pspell/pspell.c
View file

@ -800,5 +800,6 @@ PHP_MINFO_FUNCTION(pspell)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

62
ext/qtdom/qtdom.c
View file

@ -13,13 +13,11 @@
| license@php.net so we can mail you a copy immediately. | | license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: | | Authors: |
| |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* You should tweak config.m4 so this symbol (or some else suitable) /* $Id$ */
gets defined.
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -59,8 +57,8 @@ zend_module_entry qtdom_module_entry = {
qtdom_functions, qtdom_functions,
PHP_MINIT(qtdom), PHP_MINIT(qtdom),
PHP_MSHUTDOWN(qtdom), PHP_MSHUTDOWN(qtdom),
PHP_RINIT(qtdom), /* Replace with NULL if there's nothing to do at request start */ NULL,
PHP_RSHUTDOWN(qtdom), /* Replace with NULL if there's nothing to do at request end */ NULL,
PHP_MINFO(qtdom), PHP_MINFO(qtdom),
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
@ -69,11 +67,8 @@ zend_module_entry qtdom_module_entry = {
ZEND_GET_MODULE(qtdom) ZEND_GET_MODULE(qtdom)
#endif #endif
/* Remove comments and fill if you need to have entries in php.ini /* {{{ PHP_MINIT_FUNCTION
PHP_INI_BEGIN() */
PHP_INI_END()
*/
PHP_MINIT_FUNCTION(qtdom) PHP_MINIT_FUNCTION(qtdom)
{ {
/* Remove comments if you have entries in php.ini /* Remove comments if you have entries in php.ini
@ -92,47 +87,31 @@ PHP_MINIT_FUNCTION(qtdom)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
PHP_MSHUTDOWN_FUNCTION(qtdom) PHP_MSHUTDOWN_FUNCTION(qtdom)
{ {
/* Remove comments if you have entries in php.ini
UNREGISTER_INI_ENTRIES();
*/
qdom_shutdown(); qdom_shutdown();
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* Remove if there's nothing to do at request start */ /* {{{ PHP_MINFO_FUNCTION
PHP_RINIT_FUNCTION(qtdom) */
{
return SUCCESS;
}
/* Remove if there's nothing to do at request end */
PHP_RSHUTDOWN_FUNCTION(qtdom)
{
return SUCCESS;
}
PHP_MINFO_FUNCTION(qtdom) PHP_MINFO_FUNCTION(qtdom)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_header(2, "qtdom support", "enabled"); php_info_print_table_header(2, "qtdom support", "enabled");
php_info_print_table_end(); php_info_print_table_end();
/* Remove comments if you have entries in php.ini
DISPLAY_INI_ENTRIES();
*/
} }
/* }}} */
/* Remove the following function when you have succesfully modified config.m4 /* {{{ qdom_find_attributes
so that your module can be compiled into PHP, it exists only for testing * Helper function for creating the attributes, returns the number
purposes. */ * of attributes found or -1 if an error occured */
/* Helper function for creating the attributes, returns the number of attributes found
or -1 if an error occured */
int qdom_find_attributes( zval **children, struct qdom_attribute *attr ) int qdom_find_attributes( zval **children, struct qdom_attribute *attr )
{ {
zval *child; zval *child;
@ -161,11 +140,12 @@ int qdom_find_attributes( zval **children, struct qdom_attribute *attr )
return count; return count;
} }
/* }}} */
/* Helper function for recursively going trough the QDomNode tree and creating /* {{{ qdom_find_children
Helper function for recursively going trough the QDomNode tree and creating
the same in PHP objects. Returns the number of children or -1 if an error the same in PHP objects. Returns the number of children or -1 if an error
occured. */ occured. */
int qdom_find_children( zval **children, struct qdom_node *orig_node ) int qdom_find_children( zval **children, struct qdom_node *orig_node )
{ {
zval *child; zval *child;
@ -230,6 +210,7 @@ int qdom_find_children( zval **children, struct qdom_node *orig_node )
qdom_do_node_free( tmp_node ); qdom_do_node_free( tmp_node );
return count; return count;
} }
/* }}} */
/* {{{ proto object qdom_tree( string ) /* {{{ proto object qdom_tree( string )
creates a tree of an xml string */ creates a tree of an xml string */
@ -288,10 +269,11 @@ PHP_FUNCTION(qdom_error)
#endif /* HAVE_QTDOM */ #endif /* HAVE_QTDOM */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/shmop/shmop.c
View file

@ -348,5 +348,6 @@ PHP_FUNCTION(shmop_delete)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/skeleton/skeleton.c
View file

@ -143,5 +143,6 @@ PHP_FUNCTION(confirm_extname_compiled)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/snmp/snmp.c
View file

@ -410,5 +410,6 @@ PHP_FUNCTION(snmpset) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/snmp/winsnmp.c
View file

@ -238,5 +238,6 @@ DLEXPORT void php3_snmpwalk(INTERNAL_FUNCTION_PARAMETERS) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

20
ext/sockets/sockets.c
View file

@ -103,7 +103,8 @@ static unsigned char second_fifth_and_sixth_args_force_ref[] =
static unsigned char third_through_seventh_args_force_ref[] = static unsigned char third_through_seventh_args_force_ref[] =
{7, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; {7, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE};
/* {{{ sockets_functions[]
*/
function_entry sockets_functions[] = { function_entry sockets_functions[] = {
PHP_FE(socket_fd_alloc, NULL) PHP_FE(socket_fd_alloc, NULL)
PHP_FE(socket_fd_free, NULL) PHP_FE(socket_fd_free, NULL)
@ -145,7 +146,7 @@ function_entry sockets_functions[] = {
PHP_FE(socket_shutdown, NULL) PHP_FE(socket_shutdown, NULL)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
/* }}} */
zend_module_entry sockets_module_entry = { zend_module_entry sockets_module_entry = {
"sockets", "sockets",
@ -243,7 +244,7 @@ static php_socket *accept_connect(php_socket *php_sock, struct sockaddr *la)
return retval; return retval;
} }
/* php_read -- wrapper around read() so that it only reads to a \r or \n. */ /* {{{ php_read -- wrapper around read() so that it only reads to a \r or \n. */
int php_read(int socket, void *buf, int maxlen) int php_read(int socket, void *buf, int maxlen)
{ {
int m = 0, n = 0; int m = 0, n = 0;
@ -302,8 +303,10 @@ int php_read(int socket, void *buf, int maxlen)
return n; return n;
} }
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(sockets) PHP_MINIT_FUNCTION(sockets)
{ {
struct protoent *pe; struct protoent *pe;
@ -353,16 +356,17 @@ PHP_MINIT_FUNCTION(sockets)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(sockets) PHP_MINFO_FUNCTION(sockets)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row(2, "Sockets Support", "enabled"); php_info_print_table_row(2, "Sockets Support", "enabled");
php_info_print_table_end(); php_info_print_table_end();
} }
/* }}} */
/* {{{ proto resource socket_fd_alloc(void) /* {{{ proto resource socket_fd_alloc(void)
Allocates a new file descriptor set */ Allocates a new file descriptor set */
@ -1989,4 +1993,6 @@ PHP_FUNCTION(socket_shutdown)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/array.c
View file

@ -3122,5 +3122,6 @@ PHP_FUNCTION(key_exists)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/assert.c
View file

@ -329,5 +329,6 @@ PHP_FUNCTION(assert_options)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/base64.c
View file

@ -196,5 +196,6 @@ PHP_FUNCTION(base64_decode) {
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vimo<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/basic_functions.c
View file

@ -2623,5 +2623,6 @@ PHP_FUNCTION(is_callable)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

23
ext/standard/browscap.c
View file

@ -39,7 +39,8 @@ static void browscap_entry_dtor(zval *pvalue)
} }
} }
/* {{{ convert_browscap_pattern
*/
static void convert_browscap_pattern(zval *pattern) static void convert_browscap_pattern(zval *pattern)
{ {
register int i,j; register int i,j;
@ -80,8 +81,10 @@ static void convert_browscap_pattern(zval *pattern)
pattern->value.str.val = t; pattern->value.str.val = t;
pattern->value.str.len = j; pattern->value.str.len = j;
} }
/* }}} */
/* {{{ php_browscap_parser_cb
*/
static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg) static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg)
{ {
switch (callback_type) { switch (callback_type) {
@ -126,8 +129,10 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, vo
break; break;
} }
} }
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(browscap) PHP_MINIT_FUNCTION(browscap)
{ {
char *browscap = INI_STR("browscap"); char *browscap = INI_STR("browscap");
@ -151,8 +156,10 @@ PHP_MINIT_FUNCTION(browscap)
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
PHP_MSHUTDOWN_FUNCTION(browscap) PHP_MSHUTDOWN_FUNCTION(browscap)
{ {
if (INI_STR("browscap")) { if (INI_STR("browscap")) {
@ -160,8 +167,10 @@ PHP_MSHUTDOWN_FUNCTION(browscap)
} }
return SUCCESS; return SUCCESS;
} }
/* }}} */
/* {{{ browser_reg_compare
*/
static int browser_reg_compare(zval **browser,int num_args, va_list args, zend_hash_key *key) static int browser_reg_compare(zval **browser,int num_args, va_list args, zend_hash_key *key)
{ {
zval **browser_name; zval **browser_name;
@ -188,6 +197,7 @@ static int browser_reg_compare(zval **browser,int num_args, va_list args, zend_h
regfree(&r); regfree(&r);
return 0; return 0;
} }
/* }}} */
/* {{{ proto object get_browser(string browser_name) /* {{{ proto object get_browser(string browser_name)
Get information about the capabilities of a browser */ Get information about the capabilities of a browser */
@ -253,5 +263,6 @@ PHP_FUNCTION(get_browser)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/crc32.c
View file

@ -131,5 +131,6 @@ PHP_NAMED_FUNCTION(php_if_crc32)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

7
ext/standard/credits.c
View file

@ -24,6 +24,8 @@
#define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors) #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors)
/* {{{ php_print_credits
*/
PHPAPI void php_print_credits(int flag) PHPAPI void php_print_credits(int flag)
{ {
if (flag & PHP_CREDITS_FULLPAGE) { if (flag & PHP_CREDITS_FULLPAGE) {
@ -109,10 +111,13 @@ PHPAPI void php_print_credits(int flag)
PUTS("</body></html>\n"); PUTS("</body></html>\n");
} }
} }
/* }}} */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

5
ext/standard/crypt.c
View file

@ -175,12 +175,11 @@ PHP_FUNCTION(crypt)
/* }}} */ /* }}} */
#endif #endif
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

13
ext/standard/cyr_convert.c
View file

@ -31,9 +31,6 @@
#include <stdio.h> #include <stdio.h>
/***************************************************************************** /*****************************************************************************
* This is codetables for different Cyrillic charsets (relative to koi8-r). * This is codetables for different Cyrillic charsets (relative to koi8-r).
* Each table contains data for 128-255 symbols from ASCII table. * Each table contains data for 128-255 symbols from ASCII table.
@ -50,6 +47,8 @@
typedef unsigned char _cyr_charset_table[512]; typedef unsigned char _cyr_charset_table[512];
/* {{{ const static _cyr_charset_table _cyr_win1251
*/
const static _cyr_charset_table _cyr_win1251 = { const static _cyr_charset_table _cyr_win1251 = {
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
@ -186,9 +185,9 @@ _cyr_mac = {
158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142, 158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142,
143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154, 143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154,
}; };
/* }}} */
/* {{{ php_convert_cyr_string
/*****************************************************************************
* This is the function that performs real in-place conversion of the string * This is the function that performs real in-place conversion of the string
* between charsets. * between charsets.
* Parameters: * Parameters:
@ -266,6 +265,7 @@ static char * php_convert_cyr_string(unsigned char *str, int length, char from,
} }
return (char *)str; return (char *)str;
} }
/* }}} */
/* {{{ proto string convert_cyr_string(string str, string from, string to) /* {{{ proto string convert_cyr_string(string str, string from, string to)
Convert from one Cyrillic character set to another */ Convert from one Cyrillic character set to another */
@ -294,5 +294,6 @@ PHP_FUNCTION(convert_cyr_string)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

18
ext/standard/datetime.c
View file

@ -75,6 +75,8 @@ PHP_FUNCTION(time)
} }
/* }}} */ /* }}} */
/* {{{ php_mktime
*/
void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm) void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
{ {
pval **arguments[7]; pval **arguments[7];
@ -190,6 +192,7 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
RETURN_LONG(seconds); RETURN_LONG(seconds);
} }
/* }}} */
/* {{{ proto int mktime(int hour, int min, int sec, int mon, int day, int year) /* {{{ 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 */
@ -207,6 +210,8 @@ PHP_FUNCTION(gmmktime)
} }
/* }}} */ /* }}} */
/* {{{ php_date
*/
static void static void
php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
{ {
@ -511,6 +516,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
return_value->value.str.len = strlen(return_value->value.str.val); return_value->value.str.len = strlen(return_value->value.str.val);
return_value->type = IS_STRING; return_value->type = IS_STRING;
} }
/* }}} */
/* {{{ proto string date(string format [, int timestamp]) /* {{{ proto string date(string format [, int timestamp])
Format a local time/date */ Format a local time/date */
@ -628,7 +634,8 @@ PHP_FUNCTION(getdate)
} }
/* }}} */ /* }}} */
/* Return date string in standard format for http headers */ /* {{{ php_std_date
Return date string in standard format for http headers */
char *php_std_date(time_t t) char *php_std_date(time_t t)
{ {
struct tm *tm1, tmbuf; struct tm *tm1, tmbuf;
@ -656,7 +663,7 @@ char *php_std_date(time_t t)
str[79]=0; str[79]=0;
return (str); return (str);
} }
/* }}} */
/* {{{ proto bool checkdate(int month, int day, int year) /* {{{ 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 */
@ -697,6 +704,8 @@ PHP_FUNCTION(checkdate)
/* }}} */ /* }}} */
#if HAVE_STRFTIME #if HAVE_STRFTIME
/* {{{ _php_strftime
*/
void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm) void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm)
{ {
pval **format_arg, **timestamp_arg; pval **format_arg, **timestamp_arg;
@ -753,6 +762,8 @@ void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm)
efree(buf); efree(buf);
RETURN_FALSE; RETURN_FALSE;
} }
/* }}} */
/* {{{ proto string strftime(string format [, int timestamp]) /* {{{ 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)
@ -804,5 +815,6 @@ PHP_FUNCTION(strtotime)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

3
ext/standard/dir.c
View file

@ -364,5 +364,6 @@ PHP_NAMED_FUNCTION(php_if_readdir)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

7
ext/standard/dl.c
View file

@ -91,6 +91,8 @@ PHP_FUNCTION(dl)
#define USING_ZTS 0 #define USING_ZTS 0
#endif #endif
/* {{{ php_dl
*/
void php_dl(pval *file, int type, pval *return_value) void php_dl(pval *file, int type, pval *return_value)
{ {
void *handle; void *handle;
@ -200,7 +202,7 @@ void php_dl(pval *file, int type, pval *return_value)
RETURN_TRUE; RETURN_TRUE;
} }
/* }}} */
PHP_MINFO_FUNCTION(dl) PHP_MINFO_FUNCTION(dl)
{ {
@ -227,5 +229,6 @@ PHP_MINFO_FUNCTION(dl)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

13
ext/standard/dns.c
View file

@ -18,6 +18,8 @@
/* $Id$ */ /* $Id$ */
/* {{{ includes
*/
#include "php.h" #include "php.h"
#if HAVE_SYS_SOCKET_H #if HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
@ -59,6 +61,7 @@
#endif #endif
#include "dns.h" #include "dns.h"
/* }}} */
char *php_gethostbyaddr(char *ip); char *php_gethostbyaddr(char *ip);
char *php_gethostbyname(char *name); char *php_gethostbyname(char *name);
@ -78,7 +81,8 @@ PHP_FUNCTION(gethostbyaddr)
} }
/* }}} */ /* }}} */
/* {{{ php_gethostbyaddr
*/
char *php_gethostbyaddr(char *ip) char *php_gethostbyaddr(char *ip)
{ {
struct in_addr addr; struct in_addr addr;
@ -100,6 +104,7 @@ char *php_gethostbyaddr(char *ip)
} }
return estrdup(hp->h_name); return estrdup(hp->h_name);
} }
/* }}} */
/* {{{ proto string gethostbyname(string hostname) /* {{{ proto string gethostbyname(string hostname)
Get the IP address corresponding to a given Internet host name */ Get the IP address corresponding to a given Internet host name */
@ -151,6 +156,8 @@ PHP_FUNCTION(gethostbynamel)
} }
/* }}} */ /* }}} */
/* {{{ php_gethostbyname
*/
char *php_gethostbyname(char *name) char *php_gethostbyname(char *name)
{ {
struct hostent *hp; struct hostent *hp;
@ -166,6 +173,7 @@ char *php_gethostbyname(char *name)
memcpy(&in.s_addr, *(hp->h_addr_list), sizeof(in.s_addr)); memcpy(&in.s_addr, *(hp->h_addr_list), sizeof(in.s_addr));
return estrdup(inet_ntoa(in)); return estrdup(inet_ntoa(in));
} }
/* }}} */
#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32)) #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
@ -324,5 +332,6 @@ PHP_FUNCTION(getmxrr)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

16
ext/standard/exec.c
View file

@ -35,7 +35,7 @@
#include <signal.h> #include <signal.h>
#endif #endif
/* /* {{{ php_Exec
* If type==0, only last line of output is returned (exec) * If type==0, only last line of output is returned (exec)
* If type==1, all lines will be printed and last lined returned (system) * If type==1, all lines will be printed and last lined returned (system)
* If type==2, all lines will be saved to given array (exec with &$array) * If type==2, all lines will be saved to given array (exec with &$array)
@ -234,6 +234,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
efree(buf); efree(buf);
return FG(pclose_ret); return FG(pclose_ret);
} }
/* }}} */
/* {{{ proto string exec(string command [, array output [, int return_value]]) /* {{{ proto string exec(string command [, array output [, int return_value]])
Execute an external program */ Execute an external program */
@ -326,6 +327,8 @@ PHP_FUNCTION(passthru)
} }
/* }}} */ /* }}} */
/* {{{ php_get_index
*/
static int php_get_index(char *s, char c) static int php_get_index(char *s, char c)
{ {
register int x; register int x;
@ -336,8 +339,10 @@ static int php_get_index(char *s, char c)
return -1; return -1;
} }
/* }}} */
/* Escape all chars that could possibly be used to /* {{{ php_escape_shell_cmd
Escape all chars that could possibly be used to
break out of a shell command break out of a shell command
This function emalloc's a string and returns the pointer. This function emalloc's a string and returns the pointer.
@ -363,7 +368,10 @@ char * php_escape_shell_cmd(char *str) {
} }
return cmd; return cmd;
} }
/* }}} */
/* {{{ php_escape_shell_arg
*/
char * php_escape_shell_arg(char *str) { char * php_escape_shell_arg(char *str) {
register int x, y, l; register int x, y, l;
char *cmd; char *cmd;
@ -389,6 +397,7 @@ char * php_escape_shell_arg(char *str) {
cmd[l] = '\0'; cmd[l] = '\0';
return cmd; return cmd;
} }
/* }}} */
/* {{{ proto string escapeshellcmd(string command) /* {{{ proto string escapeshellcmd(string command)
Escape shell metacharacters */ Escape shell metacharacters */
@ -480,5 +489,6 @@ PHP_FUNCTION(shell_exec)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

35
ext/standard/file.c
View file

@ -584,6 +584,8 @@ PHP_NAMED_FUNCTION(php_if_tmpfile)
/* }}} */ /* }}} */
#if HAVE_PHP_STREAM #if HAVE_PHP_STREAM
/* {{{ PHP_FUNCTION
*/
PHP_FUNCTION(fopenstream) PHP_FUNCTION(fopenstream)
{ {
zval ** zfilename, ** zmode; zval ** zfilename, ** zmode;
@ -603,6 +605,7 @@ PHP_FUNCTION(fopenstream)
} }
ZEND_REGISTER_RESOURCE(return_value, stream, le_stream); ZEND_REGISTER_RESOURCE(return_value, stream, le_stream);
} }
/* }}} */
#endif #endif
/* {{{ proto int fopen(string filename, string mode [, int use_include_path]) /* {{{ proto int fopen(string filename, string mode [, int use_include_path])
@ -1729,7 +1732,6 @@ PHP_FUNCTION(rename)
} }
/* }}} */ /* }}} */
/* {{{ proto int unlink(string filename) /* {{{ proto int unlink(string filename)
Delete a file */ Delete a file */
PHP_FUNCTION(unlink) PHP_FUNCTION(unlink)
@ -1758,7 +1760,6 @@ PHP_FUNCTION(unlink)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftruncate (int fp, int size) /* {{{ proto int ftruncate (int fp, int size)
Truncate file to 'size' length */ Truncate file to 'size' length */
PHP_NAMED_FUNCTION(php_if_ftruncate) PHP_NAMED_FUNCTION(php_if_ftruncate)
@ -1874,7 +1875,6 @@ PHP_NAMED_FUNCTION(php_if_fstat)
} }
/* }}} */ /* }}} */
/* {{{ proto int copy(string source_file, string destination_file) /* {{{ proto int copy(string source_file, string destination_file)
Copy a file */ Copy a file */
@ -1915,7 +1915,8 @@ PHP_FUNCTION(copy)
/* }}} */ /* }}} */
/* {{{ php_copy_file
*/
PHPAPI int php_copy_file(char *src, char *dest) PHPAPI int php_copy_file(char *src, char *dest)
{ {
char buffer[8192]; char buffer[8192];
@ -1971,9 +1972,7 @@ cleanup:
close(fd_t); close(fd_t);
return ret; return ret;
} }
/* }}} */
/* {{{ proto string fread(int fp, int length) /* {{{ proto string fread(int fp, int length)
Binary-safe file read */ Binary-safe file read */
@ -2028,6 +2027,7 @@ PHP_FUNCTION(fread)
} }
/* }}} */ /* }}} */
/* {{{ proto array fgetcsv(int fp, int length [, string delimiter]) /* {{{ proto array fgetcsv(int fp, int length [, string delimiter])
Get line from file pointer and parse for CSV fields */ Get line from file pointer and parse for CSV fields */
@ -2222,7 +2222,8 @@ PHP_FUNCTION(realpath)
static fd_set readfd; static fd_set readfd;
static int max_fd; static int max_fd;
/* {{{ PHP_FUNCTION(fd_set)
*/
PHP_FUNCTION(fd_set) PHP_FUNCTION(fd_set)
{ {
pval **arg; pval **arg;
@ -2274,7 +2275,10 @@ PHP_FUNCTION(fd_set)
} }
RETURN_LONG(1); RETURN_LONG(1);
} }
/* }}} */
/* {{{ PHP_FUNCTION(select)
*/
PHP_FUNCTION(select) PHP_FUNCTION(select)
{ {
pval **timeout; pval **timeout;
@ -2292,7 +2296,10 @@ PHP_FUNCTION(select)
RETURN_LONG(select(max_fd + 1,&readfd,NULL,NULL,((*timeout)->value.lval <= 0) ? NULL : &tv)); RETURN_LONG(select(max_fd + 1,&readfd,NULL,NULL,((*timeout)->value.lval <= 0) ? NULL : &tv));
} }
/* }}} */
/* {{{ PHP_FUNCTION(fd_isset)
*/
PHP_FUNCTION(fd_isset) PHP_FUNCTION(fd_isset)
{ {
pval **fdarg; pval **fdarg;
@ -2318,10 +2325,12 @@ PHP_FUNCTION(fd_isset)
} }
RETURN_FALSE; RETURN_FALSE;
} }
/* }}} */
#endif #endif
/* Function reads all data from file or socket and puts it into the buffer */ /* {{{ php_fread_all
Function reads all data from file or socket and puts it into the buffer */
size_t php_fread_all(char **buf, int socket, FILE *fp, int issock) { size_t php_fread_all(char **buf, int socket, FILE *fp, int issock) {
size_t ret; size_t ret;
char *ptr; char *ptr;
@ -2351,11 +2360,13 @@ size_t php_fread_all(char **buf, int socket, FILE *fp, int issock) {
return len; return len;
} }
/* }}} */
/* See http://www.w3.org/TR/html4/intro/sgmltut.html#h-3.2.2 */ /* See http://www.w3.org/TR/html4/intro/sgmltut.html#h-3.2.2 */
#define PHP_META_HTML401_CHARS "-_.:" #define PHP_META_HTML401_CHARS "-_.:"
/* Tokenizes an HTML file for get_meta_tags */ /* {{{ php_next_meta_token
Tokenizes an HTML file for get_meta_tags */
php_meta_tags_token php_next_meta_token(FILE *fp, int socketd, int issock, int *use_last_char, int *last_char, char **data, int *datalen) { php_meta_tags_token php_next_meta_token(FILE *fp, int socketd, int issock, int *use_last_char, int *last_char, char **data, int *datalen) {
int ch, compliment; int ch, compliment;
char buff[META_DEF_BUFSIZE + 1]; char buff[META_DEF_BUFSIZE + 1];
@ -2441,11 +2452,13 @@ php_meta_tags_token php_next_meta_token(FILE *fp, int socketd, int issock, int *
return TOK_EOF; return TOK_EOF;
} }
/* }}} */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: tw=78 sw=4 ts=4 fdm=marker * vim600: tw=78 sw=4 ts=4 fdm=marker
* vim<600: tw=78 sw=4 ts=4
*/ */

9
ext/standard/filestat.c
View file

@ -421,7 +421,6 @@ PHP_FUNCTION(chown)
} }
/* }}} */ /* }}} */
/* {{{ proto bool chmod(string filename, int mode) /* {{{ proto bool chmod(string filename, int mode)
Change file mode */ Change file mode */
PHP_FUNCTION(chmod) PHP_FUNCTION(chmod)
@ -462,7 +461,6 @@ PHP_FUNCTION(chmod)
} }
/* }}} */ /* }}} */
/* {{{ proto bool touch(string filename [, int time]) /* {{{ proto bool touch(string filename [, int time])
Set modification time of file */ Set modification time of file */
PHP_FUNCTION(touch) PHP_FUNCTION(touch)
@ -535,7 +533,6 @@ PHP_FUNCTION(touch)
} }
/* }}} */ /* }}} */
/* {{{ proto void clearstatcache(void) /* {{{ proto void clearstatcache(void)
Clear file stat cache */ Clear file stat cache */
PHP_FUNCTION(clearstatcache) PHP_FUNCTION(clearstatcache)
@ -551,6 +548,8 @@ PHP_FUNCTION(clearstatcache)
#define IS_LINK_OPERATION() (type == 8 /* filetype */ || type == 14 /* is_link */ || type == 16 /* lstat */) #define IS_LINK_OPERATION() (type == 8 /* filetype */ || type == 14 /* is_link */ || type == 16 /* lstat */)
/* {{{ php_stat
*/
static void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value) static void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value)
{ {
zval *stat_dev,*stat_ino,*stat_mode,*stat_nlink,*stat_uid,*stat_gid,*stat_rdev, zval *stat_dev,*stat_ino,*stat_mode,*stat_nlink,*stat_uid,*stat_gid,*stat_rdev,
@ -761,6 +760,7 @@ static void php_stat(const char *filename, php_stat_len filename_length, int typ
php_error(E_WARNING, "didn't understand stat call"); php_error(E_WARNING, "didn't understand stat call");
RETURN_FALSE; RETURN_FALSE;
} }
/* }}} */
/* another quickie macro to make defining similar functions easier */ /* another quickie macro to make defining similar functions easier */
#define FileFunction(name, funcnum) \ #define FileFunction(name, funcnum) \
@ -868,5 +868,6 @@ FileFunction(php_if_stat,17)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

9
ext/standard/flock_compat.c
View file

@ -152,15 +152,13 @@ int flock(int fd, int operation)
#endif /* !defined(HAVE_FLOCK) */ #endif /* !defined(HAVE_FLOCK) */
#if !(HAVE_INET_ATON) #if !(HAVE_INET_ATON)
/* {{{ inet_aton
/*
* Check whether "cp" is a valid ascii representation * Check whether "cp" is a valid ascii representation
* of an Internet address and convert to a binary address. * of an Internet address and convert to a binary address.
* Returns 1 if the address is valid, 0 if not. * Returns 1 if the address is valid, 0 if not.
* This replaces inet_addr, the return value from which * This replaces inet_addr, the return value from which
* cannot distinguish between failure and a local broadcast address. * cannot distinguish between failure and a local broadcast address.
*/ */
int inet_aton(const char *cp, struct in_addr *ap) int inet_aton(const char *cp, struct in_addr *ap)
{ {
int dots = 0; int dots = 0;
@ -214,7 +212,7 @@ int inet_aton(const char *cp, struct in_addr *ap)
return 1; return 1;
} }
/* }}} */
#endif /* !HAVE_INET_ATON */ #endif /* !HAVE_INET_ATON */
/* /*
@ -222,5 +220,6 @@ int inet_aton(const char *cp, struct in_addr *ap)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

7
ext/standard/formatted_print.c
View file

@ -389,8 +389,7 @@ php_sprintf_getnumber(char *buffer, int *pos)
return num; return num;
} }
/* {{{ php_formatted_print
/*
* New sprintf implementation for PHP. * New sprintf implementation for PHP.
* *
* Modifiers: * Modifiers:
@ -629,6 +628,7 @@ php_formatted_print(int ht, int *len)
*len = outpos; *len = outpos;
return result; return result;
} }
/* }}} */
/* {{{ proto string sprintf(string format [, mixed arg1 [, mixed ...]]) /* {{{ proto string sprintf(string format [, mixed arg1 [, mixed ...]])
Return a formatted string */ Return a formatted string */
@ -665,5 +665,6 @@ PHP_FUNCTION(user_printf)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

4
ext/standard/fsock.c
View file

@ -737,6 +737,7 @@ PHPAPI size_t php_sock_fread(char *ptr, size_t size, int socket)
} }
/* }}} */ /* }}} */
/* {{{ module start/shutdown functions */ /* {{{ module start/shutdown functions */
/* {{{ php_msock_destroy */ /* {{{ php_msock_destroy */
@ -761,5 +762,6 @@ PHP_RSHUTDOWN_FUNCTION(fsock)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

7
ext/standard/ftp_fopen_wrapper.c
View file

@ -77,7 +77,8 @@ static int php_get_ftp_result(int socketd)
return strtol(tmp_line, NULL, 10); return strtol(tmp_line, NULL, 10);
} }
/* {{{ php_fopen_url_wrap_ftp
*/
FILE *php_fopen_url_wrap_ftp(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path) FILE *php_fopen_url_wrap_ftp(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
{ {
FILE *fp=NULL; FILE *fp=NULL;
@ -311,11 +312,13 @@ FILE *php_fopen_url_wrap_ftp(char *path, char *mode, int options, int *issock, i
*socketd = 0; *socketd = 0;
return NULL; return NULL;
} }
/* }}} */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

16
ext/standard/head.c
View file

@ -81,6 +81,8 @@ PHP_FUNCTION(Header)
} }
/* }}} */ /* }}} */
/* {{{ php_header
*/
PHPAPI int php_header() PHPAPI int php_header()
{ {
SLS_FETCH(); SLS_FETCH();
@ -91,8 +93,10 @@ PHPAPI int php_header()
return 1; /* allow output */ return 1; /* allow output */
} }
} }
/* }}} */
/* {{{ php_push_cookie_list
*/
void php_push_cookie_list(char *name, char *value, time_t expires, char *path, char *domain, int secure) void php_push_cookie_list(char *name, char *value, time_t expires, char *path, char *domain, int secure)
{ {
CookieList *new; CookieList *new;
@ -107,7 +111,10 @@ void php_push_cookie_list(char *name, char *value, time_t expires, char *path, c
new->secure = secure; new->secure = secure;
top = new; top = new;
} }
/* }}} */
/* {{{ php_pop_cookie_list
*/
CookieList *php_pop_cookie_list(void) CookieList *php_pop_cookie_list(void)
{ {
CookieList *ret; CookieList *ret;
@ -117,6 +124,7 @@ CookieList *php_pop_cookie_list(void)
top = top->next; top = top->next;
return (ret); return (ret);
} }
/* }}} */
/* php_set_cookie(name,value,expires,path,domain,secure) */ /* php_set_cookie(name,value,expires,path,domain,secure) */
/* {{{ proto void setcookie(string name [, string value [, int expires [, string path [, string domain [, string secure]]]]]) /* {{{ proto void setcookie(string name [, string value [, int expires [, string path [, string domain [, string secure]]]]])
@ -251,6 +259,8 @@ PHP_FUNCTION(setcookie)
} }
/* }}} */ /* }}} */
/* {{{ php_headers_unsent
*/
int php_headers_unsent(void) int php_headers_unsent(void)
{ {
if (php_header_printed!=1 || !php_print_header) { if (php_header_printed!=1 || !php_print_header) {
@ -259,6 +269,7 @@ int php_headers_unsent(void)
return 0; return 0;
} }
} }
/* }}} */
/* {{{ proto int headers_sent(void) /* {{{ proto int headers_sent(void)
Return true if headers have already been sent, false otherwise */ Return true if headers have already been sent, false otherwise */
@ -279,5 +290,6 @@ PHP_FUNCTION(headers_sent)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

19
ext/standard/html.c
View file

@ -106,6 +106,8 @@ static const struct {
{ NULL } { NULL }
}; };
/* {{{ get_next_char
*/
inline static unsigned short get_next_char(enum entity_charset charset, inline static unsigned short get_next_char(enum entity_charset charset,
unsigned char * str, unsigned char * str,
int * newpos, int * newpos,
@ -205,8 +207,10 @@ inline static unsigned short get_next_char(enum entity_charset charset,
*mbseqlen = mbpos; *mbseqlen = mbpos;
return this_char; return this_char;
} }
/* }}} */
/* returns the charset identifier based on current locale or a hint. /* {{{ entity_charset determine_charset
* returns the charset identifier based on current locale or a hint.
* defaults to iso-8859-1 */ * defaults to iso-8859-1 */
static enum entity_charset determine_charset(char * charset_hint) static enum entity_charset determine_charset(char * charset_hint)
{ {
@ -261,7 +265,10 @@ static enum entity_charset determine_charset(char * charset_hint)
return charset; return charset;
} }
/* }}} */
/* {{{ php_escape_html_entities
*/
PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char * hint_charset) PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char * hint_charset)
{ {
int i, maxlen, len; int i, maxlen, len;
@ -347,7 +354,10 @@ PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newle
} }
/* }}} */
/* {{{ php_html_entities
*/
static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all) static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
{ {
zval **arg, **quotes, **charset; zval **arg, **quotes, **charset;
@ -374,10 +384,13 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
new = php_escape_html_entities((*arg)->value.str.val, (*arg)->value.str.len, &len, all, quote_style, hint_charset); new = php_escape_html_entities((*arg)->value.str.val, (*arg)->value.str.len, &len, all, quote_style, hint_charset);
RETVAL_STRINGL(new,len,0); RETVAL_STRINGL(new,len,0);
} }
/* }}} */
#define HTML_SPECIALCHARS 0 #define HTML_SPECIALCHARS 0
#define HTML_ENTITIES 1 #define HTML_ENTITIES 1
/* {{{ register_html_constants
*/
void register_html_constants(INIT_FUNC_ARGS) void register_html_constants(INIT_FUNC_ARGS)
{ {
REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS);
@ -386,6 +399,7 @@ void register_html_constants(INIT_FUNC_ARGS)
REGISTER_LONG_CONSTANT("ENT_QUOTES", ENT_QUOTES, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ENT_QUOTES", ENT_QUOTES, CONST_PERSISTENT|CONST_CS);
REGISTER_LONG_CONSTANT("ENT_NOQUOTES", ENT_NOQUOTES, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ENT_NOQUOTES", ENT_NOQUOTES, CONST_PERSISTENT|CONST_CS);
} }
/* }}} */
/* {{{ proto string htmlspecialchars(string string [, int quote_style][, string charset]) /* {{{ proto string htmlspecialchars(string string [, int quote_style][, string charset])
Convert special characters to HTML entities */ Convert special characters to HTML entities */
@ -471,5 +485,6 @@ PHP_FUNCTION(get_html_translation_table)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

6
ext/standard/http_fopen_wrapper.c
View file

@ -68,6 +68,8 @@
#define HTTP_HEADER_BLOCK_SIZE 128 #define HTTP_HEADER_BLOCK_SIZE 128
/* {{{ php_fopen_url_wrap_http
*/
FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path) FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
{ {
FILE *fp=NULL; FILE *fp=NULL;
@ -302,11 +304,13 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
} }
return (fp); return (fp);
} }
/* }}} */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

44
ext/standard/image.c
View file

@ -66,7 +66,8 @@ struct gfxinfo {
unsigned int channels; unsigned int channels;
}; };
/* routine to handle GIF files. If only everything were that easy... ;} */ /* {{{ php_handle_gif
* routine to handle GIF files. If only everything were that easy... ;} */
static struct gfxinfo *php_handle_gif (int socketd, FILE *fp, int issock) static struct gfxinfo *php_handle_gif (int socketd, FILE *fp, int issock)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -85,8 +86,10 @@ static struct gfxinfo *php_handle_gif (int socketd, FILE *fp, int issock)
return result; return result;
} }
/* }}} */
/* {{{ php_handle_psd
*/
static struct gfxinfo *php_handle_psd (int socketd, FILE *fp, int issock) static struct gfxinfo *php_handle_psd (int socketd, FILE *fp, int issock)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -110,8 +113,10 @@ static struct gfxinfo *php_handle_psd (int socketd, FILE *fp, int issock)
return result; return result;
} }
/* }}} */
/* {{{ php_handle_bmp
*/
static struct gfxinfo *php_handle_bmp (int socketd, FILE *fp, int issock) static struct gfxinfo *php_handle_bmp (int socketd, FILE *fp, int issock)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -130,9 +135,10 @@ static struct gfxinfo *php_handle_bmp (int socketd, FILE *fp, int issock)
return result; return result;
} }
/* }}} */
/* {{{ php_swf_get_bits
/* routines to handle SWF files. */ * routines to handle SWF files. */
static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int pos, unsigned int count) static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int pos, unsigned int count)
{ {
unsigned int loop; unsigned int loop;
@ -145,8 +151,10 @@ static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int p
} }
return result; return result;
} }
/* }}} */
/* {{{ php_handle_swf
*/
static struct gfxinfo *php_handle_swf (int socketd, FILE *fp, int issock) static struct gfxinfo *php_handle_swf (int socketd, FILE *fp, int issock)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -165,8 +173,10 @@ static struct gfxinfo *php_handle_swf (int socketd, FILE *fp, int issock)
php_swf_get_bits (a, 5 + (2 * bits), bits)) / 20; php_swf_get_bits (a, 5 + (2 * bits), bits)) / 20;
return result; return result;
} }
/* }}} */
/* routine to handle PNG files */ /* {{{ php_handle_png
* routine to handle PNG files */
static struct gfxinfo *php_handle_png (int socketd, FILE *fp, int issock) static struct gfxinfo *php_handle_png (int socketd, FILE *fp, int issock)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -190,6 +200,7 @@ static struct gfxinfo *php_handle_png (int socketd, FILE *fp, int issock)
result->height = (unsigned int) in_height; result->height = (unsigned int) in_height;
return result; return result;
} }
/* }}} */
/* routines to handle JPEG data */ /* routines to handle JPEG data */
@ -227,6 +238,8 @@ static struct gfxinfo *php_handle_png (int socketd, FILE *fp, int issock)
#define M_APP14 0xee #define M_APP14 0xee
#define M_APP15 0xef #define M_APP15 0xef
/* {{{ php_read2
*/
static unsigned short php_read2(int socketd, FILE *fp, int issock) static unsigned short php_read2(int socketd, FILE *fp, int issock)
{ {
unsigned char a[2]; unsigned char a[2];
@ -236,7 +249,10 @@ static unsigned short php_read2(int socketd, FILE *fp, int issock)
return (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]); return (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]);
} }
/* }}} */
/* {{{ php_next_marker
*/
static unsigned int php_next_marker(int socketd, FILE *fp, int issock) static unsigned int php_next_marker(int socketd, FILE *fp, int issock)
/* get next marker byte from file */ /* get next marker byte from file */
{ {
@ -250,7 +266,10 @@ static unsigned int php_next_marker(int socketd, FILE *fp, int issock)
return (unsigned int) c; return (unsigned int) c;
} }
/* }}} */
/* {{{ php_skip_variable
*/
static void php_skip_variable(int socketd, FILE *fp, int issock) static void php_skip_variable(int socketd, FILE *fp, int issock)
/* skip over a variable-length block; assumes proper length marker */ /* skip over a variable-length block; assumes proper length marker */
{ {
@ -264,7 +283,10 @@ static void php_skip_variable(int socketd, FILE *fp, int issock)
FP_FREAD(tmp, (long) length, socketd, fp, issock); /* skip the header */ FP_FREAD(tmp, (long) length, socketd, fp, issock); /* skip the header */
efree(tmp); efree(tmp);
} }
/* }}} */
/* {{{ php_read_APP
*/
static void php_read_APP(int socketd, FILE *fp, int issock,unsigned int marker,pval *info) static void php_read_APP(int socketd, FILE *fp, int issock,unsigned int marker,pval *info)
{ {
unsigned short length; unsigned short length;
@ -291,8 +313,10 @@ static void php_read_APP(int socketd, FILE *fp, int issock,unsigned int marker,p
efree(buffer); efree(buffer);
} }
/* }}} */
/* main loop to parse JPEG structure */ /* {{{ php_handle_jpeg
main loop to parse JPEG structure */
static struct gfxinfo *php_handle_jpeg (int socketd, FILE *fp, int issock, pval *info) static struct gfxinfo *php_handle_jpeg (int socketd, FILE *fp, int issock, pval *info)
{ {
struct gfxinfo *result = NULL; struct gfxinfo *result = NULL;
@ -369,6 +393,7 @@ static struct gfxinfo *php_handle_jpeg (int socketd, FILE *fp, int issock, pval
return NULL; return NULL;
} }
/* }}} */
/* main function */ /* main function */
@ -500,5 +525,6 @@ PHP_FUNCTION(getimagesize)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

25
ext/standard/incomplete_class.c
View file

@ -33,6 +33,8 @@
#define INCOMPLETE_CLASS "__PHP_Incomplete_Class" #define INCOMPLETE_CLASS "__PHP_Incomplete_Class"
#define MAGIC_MEMBER "__PHP_Incomplete_Class_Name" #define MAGIC_MEMBER "__PHP_Incomplete_Class_Name"
/* {{{ incomplete_class_message
*/
static void incomplete_class_message(zend_property_reference *ref) static void incomplete_class_message(zend_property_reference *ref)
{ {
char buf[1024]; char buf[1024];
@ -49,12 +51,18 @@ static void incomplete_class_message(zend_property_reference *ref)
php_error(E_ERROR, "%s", buf); php_error(E_ERROR, "%s", buf);
} }
/* }}} */
/* {{{ incomplete_class_call_func
*/
static void incomplete_class_call_func(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference) static void incomplete_class_call_func(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)
{ {
incomplete_class_message(property_reference); incomplete_class_message(property_reference);
} }
/* }}} */
/* {{{ incomplete_class_set_property
*/
static int incomplete_class_set_property(zend_property_reference *property_reference, zval *value) static int incomplete_class_set_property(zend_property_reference *property_reference, zval *value)
{ {
incomplete_class_message(property_reference); incomplete_class_message(property_reference);
@ -62,7 +70,10 @@ static int incomplete_class_set_property(zend_property_reference *property_refer
/* does not reach this point */ /* does not reach this point */
return (0); return (0);
} }
/* }}} */
/* {{{ incomplete_class_get_property
*/
static zval incomplete_class_get_property(zend_property_reference *property_reference) static zval incomplete_class_get_property(zend_property_reference *property_reference)
{ {
zval foo; zval foo;
@ -73,7 +84,10 @@ static zval incomplete_class_get_property(zend_property_reference *property_refe
memset(&foo, 0, sizeof(zval)); /* shut warnings up */ memset(&foo, 0, sizeof(zval)); /* shut warnings up */
return (foo); return (foo);
} }
/* }}} */
/* {{{ php_create_incomplete_class
*/
zend_class_entry *php_create_incomplete_class(BLS_D) zend_class_entry *php_create_incomplete_class(BLS_D)
{ {
zend_class_entry incomplete_class; zend_class_entry incomplete_class;
@ -87,8 +101,10 @@ zend_class_entry *php_create_incomplete_class(BLS_D)
return (BG(incomplete_class)); return (BG(incomplete_class));
} }
/* }}} */
/* {{{ php_lookup_class_name
*/
char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del) char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del)
{ {
zval **val; zval **val;
@ -106,7 +122,10 @@ char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del)
return (retval); return (retval);
} }
/* }}} */
/* {{{ php_store_class_name
*/
void php_store_class_name(zval *object, const char *name, size_t len) void php_store_class_name(zval *object, const char *name, size_t len)
{ {
zval *val; zval *val;
@ -119,11 +138,13 @@ void php_store_class_name(zval *object, const char *name, size_t len)
zend_hash_update(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL); zend_hash_update(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL);
} }
/* }}} */
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

38
ext/standard/info.c
View file

@ -38,6 +38,8 @@
PHPAPI extern char *php_ini_opened_path; PHPAPI extern char *php_ini_opened_path;
/* {{{ _display_module_info
*/
static int _display_module_info(zend_module_entry *module, void *arg) static int _display_module_info(zend_module_entry *module, void *arg)
{ {
int show_info_func = *((int *) arg); int show_info_func = *((int *) arg);
@ -53,8 +55,10 @@ static int _display_module_info(zend_module_entry *module, void *arg)
} }
return 0; return 0;
} }
/* }}} */
/* {{{ php_print_gpcse_array
*/
static void php_print_gpcse_array(char *name, uint name_length ELS_DC) static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
{ {
zval **data, **tmp, tmp2; zval **data, **tmp, tmp2;
@ -96,7 +100,10 @@ static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
} }
} }
} }
/* }}} */
/* {{{ php_info_print_style
*/
void php_info_print_style(void) void php_info_print_style(void)
{ {
php_printf("<STYLE TYPE=\"text/css\"><!--\n"); php_printf("<STYLE TYPE=\"text/css\"><!--\n");
@ -108,8 +115,10 @@ void php_info_print_style(void)
php_printf("TH { font-family: arial,helvetica,sans-serif; font-size: 11pt; font-weight: bold; }\n"); php_printf("TH { font-family: arial,helvetica,sans-serif; font-size: 11pt; font-weight: bold; }\n");
php_printf("//--></STYLE>\n"); php_printf("//--></STYLE>\n");
} }
/* }}} */
/* {{{ php_get_uname
*/
PHPAPI char *php_get_uname() PHPAPI char *php_get_uname()
{ {
char *php_uname; char *php_uname;
@ -133,7 +142,10 @@ PHPAPI char *php_get_uname()
#endif #endif
return estrdup(php_uname); return estrdup(php_uname);
} }
/* }}} */
/* {{{ php_print_info
*/
PHPAPI void php_print_info(int flag) PHPAPI void php_print_info(int flag)
{ {
char **env,*tmp1,*tmp2; char **env,*tmp1,*tmp2;
@ -324,7 +336,7 @@ PHPAPI void php_print_info(int flag)
PUTS("</BODY></HTML>"); PUTS("</BODY></HTML>");
} }
/* }}} */
PHPAPI void php_info_print_table_start() PHPAPI void php_info_print_table_start()
@ -364,7 +376,8 @@ PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header)
php_printf("<TR BGCOLOR=\"" PHP_HEADER_COLOR "\"><TH COLSPAN=%d>%s</TH></TR>\n", num_cols, header ); php_printf("<TR BGCOLOR=\"" PHP_HEADER_COLOR "\"><TH COLSPAN=%d>%s</TH></TR>\n", num_cols, header );
} }
/* {{{ php_info_print_table_header
*/
PHPAPI void php_info_print_table_header(int num_cols, ...) PHPAPI void php_info_print_table_header(int num_cols, ...)
{ {
int i; int i;
@ -385,8 +398,10 @@ PHPAPI void php_info_print_table_header(int num_cols, ...)
va_end(row_elements); va_end(row_elements);
} }
/* }}} */
/* {{{ php_info_print_table_row
*/
PHPAPI void php_info_print_table_row(int num_cols, ...) PHPAPI void php_info_print_table_row(int num_cols, ...)
{ {
int i; int i;
@ -414,9 +429,10 @@ PHPAPI void php_info_print_table_row(int num_cols, ...)
va_end(row_elements); va_end(row_elements);
} }
/* }}} */
/* {{{ register_phpinfo_constants
*/
void register_phpinfo_constants(INIT_FUNC_ARGS) void register_phpinfo_constants(INIT_FUNC_ARGS)
{ {
REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS);
@ -436,7 +452,7 @@ void register_phpinfo_constants(INIT_FUNC_ARGS)
REGISTER_LONG_CONSTANT("CREDITS_QA", PHP_CREDITS_QA, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("CREDITS_QA", PHP_CREDITS_QA, CONST_PERSISTENT|CONST_CS);
REGISTER_LONG_CONSTANT("CREDITS_ALL", PHP_CREDITS_ALL, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("CREDITS_ALL", PHP_CREDITS_ALL, CONST_PERSISTENT|CONST_CS);
} }
/* }}} */
/* {{{ proto void phpinfo([int what]) /* {{{ proto void phpinfo([int what])
Output a page of useful information about PHP and the current request */ Output a page of useful information about PHP and the current request */
@ -475,7 +491,6 @@ PHP_FUNCTION(phpversion)
} }
/* }}} */ /* }}} */
/* {{{ proto void phpcredits([int flag]) /* {{{ proto void phpcredits([int flag])
Prints the list of people who've contributed to the PHP project */ Prints the list of people who've contributed to the PHP project */
PHP_FUNCTION(phpcredits) PHP_FUNCTION(phpcredits)
@ -505,7 +520,6 @@ PHP_FUNCTION(phpcredits)
/* }}} */ /* }}} */
/* {{{ proto string php_logo_guid(void) /* {{{ proto string php_logo_guid(void)
Return the special ID used to request the PHP logo in phpinfo screens*/ Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_logo_guid) PHP_FUNCTION(php_logo_guid)
@ -522,7 +536,6 @@ PHP_FUNCTION(php_egg_logo_guid)
} }
/* }}} */ /* }}} */
/* {{{ proto string zend_logo_guid(void) /* {{{ proto string zend_logo_guid(void)
Return the special ID used to request the Zend logo in phpinfo screens*/ Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid) PHP_FUNCTION(zend_logo_guid)
@ -558,5 +571,6 @@ PHP_FUNCTION(php_uname)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

18
ext/standard/iptc.c
View file

@ -73,6 +73,8 @@
#define M_APP14 0xee #define M_APP14 0xee
#define M_APP15 0xef #define M_APP15 0xef
/* {{{ php_iptc_put1
*/
static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoolbuf) static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoolbuf)
{ {
if (spool > 0) if (spool > 0)
@ -82,7 +84,10 @@ static int php_iptc_put1(FILE *fp,int spool,unsigned char c,unsigned char **spoo
return c; return c;
} }
/* }}} */
/* {{{ php_iptc_get1
*/
static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf) static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf)
{ {
int c; int c;
@ -101,7 +106,10 @@ static int php_iptc_get1(FILE *fp,int spool,unsigned char **spoolbuf)
return c; return c;
} }
/* }}} */
/* {{{ php_iptc_read_remaining
*/
static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf) static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf)
{ {
int c; int c;
@ -110,7 +118,10 @@ static int php_iptc_read_remaining(FILE *fp,int spool,unsigned char **spoolbuf)
return M_EOI; return M_EOI;
} }
/* }}} */
/* {{{ php_iptc_skip_variable
*/
static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf) static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf)
{ {
unsigned int length; unsigned int length;
@ -129,7 +140,10 @@ static int php_iptc_skip_variable(FILE *fp,int spool,unsigned char **spoolbuf)
return 0; return 0;
} }
/* }}} */
/* {{{ php_iptc_next_marker
*/
static int php_iptc_next_marker(FILE *fp,int spool,unsigned char **spoolbuf) static int php_iptc_next_marker(FILE *fp,int spool,unsigned char **spoolbuf)
{ {
int c; int c;
@ -157,6 +171,7 @@ static int php_iptc_next_marker(FILE *fp,int spool,unsigned char **spoolbuf)
return (unsigned int) c; return (unsigned int) c;
} }
/* }}} */
static char psheader[] = "\xFF\xED\0\0Photoshop 3.0\08BIM\x04\x04\0\0\0\0"; static char psheader[] = "\xFF\xED\0\0Photoshop 3.0\08BIM\x04\x04\0\0\0\0";
@ -375,5 +390,6 @@ PHP_FUNCTION(iptcparse)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

9
ext/standard/lcg.c
View file

@ -97,3 +97,12 @@ PHP_FUNCTION(lcg_value)
RETURN_DOUBLE(php_combined_lcg()); RETURN_DOUBLE(php_combined_lcg());
} }
/* }}} */ /* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

18
ext/standard/levenshtein.c
View file

@ -25,7 +25,8 @@
#define LEVENSHTEIN_MAX_LENTH 255 #define LEVENSHTEIN_MAX_LENTH 255
/* reference implementation, only optimized for memory usage, not speed */ /* {{{ reference_levdist
* reference implementation, only optimized for memory usage, not speed */
static int reference_levdist(const char *s1, int l1, static int reference_levdist(const char *s1, int l1,
const char *s2, int l2, const char *s2, int l2,
int cost_ins, int cost_rep, int cost_del ) int cost_ins, int cost_rep, int cost_del )
@ -72,8 +73,10 @@ static int reference_levdist(const char *s1, int l1,
return c0; return c0;
} }
/* }}} */
/* {{{ custom_levdist
*/
static int custom_levdist(char *str1,char *str2,char *callback_name) static int custom_levdist(char *str1,char *str2,char *callback_name)
{ {
php_error(E_WARNING,"the general Levenshtein support is not there yet"); php_error(E_WARNING,"the general Levenshtein support is not there yet");
@ -81,7 +84,7 @@ static int custom_levdist(char *str1,char *str2,char *callback_name)
return -1; return -1;
} }
/* }}} */
/* {{{ proto int levenshtein(string str1, string str2) /* {{{ proto int levenshtein(string str1, string str2)
Calculate Levenshtein distance between two strings */ Calculate Levenshtein distance between two strings */
@ -148,3 +151,12 @@ PHP_FUNCTION(levenshtein)
RETURN_LONG(distance); RETURN_LONG(distance);
} }
/* }}} */ /* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/

3
ext/standard/link.c
View file

@ -158,7 +158,6 @@ PHP_FUNCTION(link)
} }
/* }}} */ /* }}} */
#endif #endif
/* /*
@ -166,4 +165,6 @@ PHP_FUNCTION(link)
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

5
ext/standard/mail.c
View file

@ -12,7 +12,7 @@
| obtain it through the world-wide-web, please send a note to | | obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. | | license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: | | Authors: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
@ -215,5 +215,6 @@ PHP_MINFO_FUNCTION(mail) {}
* tab-width: 4 * tab-width: 4
* c-basic-offset: 4 * c-basic-offset: 4
* End: * End:
* vim: sw=4 ts=4 tw=78 fdm=marker * vim600: sw=4 ts=4 tw=78 fdm=marker
* vim<600: sw=4 ts=4 tw=78
*/ */

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