diff options
| -rw-r--r-- | Zend/zend_compile.c | 4 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 2 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 4 | ||||
| -rwxr-xr-x | ext/pdo_mysql/mysql_statement.c | 6 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pdo_pgsql.c | 4 | ||||
| -rw-r--r-- | sapi/apache/sapi_apache.c | 3 | ||||
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/apache_hooks/sapi_apache.c | 3 |
8 files changed, 13 insertions, 15 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 51ed1623d9..39776e4a65 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -241,7 +241,7 @@ static int lookup_cv(zend_op_array *op_array, char* name, int name_len) op_array->size_var += 16; /* FIXME */ op_array->vars = erealloc(op_array->vars, op_array->size_var*sizeof(zend_compiled_variable)); } - op_array->vars[i].name = name; //estrndup(name, name_len); + op_array->vars[i].name = name; /* estrndup(name, name_len); */ op_array->vars[i].name_len = name_len; op_array->vars[i].hash_value = hash_value; return i; @@ -1658,7 +1658,7 @@ void zend_do_begin_catch(znode *try_token, znode *catch_class, znode *catch_var, opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_CATCH; opline->op1 = *catch_class; -/* SET_UNUSED(opline->op1); *//* FIXME: Define IS_CLASS or something like that */ +/* SET_UNUSED(opline->op1); */ /* FIXME: Define IS_CLASS or something like that */ opline->op2 = *catch_var; opline->op1.u.EA.type = 0; /* 1 means it's the last catch in the block */ diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index a270d2b27c..3479d4e732 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -176,7 +176,7 @@ ZEND_METHOD(error_exception, __construct) if (argc >= 4) { zend_update_property_string(default_exception_ce, object, "file", sizeof("file")-1, filename TSRMLS_CC); if (argc < 5) { - lineno = 0; // invalidate lineno + lineno = 0; /* invalidate lineno */ } zend_update_property_long(default_exception_ce, object, "line", sizeof("line")-1, lineno TSRMLS_CC); } diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 69a7b2e5dd..4ffad306ba 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -351,7 +351,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ *ptr = var->sqldata; *len = var->sqllen; break; -// --- cut here --- +/* --- cut here --- */ case SQL_SHORT: *ptr = FETCH_BUF(S->fetch_buf[colno], char, 24, NULL); *len = sprintf(*ptr, "%d", *(short*)var->sqldata); @@ -372,7 +372,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ *ptr = FETCH_BUF(S->fetch_buf[colno], char, 24, NULL); *len = sprintf(*ptr, "%f" , *(double*)var->sqldata); break; -// --- cut here --- +/* --- cut here --- */ #if abies_0 case SQL_SHORT: *ptr = FETCH_BUF(S->fetch_buf[colno], long, 0, *len); diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 11d81136f2..48137dff38 100755 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -67,8 +67,8 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) row_count = mysql_affected_rows(H->server); if (row_count == (my_ulonglong)-1) { - // we either have a query that returned a result set or an error occured - // lets see if we have access to a result set + /* we either have a query that returned a result set or an error occured + lets see if we have access to a result set */ S->result = mysql_use_result(H->server); if (NULL == S->result) { pdo_mysql_error_stmt(stmt); @@ -82,7 +82,7 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) S->fields = mysql_fetch_fields(S->result); } } else { - // this was a DML or DDL query (INSERT, UPDATE, DELETE, ... + /* this was a DML or DDL query (INSERT, UPDATE, DELETE, ... */ stmt->row_count = row_count; } diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index 912e1ed00d..d48bafc5c9 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -79,7 +79,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_pgsql) */ PHP_RINIT_FUNCTION(pdo_pgsql) { - // php_pdo_register_driver(&pdo_pgsql_driver); + /* php_pdo_register_driver(&pdo_pgsql_driver); */ return SUCCESS; } /* }}} */ @@ -88,7 +88,7 @@ PHP_RINIT_FUNCTION(pdo_pgsql) */ PHP_RSHUTDOWN_FUNCTION(pdo_pgsql) { - // php_pdo_unregister_driver(&pdo_pgsql_driver); + /* php_pdo_unregister_driver(&pdo_pgsql_driver); */ return SUCCESS; } /* }}} */ diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 2298d5db95..391d688f1a 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -34,8 +34,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) return FAILURE; } /* sending a file handle to another dll is not working - // so let zend open it. - */ + so let zend open it. */ if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 93334f67c6..298e0470c5 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -95,7 +95,7 @@ static CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_per_ module MODULE_VAR_EXPORT php5_module; int saved_umask; -//static int setup_env = 0; +/* static int setup_env = 0; */ static unsigned char apache_php_initialized; typedef struct _php_per_dir_entry { diff --git a/sapi/apache_hooks/sapi_apache.c b/sapi/apache_hooks/sapi_apache.c index 1b6c9599ac..5b32c249f8 100644 --- a/sapi/apache_hooks/sapi_apache.c +++ b/sapi/apache_hooks/sapi_apache.c @@ -33,8 +33,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) return FAILURE; } /* sending a file handle to another dll is not working - // so let zend open it. - */ + so let zend open it. */ if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; |