From 13d388b4ce92f51351aacca4a3ab9c895fea72a9 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 19 Mar 2012 14:29:59 +0530 Subject: [PATCH] protocol-native: Remove redundant asserts As David points out, the previous commit made a couple of asserts redundant (the XOR covers all cases that were previous tested for). Remove these redundant commits now. --- src/pulsecore/protocol-native.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 9a437ff..41fc0a0 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -4697,8 +4697,6 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SET_SINK_PORT ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, port, tag, PA_ERR_INVALID); -- 2.7.4