diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-06-13 20:06:47 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-06-13 20:06:47 (GMT) |
commit | 9acff105847ea3cba56045ec1f8ab992b2e7f57e (patch) | |
tree | 2008b7c7a761c6ecc0fa0d5f3f70e5f8b5b633c0 | |
parent | cf83fb06120a4a90963fe0c9e2037af03965c5fc (diff) | |
download | hdf5-9acff105847ea3cba56045ec1f8ab992b2e7f57e.zip hdf5-9acff105847ea3cba56045ec1f8ab992b2e7f57e.tar.gz hdf5-9acff105847ea3cba56045ec1f8ab992b2e7f57e.tar.bz2 |
[svn-r10915] Purpose: work around a compiler bug
Description:
while compiling in mir with pgcc -O2 a condition
if (name ) {
do_something(name);
}
is executed when name is NULL
Solution:
avoid the error by checking the NULL pointer inside do_something(name);
Platforms tested:
linux (mir with pgcc 6.0)
Misc. update:
-rw-r--r-- | tools/lib/h5diff_dset.c | 6 | ||||
-rw-r--r-- | tools/lib/h5diff_util.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index a558987..1887df8 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -362,10 +362,12 @@ hsize_t diff_datasetid( hid_t dset1_id, * array compare *------------------------------------------------------------------------- */ - if (obj1_name) + if (obj1_name) { name1=diff_basename(obj1_name); - if (obj2_name) + } + if (obj2_name) { name2=diff_basename(obj2_name); + } nfound = diff_array(buf1, buf2, nelmts1, diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c index 4f1e97c..34686c6 100644 --- a/tools/lib/h5diff_util.c +++ b/tools/lib/h5diff_util.c @@ -283,6 +283,9 @@ diff_basename(const char *name) { size_t i; + if (name==NULL) + return; + /* Find the end of the base name */ i = strlen(name); while (i>0 && '/'==name[i-1]) |