[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condit
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condition |
Date: |
Thu, 14 Feb 2019 21:19:36 +0100 |
Simplify the if() condition so we can remove an indent layer
and the code is easier to review.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/usb/ccid-card-passthru.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index ccc3ffa7fa..6cb8b2d26b 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -338,19 +338,17 @@ static void passthru_realize(CCIDCardState *base, Error
**errp)
{
PassthruState *card = PASSTHRU_CCID_CARD(base);
- card->vscard_in_pos = 0;
- card->vscard_in_hdr = 0;
- if (qemu_chr_fe_backend_connected(&card->cs)) {
- DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev");
- qemu_chr_fe_set_handlers(&card->cs,
- ccid_card_vscard_can_read,
- ccid_card_vscard_read,
- ccid_card_vscard_event, NULL, card, NULL, true);
- ccid_card_vscard_send_init(card);
- } else {
+ if (!qemu_chr_fe_backend_connected(&card->cs)) {
error_setg(errp, "missing chardev");
return;
}
+ card->vscard_in_pos = 0;
+ card->vscard_in_hdr = 0;
+ DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev");
+ qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read,
+ ccid_card_vscard_read, ccid_card_vscard_event,
+ NULL, card, NULL, true);
+ ccid_card_vscard_send_init(card);
card->debug = parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE,
card->debug);
memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR));
--
2.20.1
- Re: [Qemu-devel] [PATCH v2 2/9] ccid-card-passthru: Replace never trigger if statement by an assertion, (continued)
- [Qemu-devel] [PATCH v2 3/9] ccid-card-passthru: Assert on a stricter expression, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 4/9] ccid-card-passthru: Let the chardev::read() be more generic, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 5/9] ccid-card-passthru: Replace assert() by QEMU_BUILD_BUG_ON(), Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 7/9] ccid-card-passthru: Use QERR_MISSING_PARAMETER, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condition,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 9/9] ccid-card-passthru: Use size_t for index, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 8/9] ccid-card-passthru: Use size_t to hold size argument, Philippe Mathieu-Daudé, 2019/02/14