mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-18 15:15:56 +08:00
d38fe20df6
Clean up warnings in H5Tconv.c (down to _only_ 9000 lines of output now!)
Merge changes from Coverity branch back to trunk:
r20684:
Fix for coverity bug #1721 which was due to the fix for coverity bug #943.
r20685:
Use HDstrncpy. --gh
r20761:
Purpose: Fix valgrind issues
Description:
Free image_data and data as appropriate in test_image.
r20762:
Purpose: Fix coverity issue 600
Description:
Add check for return value of H5O_close in H5Ocopy. Also cleaned up various
warnings.
r20763:
Purpose: Fix valgrind issues with h5stat
Description:
Modified h5stat to free "iter" before exit, and free "hand" before exit if
parse_command_line exits directly.
r20764:
fixed coverity issues:
69, 327, 614, 684, 685, 696, 697, 1681, 967, 826, 660, 80
r20765:
Fixed coverity bug 668
Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.
No actual integer overflow tests are performed since it's just a test program but I did add a check that n_elements is >= 1.
I also changed an error condition from doing its own close and returning -1 to "goto out;" like the rest of the program.
r20766:
Fixed coverity bug 667
Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.
No actual integer overflow tests are performed since it's just a test program.
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(h5committest upcoming)
89 lines
3.0 KiB
C
89 lines
3.0 KiB
C
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
* Copyright by The HDF Group. *
|
|
* Copyright by the Board of Trustees of the University of Illinois. *
|
|
* All rights reserved. *
|
|
* *
|
|
* This file is part of HDF5. The full HDF5 copyright notice, including *
|
|
* terms governing use, modification, and redistribution, is contained in *
|
|
* the files COPYING and Copyright.html. COPYING can be found at the root *
|
|
* of the source code distribution tree; Copyright.html can be found at the *
|
|
* root level of an installed copy of the electronic HDF5 document set and *
|
|
* is linked from the top-level documents page. It can also be found at *
|
|
* http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
|
|
* access to either file, you may request a copy from help@hdfgroup.org. *
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
/*
|
|
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
|
|
* Wednesday, March 17, 2010
|
|
*
|
|
* Purpose: srcdir querying support.
|
|
*/
|
|
#ifndef _H5SRCDIR_H
|
|
#define _H5SRCDIR_H
|
|
|
|
/* Include the header file with the correct relative path for the srcdir string */
|
|
#include "H5srcdir_str.h"
|
|
|
|
/* Buffer to construct path in and return pointer to */
|
|
static char srcdir_path[1024] = "";
|
|
|
|
/* Buffer to construct file in and return pointer to */
|
|
static char srcdir_testpath[1024] = "";
|
|
|
|
/* Append the test file name to the srcdir path and return the whole string */
|
|
#ifdef H5_VMS
|
|
static const char *H5_get_srcdir_filename(char *filename)
|
|
#else
|
|
static const char *H5_get_srcdir_filename(const char *filename)
|
|
#endif
|
|
{
|
|
const char *srcdir = HDgetenv("srcdir");
|
|
|
|
/* Check for using the srcdir from configure time */
|
|
if(NULL == srcdir)
|
|
srcdir = config_srcdir;
|
|
|
|
/* Build path to test file */
|
|
if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
|
|
HDstrcpy(srcdir_testpath, srcdir);
|
|
#ifdef H5_VMS
|
|
if(filename[0] == '[') {
|
|
char *tmp = filename;
|
|
|
|
srcdir_testpath[HDstrlen(srcdir) - 1] = '\0';
|
|
HDstrcat(srcdir_testpath, ++tmp);
|
|
} /* end if */
|
|
else
|
|
HDstrcat(srcdir_testpath, filename);
|
|
#else
|
|
HDstrcat(srcdir_testpath, "/");
|
|
HDstrcat(srcdir_testpath, filename);
|
|
#endif
|
|
return(srcdir_testpath);
|
|
} /* end if */
|
|
else
|
|
return(NULL);
|
|
}
|
|
|
|
/* Just return the srcdir path */
|
|
static const char *H5_get_srcdir(void)
|
|
{
|
|
const char *srcdir = HDgetenv("srcdir");
|
|
|
|
/* Check for using the srcdir from configure time */
|
|
if(NULL == srcdir)
|
|
srcdir = config_srcdir;
|
|
|
|
/* Build path to all test files */
|
|
if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
|
|
HDstrcpy(srcdir_path, srcdir);
|
|
HDstrcat(srcdir_path, "/");
|
|
return(srcdir_path);
|
|
} /* end if */
|
|
else
|
|
return(NULL);
|
|
}
|
|
#endif /* _H5SRCDIR_H */
|
|
|