From: Jani Taskinen Date: Sun, 3 Aug 2008 12:12:45 +0000 (+0000) Subject: - Nuketh C++ comments from C files. X-Git-Tag: BEFORE_HEAD_NS_CHANGE~890 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9c53d7bcd6291400808e48c4b9690a0414034df;p=php - Nuketh C++ comments from C files. --- diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index fa600755d2..44b945d646 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -569,8 +569,8 @@ zend_object_handlers php_com_object_handlers = { 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, diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 490b6e57ae..a1e61f77cb 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -386,8 +386,8 @@ zend_object_handlers php_com_saproxy_handlers = { 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, diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 231b5516fc..04d3762cd8 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -211,7 +211,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } 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); diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c index b961146157..05b849132f 100644 --- a/ext/fbsql/php_fbsql.c +++ b/ext/fbsql/php_fbsql.c @@ -903,13 +903,13 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { 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 @@ void phpfbColumnAsString(PHPFBResult* result, int column, void* data , int* leng 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); diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 941ab4b532..cbdfbe9642 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -423,7 +423,7 @@ static int pdo_mysql_set_attribute(pdo_dbh_t *dbh, long attr, zval *val TSRMLS_D #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 { diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 331d0b65af..82855ca1d1 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -3399,7 +3399,7 @@ PHP_FUNCTION(pg_lo_import) 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"); diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 5414ddc2e0..d53588137a 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -16563,7 +16563,7 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ u32 a,b,s; a = *p; - // a: p0 (unmasked) + /* a: p0 (unmasked) */ if (!(a&0x80)) { *v = a; @@ -16572,7 +16572,7 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ p++; b = *p; - // b: p1 (unmasked) + /* b: p1 (unmasked) */ if (!(b&0x80)) { a &= 0x7f; @@ -16585,7 +16585,7 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ u32 a,b; a = *p; - // a: p0 (unmasked) + /* a: p0 (unmasked) */ #ifndef getVarint32 if (!(a&0x80)) { @@ -16736,7 +16736,7 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ p++; b = *p; - // b: p1 (unmasked) + /* b: p1 (unmasked) */ if (!(b&0x80)) { a &= 0x7f; @@ -16748,7 +16748,7 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ 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 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ 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); @@ -18329,7 +18329,7 @@ static int os2Open( 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 @@ static int os2Open( 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 @@ static int os2Open( 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 @@ static int os2Open( 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 ); diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c index 76dcc034d9..d2a7f45335 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -379,7 +379,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request, 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 { diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index e4f8983f3e..80942970a5 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -326,7 +326,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t } 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); diff --git a/main/php_variables.c b/main/php_variables.c index 850db25e2c..f823e53bb8 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -366,12 +366,12 @@ plain_var: 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); */ } } }