From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 10 Oct 2017 05:52:38 +0000 (+0000)
Subject: Merge r1811540, r1811541 from trunk:
X-Git-Tag: 2.4.29~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e985b2bf8e0ba8c914633b589ba5dc3fedc4d09a;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1811540, r1811541 from trunk:

* It needs to be the dereferenced node

* Convert to int before using
Submitted by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1811641 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.gdbinit b/.gdbinit
index 042df453cc9..7f1a5ba979b 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -444,7 +444,7 @@ class DumpPoolAndChilds (gdb.Command):
       if node != 0:
         while node != 0:
           noded = node.dereference()
-          kb = kb + (4 << int(node['index']))
+          kb = kb + (4 << int(noded['index']))
           node = noded['next']
       i = i + 1
     self.total_free_blocks[salloc] = kb
@@ -461,7 +461,7 @@ class DumpPoolAndChilds (gdb.Command):
     done = 0
     while done == 0:
       noded = node.dereference()
-      size = size + (4096 << noded['index'])
+      size = size + (4096 << int(noded['index']))
       free = free + (noded['endp'] - noded['first_avail'])
       nodes = nodes + 1
       node = noded['next']