summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2016-04-17 17:30:25 (GMT)
committerJason Evans <jasone@canonware.com>2016-04-17 20:44:59 (GMT)
commit1423ee9016f1e7cb0cf3302207bcc488ce4374fc (patch)
treef9cf317a06f90548d24236d6fdb65c4b15cc8361
parent1b5830178fe73d4018233fea6858fff87d2b19df (diff)
downloadjemalloc-1423ee9016f1e7cb0cf3302207bcc488ce4374fc.zip
jemalloc-1423ee9016f1e7cb0cf3302207bcc488ce4374fc.tar.gz
jemalloc-1423ee9016f1e7cb0cf3302207bcc488ce4374fc.tar.bz2
Fix style nits.
-rw-r--r--include/jemalloc/internal/nstime.h2
-rw-r--r--src/tsd.c2
-rw-r--r--test/unit/junk_alloc.c2
-rw-r--r--test/unit/junk_free.c2
-rw-r--r--test/unit/util.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/include/jemalloc/internal/nstime.h b/include/jemalloc/internal/nstime.h
index dcb4b47..dc293b7 100644
--- a/include/jemalloc/internal/nstime.h
+++ b/include/jemalloc/internal/nstime.h
@@ -1,7 +1,7 @@
/******************************************************************************/
#ifdef JEMALLOC_H_TYPES
-#define JEMALLOC_CLOCK_GETTIME defined(_POSIX_MONOTONIC_CLOCK) \
+#define JEMALLOC_CLOCK_GETTIME defined(_POSIX_MONOTONIC_CLOCK) \
&& _POSIX_MONOTONIC_CLOCK >= 0
typedef struct nstime_s nstime_t;
diff --git a/src/tsd.c b/src/tsd.c
index 38d8bde..aeaa5e1 100644
--- a/src/tsd.c
+++ b/src/tsd.c
@@ -77,7 +77,7 @@ tsd_cleanup(void *arg)
/* Do nothing. */
break;
case tsd_state_nominal:
-#define O(n, t) \
+#define O(n, t) \
n##_cleanup(tsd);
MALLOC_TSD
#undef O
diff --git a/test/unit/junk_alloc.c b/test/unit/junk_alloc.c
index 8db3331..a5895b5 100644
--- a/test/unit/junk_alloc.c
+++ b/test/unit/junk_alloc.c
@@ -1,3 +1,3 @@
-#define JEMALLOC_TEST_JUNK_OPT "junk:alloc"
+#define JEMALLOC_TEST_JUNK_OPT "junk:alloc"
#include "junk.c"
#undef JEMALLOC_TEST_JUNK_OPT
diff --git a/test/unit/junk_free.c b/test/unit/junk_free.c
index 482a61d..bb5183c 100644
--- a/test/unit/junk_free.c
+++ b/test/unit/junk_free.c
@@ -1,3 +1,3 @@
-#define JEMALLOC_TEST_JUNK_OPT "junk:free"
+#define JEMALLOC_TEST_JUNK_OPT "junk:free"
#include "junk.c"
#undef JEMALLOC_TEST_JUNK_OPT
diff --git a/test/unit/util.c b/test/unit/util.c
index c4333d5..c958dc0 100644
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -162,11 +162,11 @@ TEST_BEGIN(test_malloc_snprintf_truncated)
char buf[BUFLEN];
size_t result;
size_t len;
-#define TEST(expected_str_untruncated, ...) do { \
+#define TEST(expected_str_untruncated, ...) do { \
result = malloc_snprintf(buf, len, __VA_ARGS__); \
assert_d_eq(strncmp(buf, expected_str_untruncated, len-1), 0, \
"Unexpected string inequality (\"%s\" vs \"%s\")", \
- buf, expected_str_untruncated); \
+ buf, expected_str_untruncated); \
assert_zu_eq(result, strlen(expected_str_untruncated), \
"Unexpected result"); \
} while (0)