[svn-r16875] Merged changes from the trunk into the branch:

svn merge -r16602:16869 https://svn.hdfgroup.uiuc.edu/hdf5/trunk

Tested on: smirom

4 files changed, 55 insertions, 9 deletions

diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 9bf42b7..0d77850 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -385,8 +385,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -501,7 +501,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index f116e89..6868332 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -105,8 +105,8 @@ static H5_iter_order_t sort_order     = H5_ITER_INC; /*sort_order [ascending | d
  **/
 
 /* module-scoped variables for XML option */
-#define DEFAULT_XSD     "http://hdfgroup.org/DTDs/HDF5-File.xsd"
-#define DEFAULT_DTD     "http://hdfgroup.org/DTDs/HDF5-File.dtd"
+#define DEFAULT_XSD     "http://www.hdfgroup.org/DTDs/HDF5-File.xsd"
+#define DEFAULT_DTD     "http://www.hdfgroup.org/DTDs/HDF5-File.dtd"
 
 static int              doxml = 0;
 static int              useschema = 1;
@@ -4396,8 +4396,8 @@ main(int argc, const char *argv[])
 
                 printf("<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/DTDs/HDF5-File\" "
                     "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-                    "xsi:schemaLocation=\"http://hdfgroup.org/DTDs/HDF5File "
-                    "http://hdfgroup.org/DTDs/HDF5-File.xsd\">\n",xmlnsprefix,ns);
+                    "xsi:schemaLocation=\"http://hdfgroup.org/DTDs/HDF5-File "
+                    "http://www.hdfgroup.org/DTDs/HDF5-File.xsd\">\n",xmlnsprefix,ns);
             }
         } else {
                 printf("<!DOCTYPE HDF5-File PUBLIC \"HDF5-File.dtd\" \"%s\">\n",
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index fc75681..c7e1445 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -91,6 +91,7 @@
 #define FILE61  "textlinksrc.h5"
 #define FILE62  "textlinktar.h5"
 #define FILE63  "textlinkfar.h5"
+#define FILE64  "tarray8.h5"
 
 
 
@@ -121,7 +122,7 @@ set_local_myfilter(hid_t dcpl_id, hid_t tid, hid_t UNUSED sid);
 #define MYFILTER_ID 405
 
 /* This message derives from H5Z */
-const H5Z_class_t H5Z_MYFILTER[1] = {{
+const H5Z_class2_t H5Z_MYFILTER[1] = {{
     H5Z_CLASS_T_VERS,
     MYFILTER_ID,               /* Filter id number      */
     1, 1,
@@ -2812,6 +2813,50 @@ static void gent_array7(void)
     assert(ret >= 0);
 }
 
+static void gent_array8(void)
+{
+    int     *buf;                            /* information to write */
+    hid_t   fid;                             /* HDF5 File ID  */
+    hid_t   did;                             /* dataset ID   */
+    hid_t   sid;                             /* dataspace ID   */
+    hid_t   tid;                             /* datatype ID   */
+    size_t  size;
+    hsize_t sdims[] = {1};
+    hsize_t tdims[] = {H5TOOLS_BUFSIZE / sizeof(int) + 1};
+    int     i;                               
+    herr_t  ret;                             
+
+    size = ( H5TOOLS_BUFSIZE / sizeof(int) + 1 ) * sizeof(int);
+    buf = malloc( size );
+
+    for( i = 0; i < H5TOOLS_BUFSIZE / sizeof(int) + 1; i++)
+        buf[i] = i;
+
+    /* create file */
+    fid = H5Fcreate(FILE64, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* create a type larger than H5TOOLS_BUFSIZE */
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, tdims);
+    size = H5Tget_size(tid);
+    sid = H5Screate_simple(1, sdims, NULL);
+    did = H5Dcreate2(fid, "dset", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    ret = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+    assert(ret >= 0);
+
+
+    /* close */
+    ret = H5Dclose(did);
+    assert(ret >= 0);
+    ret = H5Tclose(tid);
+    assert(ret >= 0);
+    ret = H5Sclose(sid);
+    assert(ret >= 0);
+
+    ret = H5Fclose(fid);
+    assert(ret >= 0);
+    free( buf );
+}
+
 static void gent_empty(void)
 {
     typedef struct {
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 9718bfc..080726f 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -514,6 +514,7 @@ TOOLTEST textlinkfar.ddl textlinkfar.h5
 
 
 
+
 if test $nerrors -eq 0 ; then
    echo "All $DUMPER tests passed."
 fi