Skip to content

Commit 35f5c96

Browse files
authored
Merge pull request swiftlang#576 from etcwilde/ewilde/rebranch/fix-unused-variable-errors
Fix unused variable errors
2 parents 04daebe + 767ce40 commit 35f5c96

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

tests/bsdtestharness.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@ main(int argc, char *argv[])
7272
assert(res == 0);
7373
#endif
7474

75-
uint64_t to = 0;
76-
char *tos = getenv("BSDTEST_TIMEOUT");
77-
if (tos) {
78-
to = strtoul(tos, NULL, 0);
79-
to *= NSEC_PER_SEC;
80-
}
81-
8275
#ifdef __APPLE__
8376
char *arch = getenv("BSDTEST_ARCH");
8477
if (arch) {
@@ -245,6 +238,13 @@ main(int argc, char *argv[])
245238
});
246239
dispatch_resume(tmp_ds);
247240

241+
uint64_t to = 0;
242+
char *tos = getenv("BSDTEST_TIMEOUT");
243+
if (tos) {
244+
to = strtoul(tos, NULL, 0);
245+
to *= NSEC_PER_SEC;
246+
}
247+
248248
if (!to) {
249249
#if TARGET_OS_EMBEDDED
250250
to = 180LL * NSEC_PER_SEC;

tests/dispatch_apply.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static void busythread(void *ignored)
6565
j += i;
6666
i += 1;
6767
}
68+
(void)j;
6869

6970
OSAtomicIncrement32(&busy_threads_finished);
7071
}

0 commit comments

Comments
 (0)