[PHP-CVS] cvs: php4 /ext/standard info.c
zeevSun Mar 4 07:49:38 2001 EDT
Modified files:
/php4/ext/standard info.c
Log:
Fix phpinfo() bug that crept in
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.130 php4/ext/standard/info.c:1.131
--- php4/ext/standard/info.c:1.130 Sat Mar 3 18:41:27 2001
+++ php4/ext/standard/info.cSun Mar 4 07:49:38 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: info.c,v 1.130 2001/03/04 02:41:27 fmk Exp $ */
+/* $Id: info.c,v 1.131 2001/03/04 15:49:38 zeev Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -60,7 +60,7 @@
static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
{
- zval **data, **tmp, *tmp2;
+ zval **data, **tmp, tmp2;
char *string_key;
ulong num_key;
@@ -68,7 +68,6 @@
((*data)-type==IS_ARRAY)) {
zend_hash_internal_pointer_reset((*data)-value.ht);
while (zend_hash_get_current_data((*data)-value.ht, (void **) tmp)
== SUCCESS) {
-
PUTS("TR VALIGN=\"baseline\" BGCOLOR=\"" PHP_CONTENTS_COLOR
"\"");
PUTS("TD BGCOLOR=\"" PHP_ENTRY_NAME_COLOR "\"B");
PUTS(name);
@@ -87,11 +86,11 @@
zend_print_zval_r(*tmp, 0);
PUTS("/PRE");
} else if ((*tmp)-type != IS_STRING) {
- tmp2 = *tmp;
- zval_copy_ctor(tmp2);
- convert_to_string(tmp2);
- PUTS(tmp2-value.str.val);
- zval_dtor(tmp2);
+ tmp2 = **tmp;
+ zval_copy_ctor(tmp2);
+ convert_to_string(tmp2);
+ PUTS(tmp2.value.str.val);
+ zval_dtor(tmp2);
} else {
PUTS((*tmp)-value.str.val);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 /ext/standard info.c
Zeev Suraski wrote: zeevSun Mar 4 07:49:38 2001 EDT Modified files: /php4/ext/standard info.c Log: Fix phpinfo() bug that crept in Now I'm getting these warnings: info.c D:\Programme\MS Visual Studio\Projekte\php\php4\ext\standard\info.c(92) : warning C4047: 'function' : Anzahl der Dereferenzierungen bei 'const char *' und 'char ** ' unterschiedlich D:\Programme\MS Visual Studio\Projekte\php\php4\ext\standard\info.c(92) : warning C4024: 'php_body_write' : Unterschiedliche Typen fuer formalen und uebergebenen Parameter 1 D:\Programme\MS Visual Studio\Projekte\php\php4\ext\standard\info.c(92) : warning C4047: 'function' : Anzahl der Dereferenzierungen bei 'const char *' und 'char ** ' unterschiedlich D:\Programme\MS Visual Studio\Projekte\php\php4\ext\standard\info.c(92) : warning C4024: 'strlen' : Unterschiedliche Typen fuer formalen und uebergebenen Parameter 1 But the crash is gone :-) -- sebastian bergmann e-mail : [EMAIL PROTECTED] homepage : http://www.sebastian-bergmann.de make a gift : http://wishlist.sebastian-bergmann.de measure the usability of your web application - http://phpOpenTracker.de -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard info.c
zeevSun Mar 4 14:03:23 2001 EDT
Modified files:
/php4/ext/standard info.c
Log:
I don't know German, but I imagine that was the problem :)
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.131 php4/ext/standard/info.c:1.132
--- php4/ext/standard/info.c:1.131 Sun Mar 4 07:49:38 2001
+++ php4/ext/standard/info.cSun Mar 4 14:03:23 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: info.c,v 1.131 2001/03/04 15:49:38 zeev Exp $ */
+/* $Id: info.c,v 1.132 2001/03/04 22:03:23 zeev Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -89,7 +89,7 @@
tmp2 = **tmp;
zval_copy_ctor(tmp2);
convert_to_string(tmp2);
- PUTS(tmp2.value.str.val);
+ PUTS(tmp2.value.str.val);
zval_dtor(tmp2);
} else {
PUTS((*tmp)-value.str.val);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard info.c
fmk Sat Mar 3 18:41:27 2001 EDT
Modified files:
/php4/ext/standard info.c
Log:
Changed code layout to remove PHP warning when running php as a CGI.
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.129 php4/ext/standard/info.c:1.130
--- php4/ext/standard/info.c:1.129 Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/info.cSat Mar 3 18:41:27 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: info.c,v 1.129 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: info.c,v 1.130 2001/03/04 02:41:27 fmk Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -60,7 +60,7 @@
static void php_print_gpcse_array(char *name, uint name_length ELS_DC)
{
- zval **data, **tmp;
+ zval **data, **tmp, *tmp2;
char *string_key;
ulong num_key;
@@ -68,16 +68,7 @@
((*data)-type==IS_ARRAY)) {
zend_hash_internal_pointer_reset((*data)-value.ht);
while (zend_hash_get_current_data((*data)-value.ht, (void **) tmp)
== SUCCESS) {
- zval tmp2, *value_ptr;
- if ((*tmp)-type != IS_STRING) {
- tmp2 = **tmp;
- zval_copy_ctor(tmp2);
- convert_to_string(tmp2);
- value_ptr = tmp2;
- } else {
- value_ptr = *tmp;
- }
PUTS("TR VALIGN=\"baseline\" BGCOLOR=\"" PHP_CONTENTS_COLOR
"\"");
PUTS("TD BGCOLOR=\"" PHP_ENTRY_NAME_COLOR "\"B");
PUTS(name);
@@ -95,14 +86,17 @@
PUTS("PRE");
zend_print_zval_r(*tmp, 0);
PUTS("/PRE");
+ } else if ((*tmp)-type != IS_STRING) {
+ tmp2 = *tmp;
+ zval_copy_ctor(tmp2);
+ convert_to_string(tmp2);
+ PUTS(tmp2-value.str.val);
+ zval_dtor(tmp2);
} else {
- PUTS(value_ptr-value.str.val);
+ PUTS((*tmp)-value.str.val);
}
PUTS("/TD/TR\n");
zend_hash_move_forward((*data)-value.ht);
- if (value_ptr==tmp2) {
- zval_dtor(value_ptr);
- }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
