[PHP-CVS] svn: /php/php-src/trunk/ .gdbinit

[Greg Beaver]

cellog                                   Thu, 30 Jul 2009 23:13:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286571

Log:
fix hashtable dumping helpers

Changed paths:
    U   php/php-src/trunk/.gdbinit

Modified: php/php-src/trunk/.gdbinit
===================================================================
--- php/php-src/trunk/.gdbinit  2009-07-30 22:11:43 UTC (rev 286570)
+++ php/php-src/trunk/.gdbinit  2009-07-30 23:13:07 UTC (rev 286571)
@@ -321,7 +321,7 @@
                                end
                        else
                                printf "\""
-                               printt $unicode $p->key.arKey.u $p->nKeyLength
+                               printt $p->key.type $p->key.arKey.s 
$p->nKeyLength
                                printf "\" => "
                        end
                else
@@ -346,7 +346,7 @@
 define print_ht
        set $ind = 1
        printf "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
-       ____print_ht $arg0 0 1
+       ____print_ht $arg0 1
        printf "}\n"
 end

@@ -357,7 +357,7 @@
 define print_htptr
        set $ind = 1
        printf "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
-       ____print_ht $arg0 0 0
+       ____print_ht $arg0 0
        printf "}\n"
 end

@@ -368,7 +368,7 @@
 define print_htstr
        set $ind = 1
        printf "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
-       ____print_ht $arg0 0 2
+       ____print_ht $arg0 2
        printf "}\n"
 end

@@ -390,9 +390,13 @@
                        set $i = $i - 1
                end

-               if $p->nKeyLength > 0
+               if $p->nKeyLength > 0
                        printf "\""
-                       printt $unicode $p->key.arKey.u $p->nKeyLength
+                       if ($p->key.arKey.u.s[1] == '\0') {
+                               printu $p->key.arKey.u $p->nKeyLength
+                       } else {
+                               printt $unicode $p->key.arKey.u $p->nKeyLength
+                       }
                        printf "\" => "
                else
                        printf "%d => ", $p->h


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php