summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5trav.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-03-17 14:28:40 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-03-17 14:28:40 (GMT)
commitf2aa62ec76993c04c807c27e7a577a1ac3b0da3f (patch)
tree8bfa87fd91e47b88afc4c98e2ba0c2c97e3a10f1 /tools/lib/h5trav.h
parent4ffe2f78c524e8edfc4be77117187870a5fd5a7a (diff)
downloadhdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.zip
hdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.tar.gz
hdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.tar.bz2
[svn-r24810] Description:
Bring r24803 & r24804 from trunk to 1.8 branch: r24804: Brought changes from Coverity branch back to trunk, and cleaned up misc. other warnings & formatting issues: r20833: Fixed Coverity 667 and 668 with real integer overflow tests this time. r20834: Use HDstrncpy and HDstrncat. --gh r20835: Change to use strncpy - use base_len + 1 for line 156, use HDstrlen(path) + 1 for line 159 r20836: Fixed coverity 585 by casting output of fgetc() to a char. r20837: Changed sprintf calls to snprintf with size 1 less than the allocated buffer to address coverity issue #967. r24803: Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from src/H5private.h to src/H5public.h. Wrap typedef of hsize_t and hssize_t in DIAG_OFF(long-long) macros. Clean up a bunch of "macro '-' is unused" warnings. Tested on: Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel (too minor to require h5committest)
Diffstat (limited to 'tools/lib/h5trav.h')
-rw-r--r--tools/lib/h5trav.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h
index 3548c6b..352a9e5 100644
--- a/tools/lib/h5trav.h
+++ b/tools/lib/h5trav.h
@@ -51,14 +51,16 @@ typedef enum {
/* Struct to keep track of symbolic link targets visited.
* Functions: symlink_visit_add() and symlink_is_visited()
*/
+typedef struct symlink_trav_path_t {
+ H5L_type_t type;
+ char *file;
+ char *path;
+} symlink_trav_path_t;
+
typedef struct symlink_trav_t {
size_t nalloc;
size_t nused;
- struct {
- H5L_type_t type;
- char *file;
- char *path;
- } *objs;
+ symlink_trav_path_t *objs;
hbool_t dangle_link;
} symlink_trav_t;