Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Mar 24, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba9deae
Committing clang-format changes
github-actions[bot] Mar 19, 2021
00f9750
Merge remote-tracking branch 'canonical/develop' into develop
derobins Mar 21, 2021
e997283
Merge remote-tracking branch 'canonical/develop' into develop
derobins Mar 22, 2021
3eac585
Merge remote-tracking branch 'canonical/develop' into develop
derobins Mar 23, 2021
71643b7
Merge remote-tracking branch 'canonical/develop' into develop
derobins Mar 24, 2021
d242911
Merge remote-tracking branch 'canonical/develop' into develop
derobins Mar 24, 2021
19d85a4
Removes c99_(v)snprintf from standalone code
derobins Mar 24, 2021
5d9e22d
Committing clang-format changes
github-actions[bot] Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions tools/test/perform/pio_standalone.h
View file
Open in desktop
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/test/perform/sio_standalone.h
View file
Open in desktop
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