diff options
| -rw-r--r-- | ext/gd/gd.c | 8 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 2 | ||||
| -rw-r--r-- | ext/openssl/openssl.c | 10 | ||||
| -rw-r--r-- | ext/satellite/object.c | 4 | ||||
| -rw-r--r-- | ext/satellite/php_orbit.c | 14 |
5 files changed, 25 insertions, 13 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 4c75b2a08c..4f39bd7f9c 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -562,7 +562,7 @@ PHP_FUNCTION(imagecreatetruecolor) } /* }}} */ -/* {{{ void ImageTrueColorToPalette(resource im, bool ditherFlag, int colorsWanted) +/* {{{ void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted) Convert a true colour image to a palette based image with a number of colours, optionally using dithering. */ PHP_FUNCTION(imagetruecolortopalette) { @@ -1247,7 +1247,7 @@ PHP_FUNCTION(imagecreatefromxbm) } /* }}} */ -/* {{{ todo int imagecreatefromxpm(string filename) +/* {{{ proto int imagecreatefromxpm(string filename) Create a new image from XPM file or URL */ PHP_FUNCTION(imagecreatefromxpm) { @@ -2631,8 +2631,8 @@ PHP_FUNCTION(imageftbbox) } /* }}} */ -/* {{{ proto array imagettftext(int im, int size, int angle, int x, int y, int col, string font_file, string text, [array extrainfo]) - Write text to the image using a TrueType font */ +/* {{{ proto array imagefttext(int im, int size, int angle, int x, int y, int col, string font_file, string text, [array extrainfo]) + Write text to the image using fonts via freetype2 */ PHP_FUNCTION(imagefttext) { #if HAVE_LIBGD20 && HAVE_LIBFREETYPE && HAVE_GD_STRINGFTEX diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 050c0ae46d..fb3391e5d5 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -1286,7 +1286,7 @@ PHP_FUNCTION(mssql_fetch_array) /* }}} */ -/* {{{ proto array mssql_fetch_array(int result_id [, int result_type]) +/* {{{ proto array mssql_fetch_assoc(int result_id [, int result_type]) Returns an associative array of the current row in the result set specified by result_id */ PHP_FUNCTION(mssql_fetch_assoc) { diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 7121f4d513..79c6dac4f6 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -676,7 +676,7 @@ static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long * r /* }}} */ -/* {{{ proto openssl_x509_export_to_file(mixed x509, string outfilename [, bool notext = true]) +/* {{{ proto bool openssl_x509_export_to_file(mixed x509, string outfilename [, bool notext = true]) Exports a CERT to file or a var */ PHP_FUNCTION(openssl_x509_export_to_file) { @@ -718,7 +718,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) } /* }}} */ -/* {{{ proto openssl_x509_export(mixed x509, string &out [, bool notext = true]) +/* {{{ proto bool openssl_x509_export(mixed x509, string &out [, bool notext = true]) Exports a CERT to file or a var */ PHP_FUNCTION(openssl_x509_export) { @@ -1077,7 +1077,7 @@ PHP_FUNCTION(openssl_x509_read) } /* }}} */ -/* {{{ proto void openssl_free_x509(resource x509) +/* {{{ proto void openssl_x509_free(resource x509) Frees X.509 certificates */ PHP_FUNCTION(openssl_x509_free) { @@ -1285,7 +1285,7 @@ static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource, long } /* }}} */ -/* {{{ proto openssl_csr_export_to_file(resource csr, string outfilename [, bool notext=true]) +/* {{{ proto bool openssl_csr_export_to_file(resource csr, string outfilename [, bool notext=true]) Exports a CSR to file or a var */ PHP_FUNCTION(openssl_csr_export_to_file) { @@ -1326,7 +1326,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) -/* {{{ proto openssl_csr_export(resource csr, string &out [, bool notext=true]) +/* {{{ proto bool openssl_csr_export(resource csr, string &out [, bool notext=true]) Exports a CSR to file or a var */ PHP_FUNCTION(openssl_csr_export) { diff --git a/ext/satellite/object.c b/ext/satellite/object.c index 9c8dbe40b7..dc9236f0f0 100644 --- a/ext/satellite/object.c +++ b/ext/satellite/object.c @@ -853,6 +853,8 @@ OrbitObject_GetProperty_exit: return success; } +/* {{{ proto string satellite_object_to_string(object obj) + Convert an object to its string representation */ PHP_FUNCTION(satellite_object_to_string) { zval **arg = NULL; @@ -892,4 +894,4 @@ PHP_FUNCTION(satellite_object_to_string) error: RETURN_NULL(); } - +/* }}} */ diff --git a/ext/satellite/php_orbit.c b/ext/satellite/php_orbit.c index 5fbef2cc52..3a12bedd00 100644 --- a/ext/satellite/php_orbit.c +++ b/ext/satellite/php_orbit.c @@ -136,7 +136,8 @@ PHP_MINFO_FUNCTION(satellite) DISPLAY_INI_ENTRIES(); } -/* instruct the type manager to load an IDL file if not already loaded */ +/* {{{ proto bool satellite_load_idl(string file) + Instruct the type manager to load an IDL file if not already loaded */ PHP_FUNCTION(satellite_load_idl) { zval * p_parameter; @@ -156,7 +157,10 @@ PHP_FUNCTION(satellite_load_idl) RETURN_BOOL(TypeManager_LoadFile(Z_STRVAL_P(p_parameter))); } +/* }}} */ +/* {{{ proto int satellite_get_repository_id(object obj) + NOT IMPLEMENTED */ /* * NOT IMPLEMENTED * @@ -165,6 +169,7 @@ PHP_FUNCTION(satellite_load_idl) PHP_FUNCTION(satellite_get_repository_id) { } +/* }}} */ /* {{{ proto bool satellite_caught_exception(void) See if an exception was caught from the previous function */ @@ -172,7 +177,10 @@ PHP_FUNCTION(satellite_caught_exception) { RETURN_BOOL(orbit_caught_exception()); } +/* }}} */ +/* {{{ proto string satellite_exception_id(void) + Get exception caught from the previous function */ PHP_FUNCTION(satellite_exception_id) { CORBA_char * p_id = CORBA_exception_id(orbit_get_environment()); @@ -181,6 +189,8 @@ PHP_FUNCTION(satellite_exception_id) } /* }}} */ +/* {{{ proto object satellite_exception_value(void) + Get the exception struct for the latest exception */ /* real name: php_if_orbit_exception_value */ PHP_FUNCTION(satellite_exception_value) { @@ -201,4 +211,4 @@ PHP_FUNCTION(satellite_exception_value) /* create structure with exception data */ orbit_namedvalue_to_zval(&source, return_value); } - +/* }}} */ |