diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 22:00:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 22:00:07 (GMT) |
| commit | 0e82707100cf3d1b698d2ec0cad08db61d552d63 (patch) | |
| tree | 6d8c9adf10cb2f52f7ad33b93e30ee0aef3125e0 /src | |
| parent | 61186204c020a81b5b0044a3b5e08311ccf1424d (diff) | |
| download | hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.zip hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.tar.gz hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.tar.bz2 | |
Misc missed things from previous merges (#3295)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5system.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5system.c b/src/H5system.c index 9b40f44..a113acb 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -162,7 +162,7 @@ Pflock(int fd, int operation) flk.l_pid = 0; /* not used with set */ /* Lock or unlock */ - if (HDfcntl(fd, F_SETLK, &flk) < 0) + if (fcntl(fd, F_SETLK, &flk) < 0) return -1; return 0; @@ -948,11 +948,10 @@ char * Wstrcasestr_wrap(const char *haystack, const char *needle) { if (needle && !*needle) - return haystack; + return (char *)haystack; else return StrStrIA(haystack, needle); } - #endif /* H5_HAVE_WIN32_API */ /* dirname() and basename() are not easily ported to Windows and basename @@ -1260,7 +1259,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct } } - if (l_opts[i].name == NULL) { + if (l_opts && l_opts[i].name == NULL) { /* exhausted all of the l_opts we have and still didn't match */ if (H5_opterr) fprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg); |