summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2012-03-19 14:29:59 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2012-03-19 14:29:59 +0530
commit13d388b4ce92f51351aacca4a3ab9c895fea72a9 (patch)
treea83dad452f48d95e18bbb04686b1221232130f3f
parentfd637e87657ab944f28de422564bca71f9be579b (diff)
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.
-rw-r--r--src/pulsecore/protocol-native.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 9a437ffb..41fc0a02 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);