[svn-r13497] Description:

        Move ref. count of # of links to an object out of the object header's
prefix and make it a header message instead (since it's a "rare" occurence),
eliminating some more space for each object in the file.

        Inserting this "ref. count" message exposed a flaw in the library's
mechanism for locating a message to promote to another chunk and replace
with a continuation message, which required some additional work to fix.
It's still not completely robust, but it's working for more cases now and
detects failures robustly.

        Reduced the minimum size of an object header chunk to just enough to
contain a header message prefix and continuation message.

Tested on:
	FreeBSD/32 6.2 (duty)

9 files changed, 52 insertions, 52 deletions

diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls
index 1e8cd16..378aa0f 100644
--- a/tools/testfiles/h5copytst.out.ls
+++ b/tools/testfiles/h5copytst.out.ls
@@ -6,7 +6,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
     Location:  1:90344
     Links:     1
 /A/B1                    Group
-    Location:  1:91056
+    Location:  1:91048
     Links:     1
 /A/B1/simple             Dataset {6/6}
     Location:  1:90216
@@ -15,50 +15,50 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /A/B2                    Group
-    Location:  1:94600
+    Location:  1:94584
     Links:     1
 /A/B2/simple2            Dataset {6/6}
-    Location:  1:94472
+    Location:  1:94456
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /C                       Group
-    Location:  1:97816
+    Location:  1:97792
     Links:     1
 /C/D                     Group
-    Location:  1:98528
+    Location:  1:98496
     Links:     1
 /C/D/simple              Dataset {6/6}
-    Location:  1:97688
+    Location:  1:97664
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E                       Group
-    Location:  1:103960
+    Location:  1:103920
     Links:     1
 /E/F                     Group
-    Location:  1:113216
+    Location:  1:103960
     Links:     1
 /E/F/grp_dsets           Group
-    Location:  1:100648
+    Location:  1:100608
     Links:     1
 /E/F/grp_dsets/chunk     Dataset {6/6}
-    Location:  1:102784
+    Location:  1:102744
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compact   Dataset {6/6}
-    Location:  1:103240
+    Location:  1:103200
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/compound  Dataset {2/2}
-    Location:  1:103376
+    Location:  1:103336
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
@@ -67,7 +67,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /E/F/grp_dsets/compressed Dataset {6/6}
-    Location:  1:103592
+    Location:  1:103552
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Chunks:    {2} 8 bytes
@@ -75,14 +75,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/named_vl  Dataset {2/2}
-    Location:  1:103808
+    Location:  1:103768
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
-    Type:      shared-1:103760 variable length of
+    Type:      shared-1:103720 variable length of
                    32-bit little-endian integer
 /E/F/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:112280
+    Location:  1:112240
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
@@ -90,43 +90,43 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    variable length of
                        32-bit little-endian integer
 /E/F/grp_dsets/simple    Dataset {6/6}
-    Location:  1:112424
+    Location:  1:112384
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /E/F/grp_dsets/vl        Type
-    Location:  1:103760
+    Location:  1:103720
     Links:     2
-    Type:      shared-1:103760 variable length of
+    Type:      shared-1:103720 variable length of
                    32-bit little-endian integer
 /G                       Group
-    Location:  1:128264
+    Location:  1:128176
     Links:     1
 /G/H                     Group
-    Location:  1:128976
+    Location:  1:128880
     Links:     1
 /G/H/grp_nested          Group
-    Location:  1:115248
+    Location:  1:115160
     Links:     1
 /G/H/grp_nested/grp_dsets Group
-    Location:  1:116040
+    Location:  1:115952
     Links:     1
 /G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
-    Location:  1:118176
+    Location:  1:118088
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Chunks:    {2} 8 bytes
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compact Dataset {6/6}
-    Location:  1:120776
+    Location:  1:120688
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/compound Dataset {2/2}
-    Location:  1:120912
+    Location:  1:120824
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
@@ -135,7 +135,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
-    Location:  1:123224
+    Location:  1:123136
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Chunks:    {2} 8 bytes
@@ -143,14 +143,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
     Filter-0:  deflate-1 OPT {1}
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
-    Location:  1:127536
+    Location:  1:127448
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
-    Type:      shared-1:123392 variable length of
+    Type:      shared-1:123304 variable length of
                    32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
-    Location:  1:127664
+    Location:  1:127576
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
@@ -158,15 +158,15 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    variable length of
                        32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/simple Dataset {6/6}
-    Location:  1:127808
+    Location:  1:127720
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
     Type:      32-bit little-endian integer
 /G/H/grp_nested/grp_dsets/vl Type
-    Location:  1:123392
+    Location:  1:123304
     Links:     2
-    Type:      shared-1:123392 variable length of
+    Type:      shared-1:123304 variable length of
                    32-bit little-endian integer
 /chunk                   Dataset {6/6}
     Location:  1:6216
@@ -471,7 +471,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
                    "str2"             +20   20-byte null-terminated ASCII string
                } 40 bytes
 /simple                  Dataset {6/6}
