diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-13 04:55:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-13 04:55:44 (GMT) |
| commit | 970fcd54e0693dafa78f567639a99cf059fa1425 (patch) | |
| tree | e9edcd76f9840357d95663630431727f4e8873b3 /src/H5system.c | |
| parent | c7ad57374b5a3633e32a6675a8ca8345d626aaba (diff) | |
| download | hdf5-970fcd54e0693dafa78f567639a99cf059fa1425.zip hdf5-970fcd54e0693dafa78f567639a99cf059fa1425.tar.gz hdf5-970fcd54e0693dafa78f567639a99cf059fa1425.tar.bz2 | |
[svn-r15212] Description:
Bring back revision 15211 from trunk:
Update the gcc flags for version 4.3
Clean up warnings
Tested on:
Mac OS X/32 10.5.3 (amazon)
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); |