Mercurial > hg > octave-nkf

diff src/ov-list.cc @ 4696:fcab389ad291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-01-15 02:11:59 by jwe]
author jwe
date Thu, 15 Jan 2004 02:11:59 +0000
parents e95c86d48732
children aef1e2d57055
line wrap: on
line diff
--- a/src/ov-list.cc
+++ b/src/ov-list.cc
@@ -677,11 +677,20 @@
 
   hdf5_callback_data dsub;
 
-  herr_t retval2;
+  herr_t retval2 = -1;
   octave_value_list lst;
   int current_item = 0;
+#ifdef HAVE_H5GGET_NUM_OBJS
+  hsize_t num_obj = 0;
+  H5Gget_num_objs (loc_id, &num_obj);
+
+  while (current_item < static_cast<int> (num_obj)
+	 && (retval2 = H5Giterate (loc_id, name, &current_item,
+				   hdf5_read_next_data, &dsub)) > 0)
+#else
   while ((retval2 = H5Giterate (loc_id, name, &current_item,
 				hdf5_read_next_data, &dsub)) > 0)
+#endif
     {
       lst.append (dsub.tc);