Remove variable only used for an assert

When compiled with -DNDEBUG, we get warnings about set-but-unused variables.
In general, it's not something we care about, but since removing those
variables arguably makes the code nicer, let's just to it in this case.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-27 14:28:24 +01:00
parent 4e494d17db
commit 10c353e1c5
5 changed files with 5 additions and 18 deletions

View File

@ -7,12 +7,10 @@
#include "hexdecoct.h"
void initialize_libgcrypt(bool secmem) {
const char *p;
if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
return;
p = gcry_check_version("1.4.5");
assert(p);
assert_se(gcry_check_version("1.4.5"));
/* Turn off "secmem". Clients which wish to make use of this
* feature should initialize the library manually */

View File

@ -428,7 +428,6 @@ static bool match_tag(sd_device_enumerator *enumerator, sd_device *device) {
static bool match_parent(sd_device_enumerator *enumerator, sd_device *device) {
const char *syspath_parent, *syspath;
Iterator i;
int r;
assert(enumerator);
assert(device);
@ -436,8 +435,7 @@ static bool match_parent(sd_device_enumerator *enumerator, sd_device *device) {
if (set_isempty(enumerator->match_parent))
return true;
r = sd_device_get_syspath(device, &syspath);
assert(r >= 0);
assert_se(sd_device_get_syspath(device, &syspath) >= 0);
SET_FOREACH(syspath_parent, enumerator->match_parent, i)
if (path_startswith(syspath, syspath_parent))

View File

@ -64,14 +64,10 @@ static int netdev_fill_fou_tunnel_message(NetDev *netdev, sd_netlink_message **r
static int netdev_fou_tunnel_create(NetDev *netdev) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
uint32_t serial;
FouTunnel *t;
int r;
assert(netdev);
t = FOU(netdev);
assert(t);
assert(FOU(netdev));
r = netdev_fill_fou_tunnel_message(netdev, &m);
if (r < 0)

View File

@ -430,11 +430,8 @@ static void resolve_endpoints(NetDev *netdev) {
}
static int netdev_wireguard_post_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
Wireguard *w;
assert(netdev);
w = WIREGUARD(netdev);
assert(w);
assert(WIREGUARD(netdev));
(void) wireguard_set_interface(netdev);
resolve_endpoints(netdev);

View File

@ -20,14 +20,12 @@ static inline bool fstab_test_option(const char *opts, const char *names) {
int fstab_find_pri(const char *options, int *ret);
static inline bool fstab_test_yes_no_option(const char *opts, const char *yes_no) {
int r;
const char *opt;
/* If first name given is last, return 1.
* If second name given is last or neither is found, return 0. */
r = fstab_filter_options(opts, yes_no, &opt, NULL, NULL);
assert(r >= 0);
assert_se(fstab_filter_options(opts, yes_no, &opt, NULL, NULL) >= 0);
return opt == yes_no;
}