colder Sun May 4 21:16:22 2008 UTC
Modified files:
/php-src/ext/gd gd.c
/php-src/ext/ldap ldap.c
/php-src/ext/openssl openssl.c
/php-src/ext/standard file.c streamsfuncs.c uniqid.c
Log:
Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.385&r2=1.386&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.385 php-src/ext/gd/gd.c:1.386
--- php-src/ext/gd/gd.c:1.385 Thu Feb 28 17:43:32 2008
+++ php-src/ext/gd/gd.c Sun May 4 21:16:22 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.385 2008/02/28 17:43:32 felipe Exp $ */
+/* $Id: gd.c,v 1.386 2008/05/04 21:16:22 colder Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3994,7 +3994,7 @@
}
/* }}} */
-/* {{{ proto array imagepstext(resource image, string text, resource font, int
size, int foreground, int background, int xcoord, int ycoord [, int space, int
tightness, float angle, int antialias])
+/* {{{ proto array imagepstext(resource image, string text, resource font, int
size, int foreground, int background, int xcoord, int ycoord [, int space [,
int tightness [, float angle [, int antialias]]]])
Rasterize a string over an image */
PHP_FUNCTION(imagepstext)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.183&r2=1.184&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.183 php-src/ext/ldap/ldap.c:1.184
--- php-src/ext/ldap/ldap.c:1.183 Wed Apr 16 13:19:31 2008
+++ php-src/ext/ldap/ldap.c Sun May 4 21:16:22 2008
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.183 2008/04/16 13:19:31 tony2001 Exp $ */
+/* $Id: ldap.c,v 1.184 2008/05/04 21:16:22 colder Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -237,7 +237,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.183
2008/04/16 13:19:31 tony2001 Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.184
2008/05/04 21:16:22 colder Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -386,7 +386,7 @@
}
/* }}} */
-/* {{{ proto bool ldap_bind(resource link [, string dn, string password])
+/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]])
Bind to LDAP directory */
PHP_FUNCTION(ldap_bind)
{
@@ -496,7 +496,7 @@
}
/* }}} */
-/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn, string
password, string sasl_mech, string sasl_realm, string sasl_authc_id, string
sasl_authz_id, string props])
+/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string
password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [,
string sasl_authz_id [, string props]]]]]]])
Bind to LDAP directory using SASL */
PHP_FUNCTION(ldap_sasl_bind)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.157&r2=1.158&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.157 php-src/ext/openssl/openssl.c:1.158
--- php-src/ext/openssl/openssl.c:1.157 Wed Apr 2 14:35:16 2008
+++ php-src/ext/openssl/openssl.c Sun May 4 21:16:22 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.157 2008/04/02 14:35:16 tony2001 Exp $ */
+/* $Id: openssl.c,v 1.158 2008/05/04 21:16:22 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2176,7 +2176,7 @@
}
/* }}} */
-/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array
configargs, array extraattribs])
+/* {{{ proto bool openssl_csr_new(array dn, resource &privkey [, array
configargs [, array extraattribs]])
Generates a privkey and CSR */
PHP_FUNCTION(openssl_csr_new)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.517&r2=1.518&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.517 php-src/ext/standard/file.c:1.518
--- php-src/ext/standard/file.c:1.517 Mon Mar 31 22:44:38 2008
+++ php-src/ext/standard/file.c Sun May 4 21:16:22 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.517 2008/03/31 22:44:38 iliaa Exp $ */
+/* $Id: file.c,v 1.518 2008/05/04 21:16:22 colder Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1198,7 +1198,7 @@
}
/* }}} */
-/* {{{ proto string fgetss(resource fp [, int lengthish, string
allowable_tags]) U
+/* {{{ proto string fgetss(resource fp [, int lengthish [, string
allowable_tags]]) U
Get a line from file pointer and strip HTML tags */
PHPAPI PHP_FUNCTION(fgetss)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.114&r2=1.115&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.114
php-src/ext/standard/streamsfuncs.c:1.115
--- php-src/ext/standard/streamsfuncs.c:1.114 Sun Apr 13 22:40:35 2008
+++ php-src/ext/standard/streamsfuncs.c Sun May 4 21:16:22 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.114 2008/04/13 22:40:35 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.115 2008/05/04 21:16:22 colder Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -75,7 +75,7 @@
/* }}} */
#endif
-/* {{{ proto resource stream_socket_client(string remoteaddress [, long
&errcode, string &errstring, double timeout, long flags, resource context]) U
+/* {{{ proto resource stream_socket_client(string remoteaddress [, long
&errcode [, string &errstring [, double timeout [, long flags [, resource
context]]]]]) U
Open a client connection to a remote address */
PHP_FUNCTION(stream_socket_client)
{
@@ -163,7 +163,7 @@
}
/* }}} */
-/* {{{ proto resource stream_socket_server(string localaddress [, long
&errcode, string &errstring, long flags, resource context]) U
+/* {{{ proto resource stream_socket_server(string localaddress [, long
&errcode [, string &errstring [, long flags [, resource context]]]]) U
Create a server socket bound to localaddress */
PHP_FUNCTION(stream_socket_server)
{
@@ -229,7 +229,7 @@
}
/* }}} */
-/* {{{ proto resource stream_socket_accept(resource serverstream, [ double
timeout, string &peername ]) U
+/* {{{ proto resource stream_socket_accept(resource serverstream, [ double
timeout [, string &peername ]]) U
Accept a client connection from a server socket */
PHP_FUNCTION(stream_socket_accept)
{
@@ -1467,7 +1467,7 @@
}
/* }}} */
-/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [,
int cryptokind, resource sessionstream]) U
+/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [,
int cryptokind [, resource sessionstream]]) U
Enable or disable a specific kind of crypto on the stream */
PHP_FUNCTION(stream_socket_enable_crypto)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/standard/uniqid.c
diff -u php-src/ext/standard/uniqid.c:1.50 php-src/ext/standard/uniqid.c:1.51
--- php-src/ext/standard/uniqid.c:1.50 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/uniqid.c Sun May 4 21:16:22 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uniqid.c,v 1.50 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: uniqid.c,v 1.51 2008/05/04 21:16:22 colder Exp $ */
#include "php.h"
@@ -38,7 +38,7 @@
#include "php_lcg.h"
#include "uniqid.h"
-/* {{{ proto string uniqid([string prefix , bool more_entropy]) U
+/* {{{ proto string uniqid([string prefix [, bool more_entropy]]) U
Generates a unique ID */
#ifdef HAVE_GETTIMEOFDAY
PHP_FUNCTION(uniqid)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
