diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
| commit | c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b (patch) | |
| tree | a1e316063fb77793ab94ad890f33eb99d0740fc9 /src/H5system.c | |
| parent | 9e9f96879d760850794a191988a205fbf1a3957d (diff) | |
| download | hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.zip hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.gz hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.bz2 | |
[svn-r15300] Description:
Bring revisions 15210:15289 from the trunk into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5system.c')
| -rw-r--r-- | src/H5system.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5system.c b/src/H5system.c index 4a49d71..6a8a91a 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -497,7 +497,7 @@ HDstrtoll(const char *s, const char **rest, int base) if (sign>0) { acc = ((uint64_t)1<<(8*sizeof(int64_t)-1))-1; } else { - acc = (uint64_t)1<<(8*sizeof(int64_t)-1); + acc = (int64_t)((uint64_t)1<<(8*sizeof(int64_t)-1)); } errno = ERANGE; } @@ -622,9 +622,9 @@ H5_build_extpath(const char *name, char **extpath/*out*/) if ((full_path=H5MM_strdup(name)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") } else { /* relative pathname */ - if ((cwdpath=H5MM_malloc(MAX_PATH_LEN)) == NULL) + if (NULL == (cwdpath = (char *)H5MM_malloc(MAX_PATH_LEN))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - if ((new_name=H5MM_strdup(name)) == NULL) + if (NULL == (new_name = (char *)H5MM_strdup(name))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* @@ -652,7 +652,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/) cwdlen = HDstrlen(cwdpath); HDassert(cwdlen); path_len = cwdlen + HDstrlen(new_name) + 2; - if ((full_path=H5MM_malloc(path_len)) == NULL) + if (NULL == (full_path = (char *)H5MM_malloc(path_len))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") HDstrcpy(full_path, cwdpath); |