diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index c4a3f16f27a..18ffb909854 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -566,8 +566,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 d852f313f54..393cd01ef46 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/ming/ming.c b/ext/ming/ming.c index b1e966253e8..db74ce3cbe4 100644 --- a/ext/ming/ming.c +++ b/ext/ming/ming.c @@ -2508,7 +2508,7 @@ PHP_METHOD(swffiltermatrix, __construct) } matrix = newSWFFilterMatrix(cols, rows, values); - free(values); // array is copied by libming + free(values); /* array is copied by libming */ ret = zend_list_insert(matrix, le_swffiltermatrixp); object_init_ex(getThis(), filtermatrix_class_entry_ptr); add_property_resource(getThis(), "filtermatrix", ret); @@ -3452,7 +3452,7 @@ PHP_METHOD(swfvideostream, __construct) case 0: stream = newSWFVideoStream(); break; - default: // warn + default: /* warn */ return; } diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 941ab4b532f..cbdfbe9642a 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/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index f8042c529f5..2bd7f4b2c37 100755 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -67,7 +67,7 @@ static int pdo_odbc_utf82ucs2(pdo_stmt_t *stmt, int is_unicode, const char *buf, ret = MultiByteToWideChar(CP_UTF8, 0, buf, buflen, NULL, 0); if (ret == 0) { - //printf("%s:%d %d [%d] %.*s\n", __FILE__, __LINE__, GetLastError(), buflen, buflen, buf); + /*printf("%s:%d %d [%d] %.*s\n", __FILE__, __LINE__, GetLastError(), buflen, buflen, buf);*/ return PDO_ODBC_CONV_FAIL; } @@ -80,7 +80,7 @@ static int pdo_odbc_utf82ucs2(pdo_stmt_t *stmt, int is_unicode, const char *buf, ret = MultiByteToWideChar(CP_UTF8, 0, buf, buflen, (LPWSTR)S->convbuf, S->convbufsize / sizeof(WCHAR)); if (ret == 0) { - //printf("%s:%d %d [%d] %.*s\n", __FILE__, __LINE__, GetLastError(), buflen, buflen, buf); + /*printf("%s:%d %d [%d] %.*s\n", __FILE__, __LINE__, GetLastError(), buflen, buflen, buf);*/ return PDO_ODBC_CONV_FAIL; } diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 16dc1b0d76f..8e762c33949 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -3403,7 +3403,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 5414ddc2e0a..d53588137ae 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/standard/basic_functions.c b/ext/standard/basic_functions.c index 4b2a766711c..205c49217bb 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2972,7 +2972,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_uniqid, 0, 0, 0) ZEND_ARG_INFO(0, more_entropy) ZEND_END_ARG_INFO() #endif -/* }}} *//* {{{ url.c */ +/* }}} */ +/* {{{ url.c */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_url, 0, 0, 1) ZEND_ARG_INFO(0, url) diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c index 07c57087fbe..664e8b77b3f 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/zip/lib/zip_close.c b/ext/zip/lib/zip_close.c index c928b0671af..49ab4c840b0 100644 --- a/ext/zip/lib/zip_close.c +++ b/ext/zip/lib/zip_close.c @@ -147,7 +147,7 @@ zip_close(struct zip *za) de.crc = za->cdir->entry[i].crc; de.comp_size = za->cdir->entry[i].comp_size; de.uncomp_size = za->cdir->entry[i].uncomp_size; - //de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR; + /* de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR; */ } memcpy(cd->entry+j, za->cdir->entry+i, sizeof(cd->entry[j])); } diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 390b672f684..1edc0f9ea3d 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -471,13 +471,13 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) } if(ap_save_brigade(NULL, &pbb->bb, &bb, f->r->pool) != APR_SUCCESS) { - // Bad + /* Bad */ } apr_brigade_cleanup(bb); - // Check to see if the last bucket in this brigade, it not - // we have to wait until then. + /* Check to see if the last bucket in this brigade, it not + * we have to wait until then. */ if(!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(pbb->bb))) { return 0; } @@ -514,8 +514,8 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) apply_config(conf); php_apache_request_ctor(f, ctx TSRMLS_CC); - // It'd be nice if we could highlight based of a zend_file_handle here.... - // ...but we can't. + /* It'd be nice if we could highlight based of a zend_file_handle here.... + * ...but we can't. */ zfd.type = ZEND_HANDLE_STREAM;