summaryrefslogtreecommitdiff
path: root/src/common/address.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-28 09:25:17 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-28 09:25:17 -0400
commita64d79ca4c5699be161a54d94e0e6c0f7d06db7c (patch)
tree5d0fa776b824fe9bd30014e92259c7d0805b3e34 /src/common/address.c
parent9727a9248a474909c0ad53be9d55cd39b69d0611 (diff)
downloadtor-a64d79ca4c5699be161a54d94e0e6c0f7d06db7c.tar.gz
tor-a64d79ca4c5699be161a54d94e0e6c0f7d06db7c.zip
Move around some LCOV_EXCLs in src/common
Apparently, my compiler now generates coverage markers for label-only lines, so we need to exclude those too if they are meant to be unreachable.
Diffstat (limited to 'src/common/address.c')
-rw-r--r--src/common/address.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/address.c b/src/common/address.c
index aa61b5423b..dbe129be59 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -907,8 +907,8 @@ tor_addr_is_loopback(const tor_addr_t *addr)
return (tor_addr_to_ipv4h(addr) & 0xff000000) == 0x7f000000;
case AF_UNSPEC:
return 0;
- default:
/* LCOV_EXCL_START */
+ default:
tor_fragile_assert();
return 0;
/* LCOV_EXCL_STOP */
@@ -1031,8 +1031,10 @@ tor_addr_copy_tight(tor_addr_t *dest, const tor_addr_t *src)
memcpy(dest->addr.in6_addr.s6_addr, src->addr.in6_addr.s6_addr, 16);
case AF_UNSPEC:
break;
+ // LCOV_EXCL_START
default:
- tor_fragile_assert(); // LCOV_EXCL_LINE
+ tor_fragile_assert();
+ // LCOV_EXCL_STOP
}
}
@@ -1138,8 +1140,8 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2,
return 0;
else
return 1;
- default:
/* LCOV_EXCL_START */
+ default:
tor_fragile_assert();
return 0;
/* LCOV_EXCL_STOP */
@@ -1194,8 +1196,8 @@ tor_addr_hash(const tor_addr_t *addr)
return 0x4e4d5342;
case AF_INET6:
return siphash24g(&addr->addr.in6_addr.s6_addr, 16);
- default:
/* LCOV_EXCL_START */
+ default:
tor_fragile_assert();
return 0;
/* LCOV_EXCL_STOP */