Commit Graph

110 Commits

Author SHA1 Message Date
Bill Wendling
815e70db63 [svn-r2956] Purpose:
Backing out fix
Description:
	The fix I inserted didn't work on all platforms. I'm backing it
	out.
2000-11-16 16:35:59 -05:00
Bill Wendling
0593d93314 [svn-r2950] Purpose:
Bug fix
Description:
	The output of floating point dumps wasn't necessarily standard.
	The h5ls utility does it in a better way.
Solution:
	Changed the output parameters from %g to %1.*g and added the
	appropriate FLT_DIG/DBL_DIG parameter for the `*' in the above.
Platforms tested:
	Linux
2000-11-16 12:49:26 -05:00
Quincey Koziol
825e9ff8ff [svn-r2922] Purpose:
Bug fix
Description:
    [Most] SGIs failed on dumping VL data during the daily tests they
    seem to be initializing variables differently, exposing a bug in dumping
    datasets with scalar dataspaces.

    Also, clean up code to get rid of compiler warnings.
Solution:
    Initilialize variable correctly.
Platforms tested:
    SGI IRIX 6.5 (paz)
2000-11-15 12:12:03 -05:00
Quincey Koziol
f1410eb099 [svn-r2908] Purpose:
Bug fix.
Description:
    VL datatype dumping was not working correctly on most machines because
    the "native" version of the variable-length type wasn't being generated
    for the printing process.

    Re-enabled VL dumping test
Solution:
    Generate "native" version of the VL datatype to read in for printing,
    also some code cleanup in the VL dumping algorithm.
Platforms tested:
    FreeBSD 4.1.1 (hawkwind) & Solaris 2.6 (baldric)
2000-11-14 18:48:59 -05:00
Bill Wendling
36acd5381e [svn-r2896] Purpose:
Formatting
2000-11-14 15:13:28 -05:00
Bill Wendling
9703fa02b7 [svn-r2895] Purpose:
Small purify warning fixes
Description:
	Removes some purify warning fixes and memory leakage.
Platforms tested:
	Solaris
2000-11-14 15:12:55 -05:00
Bill Wendling
7b5c102536 [svn-r2878] Purpose:
Feature
Description:
	Variable length data dumping for simple (i.e., either SCALAR or
	1-Dim array variable length datatypes) should work. Added to the
	tests...
Platforms tested:
	Linux
2000-11-13 12:17:04 -05:00
Quincey Koziol
6c603f3e77 [svn-r2875] Purpose:
Code cleanup
Description:
    Eliminated some warnings on O2K platform.
Platforms tested:
    SGI O2K (modi4)
2000-11-13 12:03:59 -05:00
Quincey Koziol
04223a18f4 [svn-r2866] Purpose:
Code cleanup
Description:
    Found more "Have_foo" usage and converted them to "H5_HAVE_foo"
Platforms tested:
    FreeBSD 4.1.1 (hawkwind)
2000-11-11 10:58:12 -05:00
Quincey Koziol
3499de1b53 [svn-r2845] Purpose:
New Feature
Description:
    Added dumping array datatypes to h5dump and the tool library.
Platforms tested:
    FreeBSD 4.1.1 (hawkwind)
2000-11-09 16:48:33 -05:00
Bill Wendling
796b4daf83 [svn-r2842] Purpose:
Recoding of VL dumping.
Description:
	I'm using hyperslabs to select the variable length data. I don't
	have any tests which I've checked in just yet. I'll create those
	later.
Platforms tested:
	Linux
2000-11-09 13:59:41 -05:00
Albert Cheng
48b4b45481 [svn-r2790] Purpose:
new feature
Description:
h5tools.c:
    Created h5tools_init() and h5tools_close() for the initialization
    of the h5tools library and closing of it.  With this, the rawdatastream
    and other internal structures can be initialized properly.
h5tools.h:
    added prototypes for h5tools_init and h5tools_close.
h5dump.c:
h5ls.c:
    Added the calls for h5tools_init() and h5tools_close().
Platforms tested:
    IRIX64 -64 parallel and Linux
2000-11-01 23:59:51 -05:00
Bill Wendling
972b9252b8 [svn-r2771] Purpose:
Reformatting
Platforms tested:
	Linux
2000-10-31 11:32:21 -05:00
Robb Matzke
3c2dfa4bab [svn-r2767] ./hdf5/tools/h5tools.c
* 2000-10-31 Robb Matzke  <matzke@llnl.gov> (h5dump_sprint)
	The whitespace added for
	indentation after the line-feed kludge is performed only if a
	line-feed was actually inserted.  This fixes funny-looking h5ls
	output that had `    %s' sequences appearing in nested compound
	datatypes.
	Also added a prominent warning in the code to indicate that when a
	line-feed is inserted into the string that column number
	calculations will be incorrect and object indices will be missing.
