jani Sun Aug 3 12:12:46 2008 UTC
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_saproxy.c
/php-src/ext/dom xpath.c
/php-src/ext/fbsql php_fbsql.c
/php-src/ext/pdo_mysql mysql_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/sqlite3/libsqlite sqlite3.c
/php-src/ext/xmlrpc/libxmlrpc xml_to_soap.c
/php-src/ext/xsl xsltprocessor.c
/php-src/main php_variables.c
Log:
- Nuketh C++ comments from C files.
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.46
php-src/ext/com_dotnet/com_handlers.c:1.47
--- php-src/ext/com_dotnet/com_handlers.c:1.46 Mon Dec 31 07:12:08 2007
+++ php-src/ext/com_dotnet/com_handlers.c Sun Aug 3 12:12:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.46 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: com_handlers.c,v 1.47 2008/08/03 12:12:38 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -569,8 +569,8 @@
com_read_dimension,
com_write_dimension,
NULL,
- NULL, //com_object_get,
- NULL, //com_object_set,
+ NULL, /* com_object_get, */
+ NULL, /* com_object_set, */
com_property_exists,
com_property_delete,
com_dimension_exists,
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.24&r2=1.25&diff_format=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.24
php-src/ext/com_dotnet/com_saproxy.c:1.25
--- php-src/ext/com_dotnet/com_saproxy.c:1.24 Mon Dec 31 07:12:08 2007
+++ php-src/ext/com_dotnet/com_saproxy.c Sun Aug 3 12:12:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.24 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: com_saproxy.c,v 1.25 2008/08/03 12:12:38 jani Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -386,8 +386,8 @@
saproxy_read_dimension,
saproxy_write_dimension,
NULL,
- NULL, //saproxy_object_get,
- NULL, //saproxy_object_set,
+ NULL, /* saproxy_object_get, */
+ NULL, /* saproxy_object_set, */
saproxy_property_exists,
saproxy_property_delete,
saproxy_dimension_exists,
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.37 php-src/ext/dom/xpath.c:1.38
--- php-src/ext/dom/xpath.c:1.37 Tue Jan 29 15:55:14 2008
+++ php-src/ext/dom/xpath.c Sun Aug 3 12:12:38 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xpath.c,v 1.37 2008/01/29 15:55:14 sebastian Exp $ */
+/* $Id: xpath.c,v 1.38 2008/08/03 12:12:38 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -211,7 +211,7 @@
} else if ( intern->registerPhpFunctions == 2 &&
zend_u_hash_exists(intern->registered_phpfunctions, Z_TYPE(callable),
Z_UNIVAL(callable), Z_UNILEN(callable) + 1) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to
call handler '%R()'", Z_TYPE(callable), Z_UNIVAL(callable));
- // Push an empty string, so that we at least have a result...
+ /* Push an empty string, so that we at least have a result... */
valuePush(ctxt, xmlXPathNewString((xmlChar *)""));
} else {
result = zend_call_function(&fci, NULL TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.125&r2=1.126&diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.125 php-src/ext/fbsql/php_fbsql.c:1.126
--- php-src/ext/fbsql/php_fbsql.c:1.125 Mon Dec 31 07:12:09 2007
+++ php-src/ext/fbsql/php_fbsql.c Sun Aug 3 12:12:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.125 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: php_fbsql.c,v 1.126 2008/08/03 12:12:38 jani Exp $ */
/* TODO:
*
@@ -903,13 +903,13 @@
{
FBCMetaData *md;
phpLink = (PHPFBLink*)lep->ptr;
- // Check if connection still there.
+ /* Check if connection still there. */
md = fbcdcRollback(phpLink->connection);
if ( !mdOk(phpLink, md, "Rollback;") ) {
if (FB_SQL_G(generateWarnings)) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "FrontBase link is not connected, ty to reconnect");
}
- // Make sure select_db will reconnect.
+ /* Make sure select_db will reconnect. */
fbcmdRelease(md);
fbcdcClose(phpLink->connection);
fbcdcRelease(phpLink->connection);
@@ -2993,7 +2993,7 @@
if (FB_SQL_G(showTimestampDecimals)) {
phpfbestrdup(v, length, value);
}
- // Copy only YYYY-MM-DD HH:MM:SS
+ /* Copy only YYYY-MM-DD HH:MM:SS */
else {
int stringLength = strlen(v);
stringLength = min(stringLength, 19);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.81
php-src/ext/pdo_mysql/mysql_driver.c:1.82
--- php-src/ext/pdo_mysql/mysql_driver.c:1.81 Mon Jul 21 13:05:50 2008
+++ php-src/ext/pdo_mysql/mysql_driver.c Sun Aug 3 12:12:38 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.81 2008/07/21 13:05:50 johannes Exp $ */
+/* $Id: mysql_driver.c,v 1.82 2008/08/03 12:12:38 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -423,7 +423,7 @@
#ifndef PDO_USE_MYSQLND
case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
if (Z_LVAL_P(val) < 0) {
- // TODO - Johannes, can we throw a warning here?
+ /* TODO: Johannes, can we throw a warning here?
*/
((pdo_mysql_db_handle
*)dbh->driver_data)->max_buffer_size = 1024*1024;
PDO_DBG_INF_FMT("Adjusting invalid buffer size
to =%l", ((pdo_mysql_db_handle *)dbh->driver_data)->max_buffer_size);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.383&r2=1.384&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.383 php-src/ext/pgsql/pgsql.c:1.384
--- php-src/ext/pgsql/pgsql.c:1.383 Fri Jul 25 08:53:11 2008
+++ php-src/ext/pgsql/pgsql.c Sun Aug 3 12:12:39 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.383 2008/07/25 08:53:11 dmitry Exp $ */
+/* $Id: pgsql.c,v 1.384 2008/08/03 12:12:39 jani Exp $ */
#include <stdlib.h>
@@ -3399,7 +3399,7 @@
id = PGG(default_link);
CHECK_DEFAULT_LINK(id);
}
- // old calling convention, deprecated since PHP 4.2
+ /* old calling convention, deprecated since PHP 4.2 */
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc
TSRMLS_CC,
"sr",
&file_in, &name_len, &pgsql_link ) == SUCCESS) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Old API is used");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.4
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.5
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.4 Thu Jul 31 00:46:21 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Sun Aug 3 12:12:39 2008
@@ -41,7 +41,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -70,7 +70,7 @@
**
** This file defines various limits of what SQLite can process.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -436,7 +436,7 @@
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -6061,7 +6061,7 @@
** This is the header file for the generic hash-table implemenation
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _SQLITE_HASH_H_
#define _SQLITE_HASH_H_
@@ -6578,7 +6578,7 @@
** subsystem. See comments in the source code for a detailed description
** of what each interface routine does.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _BTREE_H_
#define _BTREE_H_
@@ -6797,7 +6797,7 @@
** or VDBE. The VDBE implements an abstract machine that runs a
** simple program to access and modify the underlying database.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _SQLITE_VDBE_H_
#define _SQLITE_VDBE_H_
@@ -7180,7 +7180,7 @@
** subsystem. The page cache subsystem reads and writes a file a page
** at a time and provides a journal for rollback.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _PAGER_H_
@@ -7603,7 +7603,7 @@
** Source files should #include the sqliteInt.h file and let that file
** include this one indirectly.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -9481,7 +9481,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
**
** SQLite processes all times and dates as Julian Day numbers. The
** dates and times are stored as the number of days since noon
@@ -10971,7 +10971,7 @@
** This file contains the C functions that implement a memory
** allocation subsystem for use by SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -11208,7 +11208,7 @@
** This file contains the C functions that implement a memory
** allocation subsystem for use by SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -11699,7 +11699,7 @@
** This version of the memory allocation subsystem is used if
** and only if SQLITE_MEMORY_SIZE is defined.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -12354,7 +12354,7 @@
** This version of the memory allocation subsystem is used if
** and only if SQLITE_POW2_MEMORY_SIZE is defined.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -12866,7 +12866,7 @@
** implementation is suitable for testing.
** debugging purposes
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifdef SQLITE_MUTEX_NOOP_DEBUG
@@ -12986,7 +12986,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for OS/2
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -13234,7 +13234,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for pthreads
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -13540,7 +13540,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for win32
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -13762,7 +13762,7 @@
** Memory allocation functions used throughout sqlite.
**
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -14920,7 +14920,7 @@
** Random numbers are used by some of the database backends in order
** to generate random integer keys for tables or random filenames.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -15042,7 +15042,7 @@
** This file contains routines used to translate between UTF-8,
** UTF-16, UTF-16BE, and UTF-16LE.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
**
** Notes on UTF-8:
**
@@ -16021,7 +16021,7 @@
** This file contains functions for allocating memory, comparing
** strings, and stuff like that.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -16563,7 +16563,7 @@
u32 a,b,s;
a = *p;
- // a: p0 (unmasked)
+ /* a: p0 (unmasked) */
if (!(a&0x80))
{
*v = a;
@@ -16572,7 +16572,7 @@
p++;
b = *p;
- // b: p1 (unmasked)
+ /* b: p1 (unmasked) */
if (!(b&0x80))
{
a &= 0x7f;
@@ -16585,7 +16585,7 @@
p++;
a = a<<14;
a |= *p;
- // a: p0<<14 | p2 (unmasked)
+ /* a: p0<<14 | p2 (unmasked) */
if (!(a&0x80))
{
a &= (0x7f<<14)|(0x7f);
@@ -16596,41 +16596,41 @@
return 3;
}
- // CSE1 from below
+ /* CSE1 from below */
a &= (0x7f<<14)|(0x7f);
p++;
b = b<<14;
b |= *p;
- // b: p1<<14 | p3 (unmasked)
+ /* b: p1<<14 | p3 (unmasked) */
if (!(b&0x80))
{
b &= (0x7f<<14)|(0x7f);
- // moved CSE1 up
- // a &= (0x7f<<14)|(0x7f);
+ /* moved CSE1 up */
+ /* a &= (0x7f<<14)|(0x7f); */
a = a<<7;
a |= b;
*v = a;
return 4;
}
- // a: p0<<14 | p2 (masked)
- // b: p1<<14 | p3 (unmasked)
- // 1:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked)
- // moved CSE1 up
- // a &= (0x7f<<14)|(0x7f);
+ /* a: p0<<14 | p2 (masked) */
+ /* b: p1<<14 | p3 (unmasked) */
+ /* 1:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
+ /* moved CSE1 up */
+ /* a &= (0x7f<<14)|(0x7f); */
b &= (0x7f<<14)|(0x7f);
s = a;
- // s: p0<<14 | p2 (masked)
+ /* s: p0<<14 | p2 (masked) */
p++;
a = a<<14;
a |= *p;
- // a: p0<<28 | p2<<14 | p4 (unmasked)
+ /* a: p0<<28 | p2<<14 | p4 (unmasked) */
if (!(a&0x80))
{
- // we can skip these cause they were (effectively) done above in calc'ing s
- // a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
- // b &= (0x7f<<14)|(0x7f);
+ /* we can skip these cause they were (effectively) done above in calc'ing
s */
+ /* a &= (0x7f<<28)|(0x7f<<14)|(0x7f); */
+ /* b &= (0x7f<<14)|(0x7f); */
b = b<<7;
a |= b;
s = s>>18;
@@ -16638,19 +16638,19 @@
return 5;
}
- // 2:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked)
+ /* 2:save off p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
s = s<<7;
s |= b;
- // s: p0<<21 | p1<<14 | p2<<7 | p3 (masked)
+ /* s: p0<<21 | p1<<14 | p2<<7 | p3 (masked) */
p++;
b = b<<14;
b |= *p;
- // b: p1<<28 | p3<<14 | p5 (unmasked)
+ /* b: p1<<28 | p3<<14 | p5 (unmasked) */
if (!(b&0x80))
{
- // we can skip this cause it was (effectively) done above in calc'ing s
- // b &= (0x7f<<28)|(0x7f<<14)|(0x7f);
+ /* we can skip this cause it was (effectively) done above in calc'ing s */
+ /* b &= (0x7f<<28)|(0x7f<<14)|(0x7f); */
a &= (0x7f<<14)|(0x7f);
a = a<<7;
a |= b;
@@ -16662,7 +16662,7 @@
p++;
a = a<<14;
a |= *p;
- // a: p2<<28 | p4<<14 | p6 (unmasked)
+ /* a: p2<<28 | p4<<14 | p6 (unmasked) */
if (!(a&0x80))
{
a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
@@ -16674,17 +16674,17 @@
return 7;
}
- // CSE2 from below
+ /* CSE2 from below */
a &= (0x7f<<14)|(0x7f);
p++;
b = b<<14;
b |= *p;
- // b: p3<<28 | p5<<14 | p7 (unmasked)
+ /* b: p3<<28 | p5<<14 | p7 (unmasked) */
if (!(b&0x80))
{
b &= (0x7f<<28)|(0x7f<<14)|(0x7f);
- // moved CSE2 up
- // a &= (0x7f<<14)|(0x7f);
+ /* moved CSE2 up */
+ /* a &= (0x7f<<14)|(0x7f); */
a = a<<7;
a |= b;
s = s>>4;
@@ -16695,10 +16695,10 @@
p++;
a = a<<15;
a |= *p;
- // a: p4<<29 | p6<<15 | p8 (unmasked)
+ /* a: p4<<29 | p6<<15 | p8 (unmasked) */
- // moved CSE2 up
- // a &= (0x7f<<29)|(0x7f<<15)|(0xff);
+ /* moved CSE2 up */
+ /* a &= (0x7f<<29)|(0x7f<<15)|(0xff); */
b &= (0x7f<<14)|(0x7f);
b = b<<8;
a |= b;
@@ -16725,7 +16725,7 @@
u32 a,b;
a = *p;
- // a: p0 (unmasked)
+ /* a: p0 (unmasked) */
#ifndef getVarint32
if (!(a&0x80))
{
@@ -16736,7 +16736,7 @@
p++;
b = *p;
- // b: p1 (unmasked)
+ /* b: p1 (unmasked) */
if (!(b&0x80))
{
a &= 0x7f;
@@ -16748,7 +16748,7 @@
p++;
a = a<<14;
a |= *p;
- // a: p0<<14 | p2 (unmasked)
+ /* a: p0<<14 | p2 (unmasked) */
if (!(a&0x80))
{
a &= (0x7f<<14)|(0x7f);
@@ -16761,7 +16761,7 @@
p++;
b = b<<14;
b |= *p;
- // b: p1<<14 | p3 (unmasked)
+ /* b: p1<<14 | p3 (unmasked) */
if (!(b&0x80))
{
b &= (0x7f<<14)|(0x7f);
@@ -16774,7 +16774,7 @@
p++;
a = a<<14;
a |= *p;
- // a: p0<<28 | p2<<14 | p4 (unmasked)
+ /* a: p0<<28 | p2<<14 | p4 (unmasked) */
if (!(a&0x80))
{
a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
@@ -16977,7 +16977,7 @@
** This is the implementation of generic hash-tables
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/* Turn bulk memory into a hash table object by initializing the
@@ -18329,7 +18329,7 @@
OSTRACE2( "OPEN want %d\n", flags );
- //ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE :
OPEN_ACCESS_READONLY;
+ /* ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE :
OPEN_ACCESS_READONLY; */
if( flags & SQLITE_OPEN_READWRITE ){
ulOpenMode |= OPEN_ACCESS_READWRITE;
OSTRACE1( "OPEN read/write\n" );
@@ -18338,7 +18338,7 @@
OSTRACE1( "OPEN read only\n" );
}
- //ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW :
OPEN_ACTION_FAIL_IF_NEW;
+ /* ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW :
OPEN_ACTION_FAIL_IF_NEW; */
if( flags & SQLITE_OPEN_CREATE ){
ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
OSTRACE1( "OPEN open new/create\n" );
@@ -18347,7 +18347,7 @@
OSTRACE1( "OPEN open existing\n" );
}
- //ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE :
OPEN_SHARE_DENYWRITE;
+ /* ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE :
OPEN_SHARE_DENYWRITE; */
if( flags & SQLITE_OPEN_MAIN_DB ){
ulOpenMode |= OPEN_SHARE_DENYNONE;
OSTRACE1( "OPEN share read/write\n" );
@@ -18359,7 +18359,7 @@
if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL
| SQLITE_OPEN_SUBJOURNAL) ){
char pathUtf8[CCHMAXPATH];
- //ulFileAttribute = FILE_HIDDEN; //for debugging, we want to make sure it
is deleted
+ /* ulFileAttribute = FILE_HIDDEN; //for debugging, we want to make sure
it is deleted */
ulFileAttribute = FILE_NORMAL;
sqlite3OsFullPathname( pVfs, zName, CCHMAXPATH, pathUtf8 );
pFile->pathToDel = convertUtf8PathToCp( pathUtf8 );
@@ -23380,7 +23380,7 @@
** start of a transaction, and is thus usually less than a few thousand,
** but can be as large as 2 billion for a really big database.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#define BITVEC_SZ 512
@@ -23693,7 +23693,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
@@ -29001,7 +29001,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
**
** This file contains code used to implement mutexes on Btree objects.
** This code really belongs in btree.c. But btree.c is getting too
@@ -29021,7 +29021,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -29963,7 +29963,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -38280,7 +38280,7 @@
** to version 2.8.7, all this code was combined into the vdbe.c source file.
** But that file was getting too big so this subroutines were split out.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -42034,7 +42034,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -46949,7 +46949,7 @@
**
** This file contains code used to implement incremental BLOB I/O.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -47296,7 +47296,7 @@
**
*************************************************************************
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
@@ -47539,7 +47539,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -50996,7 +50996,7 @@
** This file contains C code routines that used to generate VDBE code
** that implements the ALTER TABLE command.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -51626,7 +51626,7 @@
*************************************************************************
** This file contains code associated with the ANALYZE command.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_ANALYZE
@@ -52053,7 +52053,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_ATTACH
@@ -52588,7 +52588,7 @@
** systems that do not need this facility may omit it by recompiling
** the library with -DSQLITE_OMIT_AUTHORIZATION=1
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -52832,7 +52832,7 @@
** COMMIT
** ROLLBACK
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -56313,7 +56313,7 @@
** This file contains functions used to access the internal hash tables
** of user defined functions and collation sequences.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -56692,7 +56692,7 @@
** This file contains C code routines that are called by the parser
** in order to generate code for DELETE FROM statements.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -57242,7 +57242,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -58632,7 +58632,7 @@
** This file contains C code routines that are called by the parser
** to handle INSERT statements in SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -60307,7 +60307,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -60472,7 +60472,7 @@
** as extensions by SQLite should #include this file instead of
** sqlite3.h.
**
-** @(#) $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
@@ -61359,7 +61359,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/* Ignore this whole file if pragmas are disabled
@@ -62651,7 +62651,7 @@
** interface, and routines that contribute to loading the database schema
** from disk.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -63455,7 +63455,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
@@ -68244,7 +68244,7 @@
** This file contains C code routines that are called by the parser
** to handle UPDATE statements.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -68926,7 +68926,7 @@
** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
@@ -69200,7 +69200,7 @@
*************************************************************************
** This file contains code used to help implement virtual tables.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -70033,7 +70033,7 @@
** so is applicable. Because this module is responsible for selecting
** indices, you might also think of this module as the "query optimizer".
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -76147,7 +76147,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
/*
@@ -76200,7 +76200,7 @@
**
** The code in this file has been automatically generated by
**
-** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.4
2008/07/31 00:46:21 scottmac Exp $
+** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.5
2008/08/03 12:12:39 jani Exp $
**
** The code in this file implements a function that determines whether
** or not a given identifier is really an SQL keyword. The same thing
@@ -76768,7 +76768,7 @@
** separating it out, the code will be automatically omitted from
** static links that do not use it.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifndef SQLITE_OMIT_COMPLETE
@@ -77039,7 +77039,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: sqlite3.c,v 1.4 2008/07/31 00:46:21 scottmac Exp $
+** $Id: sqlite3.c,v 1.5 2008/08/03 12:12:39 jani Exp $
*/
#ifdef SQLITE_ENABLE_FTS3
/************** Include fts3.h in the middle of main.c ***********************/
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.6
php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.7
--- php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.6 Mon May 28 23:43:24 2007
+++ php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c Sun Aug 3 12:12:45 2008
@@ -379,7 +379,7 @@
else if (!strcmp(type, TOKEN_ARRAY) || arrayType !=
NULL) {
/* determine magic associated with soap array
type.
this is passed down as we recurse, so our
children have access to the info. */
- ai = parse_array_type_info(arrayType); //
alloc'ed ai free'd below.
+ ai = parse_array_type_info(arrayType); /*
alloc'ed ai free'd below.*/
XMLRPC_SetIsVector(xCurrent,
xmlrpc_vector_array);
}
else {
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.64
php-src/ext/xsl/xsltprocessor.c:1.65
--- php-src/ext/xsl/xsltprocessor.c:1.64 Sun May 4 15:13:39 2008
+++ php-src/ext/xsl/xsltprocessor.c Sun Aug 3 12:12:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.64 2008/05/04 15:13:39 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.65 2008/08/03 12:12:45 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -326,7 +326,7 @@
} else if ( intern->registerPhpFunctions == 2 &&
zend_u_hash_exists(intern->registered_phpfunctions, Z_TYPE(callable),
Z_UNIVAL(callable), Z_UNILEN(callable) + 1) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to
call handler '%R()'", Z_TYPE(callable), Z_UNIVAL(callable));
- // Push an empty string, so that we at least have an xslt
result...
+ /* Push an empty string, so that we at least have an xslt
result... */
valuePush(ctxt, xmlXPathNewString(""));
} else {
result = zend_call_function(&fci, NULL TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.146&r2=1.147&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.146 php-src/main/php_variables.c:1.147
--- php-src/main/php_variables.c:1.146 Wed Mar 12 20:53:04 2008
+++ php-src/main/php_variables.c Sun Aug 3 12:12:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.146 2008/03/12 20:53:04 stas Exp $ */
+/* $Id: php_variables.c,v 1.147 2008/08/03 12:12:45 jani Exp $ */
#include <stdio.h>
#include "php.h"
@@ -366,12 +366,12 @@
zend_hash_next_index_insert(symtable1, &gpc_element,
sizeof(zval *), (void **) &gpc_element_p);
} else {
/* UTODO fix for php_addslashes case */
- //char *escaped_index = php_addslashes(index,
index_len, &index_len, 0 TSRMLS_CC);
+ /* char *escaped_index = php_addslashes(index,
index_len, &index_len, 0 TSRMLS_CC); */
zstr escaped_index;
escaped_index.u = index;
zend_u_symtable_update(symtable1, IS_UNICODE,
escaped_index, index_len+1, &gpc_element, sizeof(zval *), (void **)
&gpc_element_p);
- //efree(escaped_index);
+ /* efree(escaped_index); */
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
