From: Etienne Kneuss Date: Sun, 4 May 2008 21:16:22 +0000 (+0000) Subject: Fix protos X-Git-Tag: RELEASE_2_0_0b1~93 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f4e5fa60aa2874e78754c7ba8a54a0a7ac46cba;p=php Fix protos --- diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 498c3b560a..e66276a98e 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3994,7 +3994,7 @@ PHP_FUNCTION(imagepsslantfont) } /* }}} */ -/* {{{ 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) { diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 06274a4bfd..d7236b4e4b 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -386,7 +386,7 @@ static int _get_lderrno(LDAP *ldap) } /* }}} */ -/* {{{ 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 @@ static int _php_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *in } /* }}} */ -/* {{{ 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) { diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 692b66ca39..534420cb03 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -2176,7 +2176,7 @@ cleanup: } /* }}} */ -/* {{{ 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) { diff --git a/ext/standard/file.c b/ext/standard/file.c index 9e23b9257d..263194712d 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1198,7 +1198,7 @@ PHPAPI PHP_FUNCTION(fgetc) } /* }}} */ -/* {{{ 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) { diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index cf69d9a498..cb6b007667 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -75,7 +75,7 @@ PHP_FUNCTION(stream_socket_pair) /* }}} */ #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 @@ PHP_FUNCTION(stream_socket_client) } /* }}} */ -/* {{{ 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 @@ PHP_FUNCTION(stream_socket_server) } /* }}} */ -/* {{{ 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 @@ PHP_FUNCTION(stream_set_write_buffer) } /* }}} */ -/* {{{ 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) { diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c index 73fb89068c..4dc3042e3b 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -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)