diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2013-10-10 21:57:04 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2013-10-10 21:57:04 (GMT) |
| commit | 06aa7b6641ec24acfc9810f50d06b526a0eeef7d (patch) | |
| tree | 7d731da908173b6d4d027d1e006ff4d325448758 /src | |
| parent | 52412564af8656ac8871f5e5b1f3493453e2c4db (diff) | |
| download | hdf5-06aa7b6641ec24acfc9810f50d06b526a0eeef7d.zip hdf5-06aa7b6641ec24acfc9810f50d06b526a0eeef7d.tar.gz hdf5-06aa7b6641ec24acfc9810f50d06b526a0eeef7d.tar.bz2 | |
[svn-r24285] Eliminate several "passing argument ... with different width due to prototype" warnings by casting constants to size_t where expected by string functions.
Tested on jam, koala,ostrich and platypus with h5committest.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5.c | 2 | ||||
| -rw-r--r-- | src/H5Gint.c | 2 | ||||
| -rw-r--r-- | src/H5Gname.c | 4 | ||||
| -rw-r--r-- | src/H5Pfapl.c | 2 | ||||
| -rw-r--r-- | src/H5system.c | 4 |
5 files changed, 7 insertions, 7 deletions
@@ -722,7 +722,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) HDsnprintf(lib_str, sizeof(lib_str), "HDF5 library version: %d.%d.%d", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE); if(*substr) { - HDstrncat(lib_str, "-", 1); + HDstrncat(lib_str, "-", (size_t)1); HDstrncat(lib_str, substr, (sizeof(lib_str) - HDstrlen(lib_str)) - 1); } /* end if */ if (HDstrcmp(lib_str, H5_lib_vers_info_g)){ diff --git a/src/H5Gint.c b/src/H5Gint.c index fe8b995..6f42cc2 100644 --- a/src/H5Gint.c +++ b/src/H5Gint.c @@ -992,7 +992,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata) /* Add the path separator to the current path */ HDassert(udata->path[udata->curr_path_len] == '\0'); - HDstrncpy(&(udata->path[udata->curr_path_len]), "/", 2); + HDstrncpy(&(udata->path[udata->curr_path_len]), "/", (size_t)2); udata->curr_path_len++; /* Attempt to get the link info for this group */ diff --git a/src/H5Gname.c b/src/H5Gname.c index 1d2644b..bbeddb6 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -325,7 +325,7 @@ H5G_build_fullpath(const char *prefix, const char *name) /* Build full path */ HDstrncpy(full_path, prefix, orig_path_len + 1); if(need_sep) - HDstrncat(full_path, "/", 1); + HDstrncat(full_path, "/", (size_t)1); HDstrncat(full_path, name, name_len); /* Create reference counted string for path */ @@ -1331,7 +1331,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t * /* If there's a buffer provided, copy into it, up to the limit of its size */ if(name) { /* Copy the initial path separator */ - HDstrncpy(name, "/", 2); + HDstrncpy(name, "/", (size_t)2); /* Append the rest of the path */ /* (less one character, for the initial path separator) */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index a416b00..6955a60 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -2472,7 +2472,7 @@ H5P__facc_cache_config_cmp(const void *_config1, const void *_config2, size_t UN if(config1->close_trace_file > config2->close_trace_file) HGOTO_DONE(1); if((ret_value = HDstrncmp(config1->trace_file_name, config2->trace_file_name, - H5AC__MAX_TRACE_FILE_NAME_LEN + 1)) != 0) + (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + 1))) != 0) HGOTO_DONE(ret_value); if(config1->evictions_enabled < config2->evictions_enabled) HGOTO_DONE(-1); diff --git a/src/H5system.c b/src/H5system.c index 4280066..614b8b9 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -201,7 +201,7 @@ HDfprintf(FILE *stream, const char *fmt, ...) if(sizeof(hsize_t) < sizeof(long)) modifier[0] = '\0'; else if(sizeof(hsize_t) == sizeof(long)) - HDstrncpy(modifier, "l", 2); + HDstrncpy(modifier, "l", (size_t)2); else HDstrncpy(modifier, H5_PRINTF_LL_WIDTH, HDstrlen(H5_PRINTF_LL_WIDTH) + 1); break; @@ -211,7 +211,7 @@ HDfprintf(FILE *stream, const char *fmt, ...) if(sizeof(size_t) < sizeof(long)) modifier[0] = '\0'; else if(sizeof(size_t) == sizeof(long)) - HDstrncpy(modifier, "l", 2); + HDstrncpy(modifier, "l", (size_t)2); else HDstrncpy(modifier, H5_PRINTF_LL_WIDTH, HDstrlen(H5_PRINTF_LL_WIDTH) + 1); break; |