sniper Tue Apr 19 07:41:05 2005 EDT
Modified files:
/ZendEngine2 zend_compile.c zend_exceptions.c
/php-src/ext/pdo_firebird firebird_statement.c
/php-src/ext/pdo_mysql mysql_statement.c
/php-src/ext/pdo_pgsql pdo_pgsql.c
/php-src/sapi/apache sapi_apache.c
/php-src/sapi/apache_hooks mod_php5.c sapi_apache.c
Log:
No c++ comments in C code
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.c?r1=1.616&r2=1.617&ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.616 ZendEngine2/zend_compile.c:1.617
--- ZendEngine2/zend_compile.c:1.616 Thu Mar 10 08:20:25 2005
+++ ZendEngine2/zend_compile.c Tue Apr 19 07:41:02 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.616 2005/03/10 13:20:25 helly Exp $ */
+/* $Id: zend_compile.c,v 1.617 2005/04/19 11:41:02 sniper Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -241,7 +241,7 @@
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 @@
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
*/
http://cvs.php.net/diff.php/ZendEngine2/zend_exceptions.c?r1=1.75&r2=1.76&ty=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.75 ZendEngine2/zend_exceptions.c:1.76
--- ZendEngine2/zend_exceptions.c:1.75 Tue Dec 7 02:46:12 2004
+++ ZendEngine2/zend_exceptions.c Tue Apr 19 07:41:03 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.75 2004/12/07 07:46:12 dmitry Exp $ */
+/* $Id: zend_exceptions.c,v 1.76 2005/04/19 11:41:03 sniper Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -176,7 +176,7 @@
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);
}
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/pdo_firebird/firebird_statement.c
diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.16
php-src/ext/pdo_firebird/firebird_statement.c:1.17
--- php-src/ext/pdo_firebird/firebird_statement.c:1.16 Sun Feb 6 20:21:56 2005
+++ php-src/ext/pdo_firebird/firebird_statement.c Tue Apr 19 07:41:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_statement.c,v 1.16 2005/02/07 01:21:56 wez Exp $ */
+/* $Id: firebird_statement.c,v 1.17 2005/04/19 11:41:04 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -351,7 +351,7 @@
*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 @@
*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);
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.22
php-src/ext/pdo_mysql/mysql_statement.c:1.23
--- php-src/ext/pdo_mysql/mysql_statement.c:1.22 Sun Feb 27 15:34:36 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Tue Apr 19 07:41:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.22 2005/02/27 20:34:36 hholzgra Exp $ */
+/* $Id: mysql_statement.c,v 1.23 2005/04/19 11:41:04 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -67,8 +67,8 @@
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 @@
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;
}
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pdo_pgsql.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo_pgsql/pdo_pgsql.c
diff -u php-src/ext/pdo_pgsql/pdo_pgsql.c:1.2
php-src/ext/pdo_pgsql/pdo_pgsql.c:1.3
--- php-src/ext/pdo_pgsql/pdo_pgsql.c:1.2 Wed Feb 9 00:04:40 2005
+++ php-src/ext/pdo_pgsql/pdo_pgsql.c Tue Apr 19 07:41:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_pgsql.c,v 1.2 2005/02/09 05:04:40 wez Exp $ */
+/* $Id: pdo_pgsql.c,v 1.3 2005/04/19 11:41:04 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -79,7 +79,7 @@
*/
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_RSHUTDOWN_FUNCTION(pdo_pgsql)
{
- // php_pdo_unregister_driver(&pdo_pgsql_driver);
+ /* php_pdo_unregister_driver(&pdo_pgsql_driver); */
return SUCCESS;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/sapi/apache/sapi_apache.c?r1=1.45&r2=1.46&ty=u
Index: php-src/sapi/apache/sapi_apache.c
diff -u php-src/sapi/apache/sapi_apache.c:1.45
php-src/sapi/apache/sapi_apache.c:1.46
--- php-src/sapi/apache/sapi_apache.c:1.45 Thu Jan 8 03:18:03 2004
+++ php-src/sapi/apache/sapi_apache.c Tue Apr 19 07:41:04 2005
@@ -19,7 +19,7 @@
| Stig Bakken <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.45 2004/01/08 08:18:03 andi Exp $ */
+/* $Id: sapi_apache.c,v 1.46 2005/04/19 11:41:04 sniper Exp $ */
#include "php_apache_http.h"
@@ -34,8 +34,7 @@
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;
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.8&r2=1.9&ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.8
php-src/sapi/apache_hooks/mod_php5.c:1.9
--- php-src/sapi/apache_hooks/mod_php5.c:1.8 Mon Apr 4 11:06:36 2005
+++ php-src/sapi/apache_hooks/mod_php5.c Tue Apr 19 07:41:04 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.8 2005/04/04 15:06:36 hirokawa Exp $ */
+/* $Id: mod_php5.c,v 1.9 2005/04/19 11:41:04 sniper Exp $ */
#include "php_apache_http.h"
@@ -95,7 +95,7 @@
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 {
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/sapi_apache.c?r1=1.7&r2=1.8&ty=u
Index: php-src/sapi/apache_hooks/sapi_apache.c
diff -u php-src/sapi/apache_hooks/sapi_apache.c:1.7
php-src/sapi/apache_hooks/sapi_apache.c:1.8
--- php-src/sapi/apache_hooks/sapi_apache.c:1.7 Thu Jan 8 03:18:06 2004
+++ php-src/sapi/apache_hooks/sapi_apache.c Tue Apr 19 07:41:04 2005
@@ -19,7 +19,7 @@
| Stig Bakken <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.7 2004/01/08 08:18:06 andi Exp $ */
+/* $Id: sapi_apache.c,v 1.8 2005/04/19 11:41:04 sniper Exp $ */
#include "php_apache_http.h"
@@ -33,8 +33,7 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
