summaryrefslogtreecommitdiffstats
path: root/src/H5Fint.c
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-04 16:36:19 (GMT)
committerGitHub <noreply@github.com>2021-03-04 16:36:19 (GMT)
commit13c706d851935894db86ade76ccbea532917fcf4 (patch)
tree0b2085cdcf0189058a8273af45951b9df2d1df36 /src/H5Fint.c
parent0f219cafeaa3d6755574c2fbd80292bbb513c130 (diff)
downloadhdf5-13c706d851935894db86ade76ccbea532917fcf4.zip
hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.gz
hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.bz2
1 12 Merges from develop (#421)
* OESS-98 fix tools test for plugins * sync fork * Merge of changes from dev * Move problem option to bottom of the list until fixed * HDFFV-11106 - fix parsing optional args * HDFFV-11106 add note * grammer fix * Whitespace after clang formatting * Undo format version 11 changes * Update check to working version * Merge workflow and minor changes from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge serval small changes from dev * fix typo * Minor non-space formatting changes * GH #386 copyright corrections for java folder * revert because logic requires false return * Merges from develop #358 patches from vtk #361 fix header guard spelling * Remove case statement for H5I_EVENTSET * Correct call with versioning * Remove tabs * Double underscore change * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings Remove more underscores from header guards
Diffstat (limited to 'src/H5Fint.c')
-rw-r--r--src/H5Fint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 2fbbd37..a999741 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -3119,7 +3119,7 @@ H5F__get_file_image(H5F_t *file, void *buf_ptr, size_t buf_len)
*
* While this problem is quire solvable, the required time and
* resources are lacking at present. Hence, for now, we don't
- * allow the get file image operation to be perfomed on files
+ * allow the get file image operation to be performed on files
* opened with the family file driver.
*
* Observe that the following test only looks at the top level