[PHP-CVS] cvs: php4 /ext/standard info.c

[Frank M. Kromann]

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.c    Sat 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]