From: Etienne Kneuss Date: Sun, 4 May 2008 21:17:33 +0000 (+0000) Subject: MFH: Fix protos X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~286 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94697acff9c0e4a1e7ae36cb5de1f577f5f5325b;p=php MFH: Fix protos --- diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8e881faddd..1e48b6ce9a 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4547,7 +4547,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 1c7a00ef98..66d2a33584 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 5a7788fb89..b3a9189815 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -2138,7 +2138,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 5a782d6da6..4b4afced22 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1118,7 +1118,7 @@ PHPAPI PHP_FUNCTION(fgetc) } /* }}} */ -/* {{{ proto string fgetss(resource fp [, int length, string allowable_tags]) +/* {{{ proto string fgetss(resource fp [, int length [, string allowable_tags]]) 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 d8f39fe638..80fe31c5b0 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]) +/* {{{ proto resource stream_socket_client(string remoteaddress [, long &errcode [, string &errstring [, double timeout [, long flags [, resource context]]]]]) Open a client connection to a remote address */ PHP_FUNCTION(stream_socket_client) { @@ -162,7 +162,7 @@ PHP_FUNCTION(stream_socket_client) } /* }}} */ -/* {{{ proto resource stream_socket_server(string localaddress [, long &errcode, string &errstring, long flags, resource context]) +/* {{{ proto resource stream_socket_server(string localaddress [, long &errcode [, string &errstring [, long flags [, resource context]]]]) Create a server socket bound to localaddress */ PHP_FUNCTION(stream_socket_server) { @@ -227,7 +227,7 @@ PHP_FUNCTION(stream_socket_server) } /* }}} */ -/* {{{ proto resource stream_socket_accept(resource serverstream, [ double timeout, string &peername ]) +/* {{{ proto resource stream_socket_accept(resource serverstream, [ double timeout [, string &peername ]]) Accept a client connection from a server socket */ PHP_FUNCTION(stream_socket_accept) { @@ -1312,7 +1312,7 @@ PHP_FUNCTION(stream_set_write_buffer) } /* }}} */ -/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [, int cryptokind, resource sessionstream]) +/* {{{ proto int stream_socket_enable_crypto(resource stream, bool enable [, int cryptokind [, resource sessionstream]]) 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 0438f4967d..d7b5fbb114 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]) +/* {{{ proto string uniqid([string prefix [, bool more_entropy]]) Generates a unique ID */ #ifdef HAVE_GETTIMEOFDAY PHP_FUNCTION(uniqid)