2000-10-31 11:18:45 -05:00
Bill Wendling
47c0884e1f [svn-r2737] Purpose:
Feature
Description:
	Allow dumping of variable length records. This is a first-time
	stab at this. It doesn't break any tests on my Linux box and it
	does output the variable length data, but it might look ugly (it
	doesn't handle new-lines as of yet)...I'm open to suggestions on
	what should be done next, what new features to add/remove...
Platforms tested:
	Linux
2000-10-25 14:07:05 -05:00
Bill Wendling
ea7f4421f9 [svn-r2634] Purpose:
Bug fix
Description:
	In the h5dump_fixtype function, when users created a COMPOUND
	datatype, the alignment would be off somewhat.
Solution:
	The alignment was being set after insertion. I changed this code:

	for (i = 0, offset = 0; i < nmembs; i++) {
	    H5Tinsert_array(m_type, name[i], offset, ndims[i], dims + i * 4,
			    NULL, memb[i]);

	    for (j = 0, nelmts = 1; j < ndims[i]; j++)
		    nelmts *= dims[i * 4 + j];

            offset = ALIGN(offset, H5Tget_size(memb[i])) +
	    			nelmts * H5Tget_size(memb[i]);
	}

	to:

	for (i = 0, offset = 0; i < nmembs; i++) {
            if (offset)
                offset = ALIGN(offset, H5Tget_size(memb[i]));

	    H5Tinsert_array(m_type, name[i], offset, ndims[i], dims + i * 4,
			    NULL, memb[i]);

	    for (j = 0, nelmts = 1; j < ndims[i]; j++)
		    nelmts *= dims[i * 4 + j];

	    offset += nelmts * H5Tget_size(memb[i]);
	}

	The alignment is now calculated before the insertion.
Platforms tested:
	Solaris, Linux
2000-10-05 11:56:30 -05:00
Albert Cheng
375e1d4d77 [svn-r2626] Purpose:
New Feature
Description:
    Add -o option to h5dumper. It displays the raw data of datasets to a
    separate output file.
    Add a feature to h5tools library that it uses the FILE *rawdatastream
    as the stream for the display of datasets raw data.
Solution:
    Define an "extern FILE *rawdatastream" in h5tools.h
    and declare it in h5tools.c.  This way, it would work
    even if an application does not explicitely declare it.
    Tried to initialized it to stdout as
	FILE *rawdatastream = stdout;
    but Linux gcc rejected it though all other platforms+compilers
    accepted it fine.  For now, put in a kludge to set it right
    before it is used.  Need a safer way to initialize it.
Platforms tested:
    arabica, eirene, modi4 -64.
2000-09-30 12:27:18 -05:00
Thomas Radke
b374a9c504 [svn-r2563] Purpose:
Added the Stream Virtual File Driver to the list of drivers
     used for trying to open a file via h5dump_fopen().

Description:
     The Stream VFD was added at bottom of the driver list for h5dump_fopen().
     If no driver succeeded to open a file given by its filename
     the Stream VFD would try to do so by parsing the filename as an
     'hostname:port' argument, open a socket to that address and read
     read the file.

     This feature can be used to h5ls/h5dump streamed files.

Platforms:
     All platforms (also between heterogenous).
2000-09-15 07:05:41 -05:00
Bill Wendling
52857497ee [svn-r2467] Changed type so that compiler warnings about implicit conversion were
removed.
2000-08-04 17:17:23 -05:00
Bill Wendling
facbe5ba38 [svn-r2460] Fixed some comparisons between signed and unsigned values. Made some of
the functions prototypes so that the compiler wouldn't complain about
them.
2000-08-04 15:41:26 -05:00
Robb Matzke
96f9f1859b [svn-r2412] Fixed a variety of problems with the new H5ToolsFopen() function.
1. The `driver' table is initialized only once, making it faster and
     leaking less memory.
  2. The returned driver name is set to the empty string on failure.
  3. Added an argument so the function cannot overwrite the end of the
     drivername return value.
  4. Avoids core dump when assigning driver name to return value if the
     file could not be opened by any driver.
  5. Changed name of function to h5dump_fopen() to follow the naming
     scheme for this source file.
  6. Reindented according to hdf5 code standard.
  7. Added `const' qualifiers to read-only formals.
  8. Removed duplicate forward declaration.

Reindented some parts of these source files that had very odd indentation
(some lines had no indentation while others had 3x what they should).

Fixed calls to H5ToolsFopen() function.
2000-06-23 12:52:21 -05:00
Patrick Lu
6e7c3212d3 [svn-r2359] added the comments back to the part of the code that is setting up the file
drivers array.
2000-06-07 12:39:57 -05:00
Patrick Lu
4d16bcfecb [svn-r2341] took the code out of h5ls to open files using different drivers and created a function in the tools
library for it(H5ToolsFopen-takes a filename and a char ptr if you want the name of the driver)

added the function to h5tools.c, a header to h5tools.h and changed h5ls.c and h5dump.c to use the new
functions
2000-06-06 13:07:20 -05:00
Patrick Lu
69ca8832e6 [svn-r2290] fixed the indenting error related to compound types. 2000-05-25 12:08:45 -05:00
Patrick Lu
1f6bb057e0 [svn-r2256] same changes i did for the release version. (fixed bug in dangermouse... added
an extra conditional)
2000-05-16 11:57:46 -05:00
Albert Cheng
0662396e13 [svn-r2243] h5dump.c: Removed some Carriage-return's
h5tools.c h5tools.h:
    Modified print_version() to use const char * argument instead.
2000-05-11 17:18:44 -05:00
Robb Matzke
7a52d6ce9b [svn-r2180] ./src/tools/h5tools.c
Added hyphen to version printf format.

	./src/tools/h5ls.c
		Calls print_version() instead of doing it by hand.
2000-04-21 14:28:09 -05:00
Patrick Lu
8a006fd0ca [svn-r2167] i removed unneeded code from the tool lib.
from h5tools.h just got rid of a prototype for copy_atmoic_char which was never used

in the h5tools.c i removed the copy_atomic_char, all the display_*_data, where the * is numeric, string
or compound, the print_data, h5dump_attr. also removed a block of codfe that was surrounded by #if 0
2000-04-20 11:53:57 -05:00
Quincey Koziol
7438609ee2 [svn-r2162] Various small fixes to address SGI compiler warnings. 2000-04-19 18:11:06 -05:00
Patrick Lu
395326672c [svn-r2156] changed a comment that is no longer relevant and moved some code around in the dump_simple_prefix
funtion.  all i did was take some code that was common to both the if and then conditions out.
2000-04-19 13:14:36 -05:00
Patrick Lu
173260ac41 [svn-r2155] fixed the error in the h5ls output. it is now printing like it did before the tools lib merge.
prints the index numbers.  moved the lines that were doing indenting into the conditionals.
2000-04-19 13:08:11 -05:00
Robb Matzke
d9b36b8a7f [svn-r2089] ** tools/h5ls.c
Prints the subrelease name also.

** tools/h5tools.c
	Fixed indentation problems in the first half of the file.

	Changed conditional compilation style from `/*...*/' to use
	#if 0/#endif in the first half of this file.

	Removed some extra parentheses to make expressions more readable.
2000-04-07 10:27:48 -05:00
Patrick Lu
4972a63a8e [svn-r1985] fixed the bug with the memory alignment error 2000-02-22 14:32:48 -05:00
Albert Cheng
1fdf079abc [svn-r1974] Added const to the h5dump_region third argument to quite a compiler
complain and it is more correct this way too.
2000-02-18 07:26:59 -05:00
Patrick Lu
6a2bc2f4aa [svn-r1973] fixed the dataset regions problem with the dumper.
now the dump structure contains 2 extra members that tell how to format the
data for the dataset regions(blocks and pts).
had to give h5ls values for these
2000-02-17 13:35:30 -05:00
Patrick Lu
232a032d54 [svn-r1969] fixed a bug with the objrefs. added a format string to the dump struct to
display the format for the obj refs.
2000-02-17 10:28:55 -05:00
Patrick Lu
9f06c8ee5a [svn-r1966]
removed some commented code.
2000-02-16 12:50:11 -05:00
Patrick Lu
5a91414d6e [svn-r1956] in h5tools.h I added a fwe new members to the struct for the formatting.
in h5dump.c just initialized the values for the formatting struct.
in h5tools.c made some changes in the printing area to get the dump output to
look closer to what we wanted.  the strings are currently not printing correctly.
also removed the program type variable from here.
2000-02-15 10:45:35 -05:00
Patrick Lu
84d1dd0f92 [svn-r1933] took the functions out of the h5findshd.c and put them into this file 2000-01-06 12:32:16 -05:00
Albert Cheng
f30439d592 [svn-r1870] h5dump.c:
Added -V option for displaying version information.
h5tools.c:
    Added print_version routine to display version information.
h5tools.h:
    Added print_version prototype.
1999-12-10 15:44:04 -05:00
Patrick Lu
4ed4c8fb47 [svn-r1852] fixed a bug that i introduced with the last change to this file. 1999-12-03 14:43:56 -05:00
Patrick Lu
78cd5541bf [svn-r1851] updated the output for the dumper so that it prints out compound types
with out the square braces.  also the formatting for the compound types
in the dataset part section has been corrected.

still need to update the expected outputs so there will be some errors until
I get that all checked in...
1999-12-03 14:26:25 -05:00
Patrick Lu
c865c80878 [svn-r1839] added support for displaying nested compound data. 1999-11-18 10:17:37 -05:00
Quincey Koziol
9648d22f5f [svn-r1837] Cleaned up a few warnings from the SGI compiler. 1999-11-17 17:00:15 -05:00
Patrick Lu
cf31634884 [svn-r1805] more changes. I found some duplicate functions in the library and the dumper.
so i moved the dumper stuff out to the libary.  Had to change some functions
in h5findshd so they would stop using globals that shouldn't be defined in the
lib.  I will remove the globals next.  also the h5findshd.c has an extra member
to the struct for that objects in the table so i added that into the appropriate place.

the dumper is working ok now but the h5toh4 is still broken.
1999-11-02 12:11:37 -05:00
Patrick Lu
23ab35a5a7 [svn-r1800] moved the code from the dumper that iterates thru the files and stores the info
into the tables into the tools lib.

h5findshd-had some of the same functions so i removed them for now
1999-10-29 14:50:25 -05:00
Patrick Lu
5246411f70 [svn-r1744] i removed an extra function that wasn't being used 1999-10-13 11:08:26 -05:00
Robb Matzke
20e748496e [svn-r1732] Changes since 19991007
----------------------

./src/H5FDcore.c
	Includes private headers instead of public in order to use the
	`UNUSED' macro.

./src/H5FDpublic.h
	Includes H5public.h just in case.

./src/H5P.c
	Removed two unused variables in H5P_copy()

./src/H5FDgass.h
	Fixed a C++ comment after a `#endif'

./src/Makefile.in
	The H5FDgass.h file is public and must be installed in order for
	applications to be able to use HDF5.

./tools/h5tools.c
	Removed an unused variable.
1999-10-07 11:51:49 -05:00
Robb Matzke
bdf0dbf7ed [svn-r1697] Changes since 19990915
----------------------

./src/H5public.h
	We undefine a bunch of things that could get redefined in the config
	file because some customers have applications that include headers
	from multiple packages, all of which might be using autoconf.

	Include <stdint.h> for the C9x types.

./test/h5test.h
	More flushing of stdout for when testing is redirected down a pipe.

./tools/h5ls.c
	Added a `-S' or `--simple' switch which causes the output to be
	simplified somewhat for easier parsing by other scripts. For instance,
	characters are escaped using a very simple mechanism instead of C's
	more complicated backslash notation, data doesn't have `{}' or `[]'
	characters interspersed for compound and array types, and data is
	printed with exactly one element per line.  This switch is now used by
	an HDF5-to-HTML CGI script being developed for the DMF people.

./tools/h5tools.c
./tools/h5tools.h
	The repeat threshold which controls how strings are printed when a
	character repeats a bunch of times is now settable at runtime instead
	of compile time. The default is to show all characters, like

	   "abceeeeeeeeeeeeeeeeeeeeeeeeeeeeeefgh"

	But if you set it to something like 5 then any sequence of 5 or more
	characters is replaced by something shorter, like:

	   "abc" 'e'x30 "fgh"	  or

	Added an `str_locale' property which describes how to escape special
	characters in strings. The default is C-like escapes but an
	alternative is ESCAPE_HTML which replaces all non-alphanumeric
	characters with a 3-character HTML escape of the form `%XX'

	Fixed a bug where empty strings didn't even have the quote characters
	printed. Now empty strings show up as `""' instead of absolutely
	nothing.

	Added a `per_line' property which controls the maximum number of
	elements which will appear per line of output. The default is infinity
	but in practice the right margin causes line breaks. By setting the
	`per_line' value to one and the right margin to a very large value one
	can achieve output with exactly one element per line.
1999-09-30 11:14:14 -05:00
Patrick Lu
eaaa292603 [svn-r1667] same fixes from the release branch were done here.
just casts with the parameters for the isdigit and isprint functions
1999-09-27 11:09:41 -05:00