Skip to content

Commit 7318127

Browse files
committed
Remove dead code
Neither of these clauses can ever be reached. Also attempt to fix travis Windows build
1 parent 53bd3c8 commit 7318127

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.travis/cmake-windows.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ travis_script() {
2525
# its backtrace.
2626
add_flag -gdwarf-2
2727

28+
# Fix invalid register for .seh_savexmm error
29+
add_flag -fno-asynchronous-unwind-tables
30+
2831
docker run \
2932
-e ALLOW_TEST_FAILURE=true \
3033
-e ENABLE_ARCH_i686="$i686" \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b75296c24edbefa40809eeef66fa74791e28da407ee9364fb8e516c2ee882aa /usr/local/bin/tox-bootstrapd
1+
7e3bf0d47ff9440c7dd629b721b19846171c08b68762c043d6ce04b1b73ad8e0 /usr/local/bin/tox-bootstrapd

toxcore/DHT.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -895,14 +895,6 @@ static int cmp_dht_entry(const void *a, const void *b)
895895
return 1;
896896
}
897897

898-
if (t1 && !t2) {
899-
return -1;
900-
}
901-
902-
if (!t1 && t2) {
903-
return 1;
904-
}
905-
906898
const int close = id_closest(cmp_public_key, entry1.public_key, entry2.public_key);
907899

908900
if (close == 1) {

0 commit comments

Comments
 (0)