summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-10-24 13:05:13 (GMT)
committerGitHub <noreply@github.com>2020-10-24 13:05:13 (GMT)
commit313a8c8546b3b975fba722b015c8c8269dd240cb (patch)
treeabbc9530d2a1460110e6b41af9de071deb66ead0 /src
parent2c3cf8240f45508dea02cab08fa67c2a775cab58 (diff)
parent2ae59f1c6199c62d6efeb43f91924e06f1fd6248 (diff)
downloadhdf5-313a8c8546b3b975fba722b015c8c8269dd240cb.zip
hdf5-313a8c8546b3b975fba722b015c8c8269dd240cb.tar.gz
hdf5-313a8c8546b3b975fba722b015c8c8269dd240cb.tar.bz2
Merge pull request #59 from derobins/trivial/HDprefix
HD prefix updates in src/ and test/
Diffstat (limited to 'src')
-rw-r--r--src/H5FDs3comms.c8
-rw-r--r--src/H5Tdbg.c6
-rw-r--r--src/H5VLnative_object.c2
-rw-r--r--src/H5Z.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 2ac27d0..92921ad 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -1951,7 +1951,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
for (buffer_i = 0; buffer_i < 128; buffer_i++)
buffer[buffer_i] = 0;
- line_buffer = fgets(line_buffer, 128, file);
+ line_buffer = HDfgets(line_buffer, 128, file);
if (line_buffer == NULL) /* reached end of file */
goto done;
} while (HDstrncmp(line_buffer, profile_line, HDstrlen(profile_line)));
@@ -1963,7 +1963,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
buffer[buffer_i] = 0;
/* collect a line from file */
- line_buffer = fgets(line_buffer, 128, file);
+ line_buffer = HDfgets(line_buffer, 128, file);
if (line_buffer == NULL)
goto done; /* end of file */
@@ -2062,9 +2062,9 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
#endif
#ifdef H5_HAVE_WIN32_API
- ret = HDsnprintf(awspath, 117, "%s/.aws/", getenv("USERPROFILE"));
+ ret = HDsnprintf(awspath, 117, "%s/.aws/", HDgetenv("USERPROFILE"));
#else
- ret = HDsnprintf(awspath, 117, "%s/.aws/", getenv("HOME"));
+ ret = HDsnprintf(awspath, 117, "%s/.aws/", HDgetenv("HOME"));
#endif
if (ret < 0 || (size_t)ret >= 117)
HGOTO_ERROR(H5E_ARGS, H5E_CANTCOPY, FAIL, "unable to format home-aws path")
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 5d0c5cd..758430b 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -120,9 +120,9 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED *path, int H5_ATTR_UNUSED *nprint /*i
HDfprintf(H5DEBUG(T), " %-16s %10" PRIdHSIZE " %10u %8s %8s %8s %10s\n", path->name,
path->stats.nelmts, path->stats.ncalls, timestrs.user, timestrs.system, timestrs.elapsed,
bandwidth);
- free(timestrs.user);
- free(timestrs.system);
- free(timestrs.elapsed);
+ HDfree(timestrs.user);
+ HDfree(timestrs.system);
+ HDfree(timestrs.elapsed);
}
#endif
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c
index ac717b0..81ff5ea 100644
--- a/src/H5VLnative_object.c
+++ b/src/H5VLnative_object.c
@@ -338,7 +338,7 @@ H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params,
/* Lookup object */
case H5VL_OBJECT_LOOKUP: {
- H5O_token_t *token = va_arg(arguments, H5O_token_t *);
+ H5O_token_t *token = HDva_arg(arguments, H5O_token_t *);
HDassert(token);
diff --git a/src/H5Z.c b/src/H5Z.c
index ac7756e..65b9821 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -175,9 +175,9 @@ H5Z_term_package(void)
H5Z_stat_table_g[i].stats[dir].errors, timestrs.user, timestrs.system,
timestrs.elapsed, bandwidth);
next:
- free(timestrs.user);
- free(timestrs.system);
- free(timestrs.elapsed);
+ HDfree(timestrs.user);
+ HDfree(timestrs.system);
+ HDfree(timestrs.elapsed);
} /* end for */
} /* end for */
} /* end if */