Skip to content

Commit

Permalink
Hdf5 merge pr 509 v18 (#541)
Browse files Browse the repository at this point in the history
* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add script bin/switch_maint_mode.

Add file changes generated by bin reconfigure in
    src/H5Edefin.h
    src/H5Einit.h
    src/H5Epubgen.h
    src/H5Eterm.h

* Update MANIFEST for switch_maint_mode.

* Update so numbers to match 1.8.22 release.

* Updated configure with reconfigure.

* Updates and corrections following HDF5 1.8.22 release.

* Commit Makefile.ins with so version numbers updated by bin/reconfigure.

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Removes c99_(v)snprintf() calls from the standalone test code (#509)

* Committing clang-format changes

* Removes c99_(v)snprintf from standalone code

These internal API calls were removed in a previous commit but were
missed in the sio/pio_standalone code.

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Sean McBride <sean@rogue-research.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
5 people authored Apr 5, 2021
1 parent 943417a commit 100e132
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 56 deletions.
44 changes: 16 additions & 28 deletions tools/perform/pio_standalone.h
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,9 @@ H5_DLL int HDrand(void);
#define HDsin(X) sin(X)
#define HDsinh(X) sinh(X)
#define HDsleep(N) sleep(N)
#ifdef H5_HAVE_WIN32_API
H5_DLL int c99_snprintf(char *str, size_t size, const char *format, ...);
#define HDsnprintf c99_snprintf /*varargs*/
#else
#define HDsnprintf snprintf /*varargs*/
#endif
/* sprintf() variable arguments */
#define HDsprintf sprintf /*varargs*/
#define HDsqrt(X) sqrt(X)
#define HDsnprintf snprintf /*varargs*/
#define HDsprintf sprintf /*varargs*/
#define HDsqrt(X) sqrt(X)
#ifdef H5_HAVE_RAND_R
H5_DLL void HDsrand(unsigned int seed);
#define HDsrandom(S) HDsrand(S)
Expand All @@ -367,7 +361,6 @@ H5_DLL void HDsrand(unsigned int seed);
#define HDsrand(S) srand(S)
#define HDsrandom(S) srand(S)
#endif
/* sscanf() variable arguments */

#ifdef H5_HAVE_WIN32_API
#define HDstrcasecmp(A, B) _stricmp(A, B)
Expand Down Expand Up @@ -429,25 +422,20 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base);
#else
#define HDunlink(S) unlink(S)
#endif
#define HDutime(S, T) utime(S, T)
#define HDva_arg(A, T) va_arg(A, T)
#define HDva_end(A) va_end(A)
#define HDva_start(A, P) va_start(A, P)
#define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
#define HDvfprintf(F, FMT, A) vfprintf(F, FMT, A)
#define HDvprintf(FMT, A) vprintf(FMT, A)
#define HDvsprintf(S, FMT, A) vsprintf(S, FMT, A)
#ifdef H5_HAVE_WIN32_API
H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap);
#define HDvsnprintf c99_vsnprintf
#else
#define HDutime(S, T) utime(S, T)
#define HDva_arg(A, T) va_arg(A, T)
#define HDva_end(A) va_end(A)
#define HDva_start(A, P) va_start(A, P)
#define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
#define HDvfprintf(F, FMT, A) vfprintf(F, FMT, A)
#define HDvprintf(FMT, A) vprintf(FMT, A)
#define HDvsprintf(S, FMT, A) vsprintf(S, FMT, A)
#define HDvsnprintf(S, N, FMT, A) vsnprintf(S, N, FMT, A)
#endif
#define HDwait(W) wait(W)
#define HDwaitpid(P, W, O) waitpid(P, W, O)
#define HDwcstombs(S, P, Z) wcstombs(S, P, Z)
#define HDwctomb(S, C) wctomb(S, C)
#define HDwrite(F, M, Z) write(F, M, Z)
#define HDwait(W) wait(W)
#define HDwaitpid(P, W, O) waitpid(P, W, O)
#define HDwcstombs(S, P, Z) wcstombs(S, P, Z)
#define HDwctomb(S, C) wctomb(S, C)
#define HDwrite(F, M, Z) write(F, M, Z)

/*
* And now for a couple non-Posix functions... Watch out for systems that
Expand Down
44 changes: 16 additions & 28 deletions tools/perform/sio_standalone.h
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,9 @@ H5_DLL int HDrand(void);
#define HDsin(X) sin(X)
#define HDsinh(X) sinh(X)
#define HDsleep(N) sleep(N)
#ifdef H5_HAVE_WIN32_API
H5_DLL int c99_snprintf(char *str, size_t size, const char *format, ...);
#define HDsnprintf c99_snprintf /*varargs*/
#else
#define HDsnprintf snprintf /*varargs*/
#endif
/* sprintf() variable arguments */
#define HDsprintf sprintf /*varargs*/
#define HDsqrt(X) sqrt(X)
#define HDsnprintf snprintf /*varargs*/
#define HDsprintf sprintf /*varargs*/
#define HDsqrt(X) sqrt(X)
#ifdef H5_HAVE_RAND_R
H5_DLL void HDsrand(unsigned int seed);
#define HDsrandom(S) HDsrand(S)
Expand All @@ -382,7 +376,6 @@ H5_DLL void HDsrand(unsigned int seed);
#define HDsrand(S) srand(S)
#define HDsrandom(S) srand(S)
#endif
/* sscanf() variable arguments */

#ifdef H5_HAVE_WIN32_API
#define HDstrcasecmp(A, B) _stricmp(A, B)
Expand Down Expand Up @@ -444,25 +437,20 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base);
#else
#define HDunlink(S) unlink(S)
#endif
#define HDutime(S, T) utime(S, T)
#define HDva_arg(A, T) va_arg(A, T)
#define HDva_end(A) va_end(A)
#define HDva_start(A, P) va_start(A, P)
#define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
#define HDvfprintf(F, FMT, A) vfprintf(F, FMT, A)
#define HDvprintf(FMT, A) vprintf(FMT, A)
#define HDvsprintf(S, FMT, A) vsprintf(S, FMT, A)
#ifdef H5_HAVE_WIN32_API
H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap);
#define HDvsnprintf c99_vsnprintf
#else
#define HDutime(S, T) utime(S, T)
#define HDva_arg(A, T) va_arg(A, T)
#define HDva_end(A) va_end(A)
#define HDva_start(A, P) va_start(A, P)
#define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
#define HDvfprintf(F, FMT, A) vfprintf(F, FMT, A)
#define HDvprintf(FMT, A) vprintf(FMT, A)
#define HDvsprintf(S, FMT, A) vsprintf(S, FMT, A)
#define HDvsnprintf(S, N, FMT, A) vsnprintf(S, N, FMT, A)
#endif
#define HDwait(W) wait(W)
#define HDwaitpid(P, W, O) waitpid(P, W, O)
#define HDwcstombs(S, P, Z) wcstombs(S, P, Z)
#define HDwctomb(S, C) wctomb(S, C)
#define HDwrite(F, M, Z) write(F, M, Z)
#define HDwait(W) wait(W)
#define HDwaitpid(P, W, O) waitpid(P, W, O)
#define HDwcstombs(S, P, Z) wcstombs(S, P, Z)
#define HDwctomb(S, C) wctomb(S, C)
#define HDwrite(F, M, Z) write(F, M, Z)

/*
* And now for a couple non-Posix functions... Watch out for systems that
Expand Down

0 comments on commit 100e132

Please sign in to comment.