giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

consistent naming and trimmed lines 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2229 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
pisi 2005-03-04 01:41:39 +00:00
parent cae39291de
commit 1463b324b3
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libopensc/reader-pcsc.c
View File

@ -74,7 +74,7 @@ struct pcsc_private_data {
struct pcsc_slot_data { struct pcsc_slot_data {
SCARDHANDLE pcsc_card; SCARDHANDLE pcsc_card;
SCARD_READERSTATE_A readerState; SCARD_READERSTATE_A reader_state;
}; };
static int pcsc_detect_card_presence(struct sc_reader *reader, struct sc_slot_info *slot); static int pcsc_detect_card_presence(struct sc_reader *reader, struct sc_slot_info *slot);
@ -193,15 +193,15 @@ static int refresh_slot_attributes(struct sc_reader *reader, struct sc_slot_info
struct pcsc_slot_data *pslot = GET_SLOT_DATA(slot); struct pcsc_slot_data *pslot = GET_SLOT_DATA(slot);
LONG ret; LONG ret;
if (pslot->readerState.szReader == NULL) { if (pslot->reader_state.szReader == NULL) {
pslot->readerState.szReader = priv->reader_name; pslot->reader_state.szReader = priv->reader_name;
pslot->readerState.dwCurrentState = SCARD_STATE_UNAWARE; pslot->reader_state.dwCurrentState = SCARD_STATE_UNAWARE;
pslot->readerState.dwEventState = SCARD_STATE_UNAWARE; pslot->reader_state.dwEventState = SCARD_STATE_UNAWARE;
} else { } else {
pslot->readerState.dwCurrentState = pslot->readerState.dwEventState; pslot->reader_state.dwCurrentState = pslot->reader_state.dwEventState;
} }
ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, &pslot->readerState, 1); ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, &pslot->reader_state, 1);
if (ret == (LONG)SCARD_E_TIMEOUT) { /* timeout: nothing changed */ if (ret == (LONG)SCARD_E_TIMEOUT) { /* timeout: nothing changed */
slot->flags &= ~SCARD_STATE_CHANGED; slot->flags &= ~SCARD_STATE_CHANGED;
return 0; return 0;
@ -210,34 +210,34 @@ static int refresh_slot_attributes(struct sc_reader *reader, struct sc_slot_info
PCSC_ERROR(reader->ctx, "SCardGetStatusChange failed", ret); PCSC_ERROR(reader->ctx, "SCardGetStatusChange failed", ret);
return pcsc_ret_to_error(ret); return pcsc_ret_to_error(ret);
} }
if (pslot->readerState.dwEventState & SCARD_STATE_PRESENT) { if (pslot->reader_state.dwEventState & SCARD_STATE_PRESENT) {
int old_flags = slot->flags; int old_flags = slot->flags;
int maybe_changed = 0; int maybe_changed = 0;
slot->flags |= SC_SLOT_CARD_PRESENT; slot->flags |= SC_SLOT_CARD_PRESENT;
slot->atr_len = pslot->readerState.cbAtr; slot->atr_len = pslot->reader_state.cbAtr;
if (slot->atr_len > SC_MAX_ATR_SIZE) if (slot->atr_len > SC_MAX_ATR_SIZE)
slot->atr_len = SC_MAX_ATR_SIZE; slot->atr_len = SC_MAX_ATR_SIZE;
memcpy(slot->atr, pslot->readerState.rgbAtr, slot->atr_len); memcpy(slot->atr, pslot->reader_state.rgbAtr, slot->atr_len);
#ifndef _WIN32 #ifndef _WIN32
/* On Linux, SCARD_STATE_CHANGED always means there was an /* On Linux, SCARD_STATE_CHANGED always means there was an
* insert or removal. But we may miss events that way. */ * insert or removal. But we may miss events that way. */
if (pslot->readerState.dwEventState & SCARD_STATE_CHANGED) { if (pslot->reader_state.dwEventState & SCARD_STATE_CHANGED) {
slot->flags |= SC_SLOT_CARD_CHANGED; slot->flags |= SC_SLOT_CARD_CHANGED;
} else { } else {
maybe_changed = 1; maybe_changed = 1;
} }
#else #else
/* On windows, SCARD_STATE_CHANGED is turned on by lots of /* On windows, SCARD_STATE_CHANGED is turned on by lots of
* other events, so it gives us a lot of false positives. * other events, so it gives us a lot of false positives.
* But if it's off, there really no change */ * But if it's off, there really no change */
if (pslot->readerState.dwEventState & SCARD_STATE_CHANGED) { if (pslot->reader_state.dwEventState & SCARD_STATE_CHANGED) {
maybe_changed = 1; maybe_changed = 1;
} }
#endif #endif
/* If we aren't sure if the card state changed, check if /* If we aren't sure if the card state changed, check if
* the card handle is still valid. If the card changed, * the card handle is still valid. If the card changed,
* the handle will be invalid. */ * the handle will be invalid. */
slot->flags &= ~SC_SLOT_CARD_CHANGED; slot->flags &= ~SC_SLOT_CARD_CHANGED;
if (maybe_changed && (old_flags & SC_SLOT_CARD_PRESENT)) { if (maybe_changed && (old_flags & SC_SLOT_CARD_PRESENT)) {
@ -426,7 +426,7 @@ static int pcsc_connect(struct sc_reader *reader, struct sc_slot_info *slot)
/* check for pinpad support */ /* check for pinpad support */
if (try_ccid_pin_cmd) { if (try_ccid_pin_cmd) {
unsigned char attr[1]; unsigned char attr[1];
DWORD attrlen; DWORD attrlen;
sc_debug(reader->ctx, "Testing for CCID pinpad support ... "); sc_debug(reader->ctx, "Testing for CCID pinpad support ... ");
attrlen = sizeof(attr); attrlen = sizeof(attr);
@ -455,7 +455,7 @@ static int pcsc_disconnect(struct sc_reader *reader, struct sc_slot_info *slot,
slot->flags = 0; slot->flags = 0;
return 0; return 0;
} }
static int pcsc_lock(struct sc_reader *reader, struct sc_slot_info *slot) static int pcsc_lock(struct sc_reader *reader, struct sc_slot_info *slot)
{ {
long rv; long rv;