pcsc: fixed unhandled error on reconnection #3150
Conversation
There was a problem hiding this comment.
technically looks good, but I would prefer to use temporary variable instead of wrapping the pcsc_{re,}connect() functions in the macros.
Even though the macro LOG_TEST_RET is written in a way that it does not evaluate the command more than once, using temporary variables is more readable and easier to debug.
src/libopensc/reader-pcsc.c
Outdated
| LOG_TEST_RET(reader->ctx, | ||
| pcsc_reconnect(reader, SCARD_LEAVE_CARD), | ||
| "Could not reconnect to card after reattached reader."); |
There was a problem hiding this comment.
Could we keep the old format (with the logging and without the wrapping the whole function into the macro and without the line wrapping)? Something like this (the same for the other cases):
| LOG_TEST_RET(reader->ctx, | |
| pcsc_reconnect(reader, SCARD_LEAVE_CARD), | |
| "Could not reconnect to card after reattached reader."); | |
| r = pcsc_reconnect(reader, SCARD_LEAVE_CARD), | |
| LOG_TEST_RET(reader->ctx, r, "Could not reconnect to card after reattached reader."); |
additionally, not sure if the PCSC_TRACE was useful for something here, but unless we have very good reason to remove it, I would probably keep it.
There was a problem hiding this comment.
PCSC_TRACE only adds logging, which LOG_TEST_RET would do as well.
|
Thank you! Merging. |
fixes #3139
Checklist