[svn-r12315] Purpose:

Code cleanup, etc.

Description:
    Fix some inconsistent coding in the packet table examples

    Correct header file issues in C++ packet table wrapper

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/C++
    Linux 2.4/64 (mir) w/C++ & FORTRAN
This commit is contained in:
Quincey Koziol 2006-04-29 12:10:29 -05:00
parent cc5b2ff93b
commit 1032b7c9d6
4 changed files with 10 additions and 15 deletions

View File

@ -20,6 +20,9 @@
* February 2004
*/
/* High-level library internal header file */
#include "H5HLprivate2.h"
#include "H5PacketTable.h"
/********************************/

View File

@ -23,8 +23,8 @@
#ifndef H5PTWRAP_H
#define H5PTWRAP_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
/* Public HDF5 header */
#include "hdf5.h"
#include "H5PTpublic.h"
#include "H5api_adpt.h"

View File

@ -38,8 +38,6 @@ int main(void)
/* Buffers to hold data */
int writeBuffer[5];
int readBuffer[5];
hsize_t nrecords;
hsize_t chunk_size=1;
/* Initialize buffers */
for(x=0; x<5; x++)
@ -53,21 +51,17 @@ int main(void)
/* Create a fixed-length packet table within the file */
/* This table's "packets" will be simple integers. */
ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, chunk_size);
ptable = H5PTcreate_fl(fid, "Packet Test Dataset", H5T_NATIVE_INT, (hsize_t)1);
if(ptable == H5I_INVALID_HID)
goto out;
nrecords=1;
/* Write one packet to the packet table */
err = H5PTappend(ptable, nrecords, &(writeBuffer[0]) );
err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]) );
if(err < 0)
goto out;
nrecords=4;
/* Write several packets to the packet table */
err = H5PTappend(ptable, nrecords, &(writeBuffer[1]) );
err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]) );
if(err < 0)
goto out;
@ -83,11 +77,10 @@ int main(void)
if(err < 0)
goto out;
nrecords=1;
/* Iterate through packets, read each one back */
for(x=0; x<5; x++)
{
err = H5PTget_next(ptable, nrecords, &(readBuffer[x]) );
err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]) );
if(err < 0)
goto out;

View File

@ -37,7 +37,6 @@ int main(void)
/* Buffers to hold data */
hvl_t writeBuffer[5];
hvl_t readBuffer[5];
hsize_t chunk_size=1;
/* This example has two different sizes of "record": longs and shorts */
long longBuffer[5];
@ -68,7 +67,7 @@ int main(void)
fid=H5Fcreate("packet_table_VLexample.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
/* Create a variable-length packet table within the file */
ptable = H5PTcreate_vl(fid, "Packet Test Dataset", chunk_size);
ptable = H5PTcreate_vl(fid, "Packet Test Dataset", (hsize_t)1);
if(ptable == H5I_INVALID_HID)
goto out;