From: Joe Orton Date: Wed, 30 Mar 2005 13:43:36 +0000 (+0000) Subject: Mark more private functions as static. X-Git-Tag: php-5.0.1b1~652 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6974b5ecced2a19b876e8f088ceba35463759491;p=php Mark more private functions as static. --- diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index 937715d440..ce42d9cf8d 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -30,7 +30,7 @@ #define MAP_PROPERTY_MYG_BOOL_READ(name, value) \ -int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ +static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ { \ ALLOC_ZVAL(*retval); \ ZVAL_BOOL(*retval, MyG(value)); \ @@ -38,14 +38,14 @@ int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ } \ #define MAP_PROPERTY_MYG_BOOL_WRITE(name, value) \ -int name(mysqli_object *obj, zval *value TSRMLS_DC) \ +static int name(mysqli_object *obj, zval *value TSRMLS_DC) \ { \ MyG(value) = Z_LVAL_P(value) > 0; \ return SUCCESS; \ } \ #define MAP_PROPERTY_MYG_LONG_READ(name, value) \ -int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ +static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ { \ ALLOC_ZVAL(*retval); \ ZVAL_LONG(*retval, MyG(value)); \ @@ -53,14 +53,14 @@ int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ } \ #define MAP_PROPERTY_MYG_LONG_WRITE(name, value) \ -int name(mysqli_object *obj, zval *value TSRMLS_DC) \ +static int name(mysqli_object *obj, zval *value TSRMLS_DC) \ { \ MyG(value) = Z_LVAL_P(value); \ return SUCCESS; \ } \ #define MAP_PROPERTY_MYG_STRING_READ(name, value) \ -int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ +static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ { \ ALLOC_ZVAL(*retval); \ ZVAL_STRING(*retval, MyG(value), 1); \ @@ -68,14 +68,14 @@ int name(mysqli_object *obj, zval **retval TSRMLS_DC) \ } \ #define MAP_PROPERTY_MYG_STRING_WRITE(name, value) \ -int name(mysqli_object *obj, zval *value TSRMLS_DC) \ +static int name(mysqli_object *obj, zval *value TSRMLS_DC) \ { \ MyG(value) = Z_STRVAL_P(value); \ return SUCCESS; \ } \ /* {{{ property driver_report_write */ -int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC) +static int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC) { MyG(report_mode) = Z_LVAL_P(value); php_set_error_handling(MyG(report_mode) & MYSQLI_REPORT_STRICT ? EH_THROW : EH_NORMAL, @@ -85,7 +85,7 @@ int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC) /* }}} */ /* {{{ property driver_embedded_read */ -int driver_embedded_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int driver_embedded_read(mysqli_object *obj, zval **retval TSRMLS_DC) { ALLOC_ZVAL(*retval); #ifdef HAVE_EMBEDDED_MYSQLI @@ -98,7 +98,7 @@ int driver_embedded_read(mysqli_object *obj, zval **retval TSRMLS_DC) /* }}} */ /* {{{ property driver_client_version_read */ -int driver_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int driver_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) { ALLOC_ZVAL(*retval); ZVAL_LONG(*retval, MYSQL_VERSION_ID); @@ -107,7 +107,7 @@ int driver_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) /* }}} */ /* {{{ property driver_client_info_read */ -int driver_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int driver_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC) { ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1); @@ -116,7 +116,7 @@ int driver_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC) /* }}} */ /* {{{ property driver_driver_version_read */ -int driver_driver_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int driver_driver_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) { ALLOC_ZVAL(*retval); ZVAL_LONG(*retval, MYSQLI_VERSION_ID); diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 78e95d532d..1462655817 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -129,7 +129,7 @@ static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC) /* }}} */ /* {{{ property link_affected_rows_read */ -int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MY_MYSQL *mysql; my_ulonglong rc; @@ -225,7 +225,7 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, MYSQLI_GET_R /* statement properties */ /* {{{ property stmt_id_read */ -int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MY_STMT *p; @@ -244,7 +244,7 @@ int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC) /* }}} */ /* {{{ property stmt_affected_rows_read */ -int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) +static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC) { MY_STMT *stmt; my_ulonglong rc;