cvs: php4 /ext/standard image.c info.c

derick Mon Jul 1 14:52:30 2002 EDT Modified files: /php4/ext/standard image.c info.c Log: - No C++ comments Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.63 php4/ext/standard/image.c:1.64 --- php4/ext/standard/image.c:1.63 Tue Jun 25 17:22:14 2002 +++ php4/ext/standard/image.c Mon Jul 1 14:52:30 2002 @@ -16,7 +16,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.63 2002/06/25 21:22:14 helly Exp $ */ +/* $Id: image.c,v 1.64 2002/07/01 18:52:30 derick Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -724,7 +724,7 @@ result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo)); - // loop chunks to find BMHD chunk + /* loop chunks to find BMHD chunk */ do { if (php_stream_read(stream, a, 8) != 8) { efree(result); @@ -735,7 +735,7 @@ if ((size & 1) == 1) { size++; } - if (chunkId == 0x424d4844) { // BMHD chunk + if (chunkId == 0x424d4844) { /* BMHD chunk */ if (php_stream_read(stream, a, 9) != 9) { efree(result); return NULL; Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.183 php4/ext/standard/info.c:1.184 --- php4/ext/standard/info.c:1.183 Wed Jun 19 09:24:01 2002 +++ php4/ext/standard/info.c Mon Jul 1 14:52:30 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.183 2002/06/19 13:24:01 sander Exp $ */ +/* $Id: info.c,v 1.184 2002/07/01 18:52:30 derick Exp $ */ #include "php.h" #include "php_ini.h" @@ -145,16 +145,16 @@ dwWindowsMajorVersion, dwWindowsMinorVersion); php_uname = tmp_uname; } else if (mode == 'n') { - // XXX HOW TO GET THIS ON WINDOWS? + /* XXX HOW TO GET THIS ON WINDOWS? */ php_uname = "localhost"; } else if (mode == 'v') { dwBuild = (DWORD)(HIWORD(dwVersion)); snprintf(tmp_uname, sizeof(tmp_uname), "build %d", dwBuild); php_uname = tmp_uname; } else if (mode == 'm') { - // XXX HOW TO GET THIS ON WINDOWS? + /* XXX HOW TO GET THIS ON WINDOWS? */ php_uname = "i386"; - } else { // assume mode == 'a' + } else { /* assume mode == 'a' */ /* Get build numbers for Windows NT or Win95 */ if (dwVersion < 0x80000000){ dwBuild = (DWORD)(HIWORD(dwVersion)); @@ -184,7 +184,7 @@ php_uname = buf.version; } else if (mode == 'm') { php_uname = buf.machine; - } else { // assume mode == 'a' + } else { /* assume mode == 'a' */ snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %s %s %s", buf.sysname, buf.nodename, buf.release, buf.version, buf.machine); @@ -295,12 +295,12 @@ php_info_print_table_row(2, "Registered PHP Streams", stream_protocols_buf); efree(stream_protocols_buf); } else { - // Any chances we will ever hit this? + /* Any chances we will ever hit this? */ php_info_print_table_row(2, "Registered PHP Streams", "no streams registered"); } } else { - // Any chances we will ever hit this? - php_info_print_table_row(2, "PHP Streams", "disabled"); // ?? + /* Any chances we will ever hit this? */ + php_info_print_table_row(2, "PHP Streams", "disabled"); /* ?? */ } }