diff options
| author | Jakob Kaivo <jkk@ung.org> | 2019-03-06 19:56:37 -0500 |
|---|---|---|
| committer | Jakob Kaivo <jkk@ung.org> | 2019-03-06 19:56:37 -0500 |
| commit | 85f8cbf3d96d1b1dc0127398b762d58676d4f4f4 (patch) | |
| tree | 98a5ec2dd988d53370ed4bd8db7af1c133c535fb /src/nonstd | |
| parent | 4dd73957883dd09ac0e7d7de4974e3696298b0c0 (diff) | |
prefix arguments with __
Diffstat (limited to 'src/nonstd')
| -rw-r--r-- | src/nonstd/ASSERT_NONNULL.c | 6 | ||||
| -rw-r--r-- | src/nonstd/ASSERT_NONZERO.c | 6 | ||||
| -rw-r--r-- | src/nonstd/ASSERT_NOOVERLAP.c | 4 | ||||
| -rw-r--r-- | src/nonstd/flockfile.c | 2 | ||||
| -rw-r--r-- | src/nonstd/ftrylockfile.c | 2 | ||||
| -rw-r--r-- | src/nonstd/funlockfile.c | 2 | ||||
| -rw-r--r-- | src/nonstd/getc_unlocked.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/nonstd/ASSERT_NONNULL.c b/src/nonstd/ASSERT_NONNULL.c index e65020fd..26a6138e 100644 --- a/src/nonstd/ASSERT_NONNULL.c +++ b/src/nonstd/ASSERT_NONNULL.c @@ -1,12 +1,12 @@ #include <nonstd/assert.h> #ifndef NDEBUG -#define ASSERT_NONNULL(_ptr) do { \ - if (!_ptr) { \ +#define ASSERT_NONNULL(__ptr) do { \ + if (!__ptr) { \ struct __constraint_info _ci = {0}; \ _ci.func = __func__; \ __libc.stdlib.constraint_handler("Undefined behavior: " \ - "Parameter " #_ptr " can not be NULL", &_ci, EFAULT); \ + "Parameter " #__ptr " can not be NULL", &_ci, EFAULT); \ } \ } while (0) #else diff --git a/src/nonstd/ASSERT_NONZERO.c b/src/nonstd/ASSERT_NONZERO.c index 24a3f9a9..e48e775a 100644 --- a/src/nonstd/ASSERT_NONZERO.c +++ b/src/nonstd/ASSERT_NONZERO.c @@ -1,12 +1,12 @@ #include <nonstd/assert.h> #ifndef NDEBUG -#define ASSERT_NONZERO(_n) do { \ - if (!_n) { \ +#define ASSERT_NONZERO(__n) do { \ + if (!__n) { \ struct __constraint_info _ci = {0}; \ _ci.func = __func__; \ __libc.stdlib.constraint_handler("Undefined behavior: " \ - "Parameter " #_n " can not be 0", &_ci, ERANGE); \ + "Parameter " #__n " can not be 0", &_ci, ERANGE); \ } \ } while (0) #else diff --git a/src/nonstd/ASSERT_NOOVERLAP.c b/src/nonstd/ASSERT_NOOVERLAP.c index 5157c6d3..7173752d 100644 --- a/src/nonstd/ASSERT_NOOVERLAP.c +++ b/src/nonstd/ASSERT_NOOVERLAP.c @@ -1,9 +1,9 @@ #include <nonstd/assert.h> #ifndef NDEBUG -#define ASSERT_NOOVERLAP(x, y, s) do { \ +#define ASSERT_NOOVERLAP(__x, __y, __s) do { \ /* TODO */ \ } while (0) #else -#define ASSERT_NOOVERLAP(x, y, s) +#define ASSERT_NOOVERLAP(__x, __y, __s) #endif diff --git a/src/nonstd/flockfile.c b/src/nonstd/flockfile.c index 54c86a36..021c73c3 100644 --- a/src/nonstd/flockfile.c +++ b/src/nonstd/flockfile.c @@ -1,5 +1,5 @@ #include <nonstd/io.h> #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE) -#define flockfile(f) (void)(f) +#define flockfile(__f) (void)(__f) #endif diff --git a/src/nonstd/ftrylockfile.c b/src/nonstd/ftrylockfile.c index 61636a7e..b805a6e5 100644 --- a/src/nonstd/ftrylockfile.c +++ b/src/nonstd/ftrylockfile.c @@ -1,5 +1,5 @@ #include <nonstd/io.h> #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE) -#define ftrylockfile(f) (void)(f), 0 +#define ftrylockfile(__f) (void)(__f), 0 #endif diff --git a/src/nonstd/funlockfile.c b/src/nonstd/funlockfile.c index 0fe52c48..ab67117f 100644 --- a/src/nonstd/funlockfile.c +++ b/src/nonstd/funlockfile.c @@ -1,5 +1,5 @@ #include <nonstd/io.h> #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE) -#define funlockfile(f) (void)(f) +#define funlockfile(__f) (void)(__f) #endif diff --git a/src/nonstd/getc_unlocked.c b/src/nonstd/getc_unlocked.c index a575e60a..fb700587 100644 --- a/src/nonstd/getc_unlocked.c +++ b/src/nonstd/getc_unlocked.c @@ -1,5 +1,5 @@ #include <nonstd/io.h> #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE) -#define getc_unlocked(f) getc(f) +#define getc_unlocked(__f) getc(__f) #endif |