-    Location:  1:808
+    Location:  1:800
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
     Storage:   <details removed for portability>
diff --git a/tools/testfiles/h5mkgrp_nested.ls b/tools/testfiles/h5mkgrp_nested.ls
index acc3aba..5f3d479 100644
--- a/tools/testfiles/h5mkgrp_nested.ls
+++ b/tools/testfiles/h5mkgrp_nested.ls
@@ -3,8 +3,8 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested.h5" with sec2 driver.
 /one                     Group
-    Location:  1:1520
+    Location:  1:1504
     Links:     1
 /one/two                 Group
-    Location:  1:808
+    Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_latest.ls
index 320e19d..93364de 100644
--- a/tools/testfiles/h5mkgrp_nested_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_latest.ls
@@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver.
 /one                     Group
-    Location:  1:366
+    Location:  1:358
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
 /one/two                 Group
-    Location:  1:207
+    Location:  1:203
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
diff --git a/tools/testfiles/h5mkgrp_nested_mult.ls b/tools/testfiles/h5mkgrp_nested_mult.ls
index 162da0c..99082b6 100644
--- a/tools/testfiles/h5mkgrp_nested_mult.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult.ls
@@ -3,14 +3,14 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_mult.h5" with sec2 driver.
 /one                     Group
-    Location:  1:1520
+    Location:  1:1504
     Links:     1
 /one/two                 Group
-    Location:  1:808
+    Location:  1:800
     Links:     1
 /three                   Group
-    Location:  1:3600
+    Location:  1:3568
     Links:     1
 /three/four              Group
-    Location:  1:2888
+    Location:  1:2864
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_latest.ls
index c3a4cf1..98edd64 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult_latest.ls
@@ -3,18 +3,18 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver.
 /one                     Group
-    Location:  1:366
+    Location:  1:358
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
 /one/two                 Group
-    Location:  1:207
+    Location:  1:203
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
 /three                   Group
-    Location:  1:684
+    Location:  1:668
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
 /three/four              Group
-    Location:  1:525
+    Location:  1:513
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/testfiles/h5mkgrp_several.ls
index e71e7a5..dcbe3eb 100644
--- a/tools/testfiles/h5mkgrp_several.ls
+++ b/tools/testfiles/h5mkgrp_several.ls
@@ -3,8 +3,8 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_several.h5'
 #############################
 Opened "../testfiles/h5mkgrp_several.h5" with sec2 driver.
 /one                     Group
-    Location:  1:808
+    Location:  1:800
     Links:     1
 /two                     Group
-    Location:  1:1848
+    Location:  1:1832
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several_latest.ls b/tools/testfiles/h5mkgrp_several_latest.ls
index f43e6c2..91eff51 100644
--- a/tools/testfiles/h5mkgrp_several_latest.ls
+++ b/tools/testfiles/h5mkgrp_several_latest.ls
@@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_several_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_several_latest.h5" with sec2 driver.
 /one                     Group
-    Location:  1:207
+    Location:  1:203
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
 /two                     Group
-    Location:  1:366
+    Location:  1:358
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX
diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/testfiles/h5mkgrp_single.ls
index 800b002..1f7e828 100644
--- a/tools/testfiles/h5mkgrp_single.ls
+++ b/tools/testfiles/h5mkgrp_single.ls
@@ -3,5 +3,5 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_single.h5'
 #############################
 Opened "../testfiles/h5mkgrp_single.h5" with sec2 driver.
 /single                  Group
-    Location:  1:808
+    Location:  1:800
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_single_latest.ls b/tools/testfiles/h5mkgrp_single_latest.ls
index 72901cf..294db66 100644
--- a/tools/testfiles/h5mkgrp_single_latest.ls
+++ b/tools/testfiles/h5mkgrp_single_latest.ls
@@ -3,6 +3,6 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_single_latest.h5'
 #############################
 Opened "../testfiles/h5mkgrp_single_latest.h5" with sec2 driver.
 /latest                  Group
-    Location:  1:207
+    Location:  1:203
     Links:     1
     Modified:  XXXX-XX-XX XX:XX:XX XXX