Check-in [43490cab39]
Overview
Comment:Minor cleanup
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:43490cab39356f05dfd9526c2f4e340385b65822
User & Date: rkeene on 2016-02-15 07:49:24
Other Links: manifest | tags
Context
2016-02-15
08:30
ChromeOS: Minor cleanup in the test case check-in: 925edeaa39 user: rkeene tags: trunk
07:49
Minor cleanup check-in: 43490cab39 user: rkeene tags: trunk
07:34
ChromeOS: Sanity -- initialize PIN prompt check-in: e0d9e2f1fb user: rkeene tags: trunk
Changes

Modified cackey.c from [b22c79f8b7] to [788bc7d9fe].

4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
					free(cackey_slots[currslot].label);

					cackey_slots[currslot].label = NULL;
				}

				cackey_slots[currslot].active = 0;
			}
		} else {
			
		}
	}

	/* Determine list of readers */
	pcsc_connect_ret = cackey_pcsc_connect();
/* XXX: CAN HANG HERE ! */
	if (pcsc_connect_ret != CACKEY_PCSC_S_OK) {
		CACKEY_DEBUG_PRINTF("Connection to PC/SC failed, assuming no hardware slots");
	} else {
		pcsc_readers_len = 0;

		scard_listreaders_ret = SCardListReaders(*cackey_pcsc_handle, NULL, NULL, &pcsc_readers_len);








<
<





<







4733
4734
4735
4736
4737
4738
4739


4740
4741
4742
4743
4744

4745
4746
4747
4748
4749
4750
4751
					free(cackey_slots[currslot].label);

					cackey_slots[currslot].label = NULL;
				}

				cackey_slots[currslot].active = 0;
			}


		}
	}

	/* Determine list of readers */
	pcsc_connect_ret = cackey_pcsc_connect();

	if (pcsc_connect_ret != CACKEY_PCSC_S_OK) {
		CACKEY_DEBUG_PRINTF("Connection to PC/SC failed, assuming no hardware slots");
	} else {
		pcsc_readers_len = 0;

		scard_listreaders_ret = SCardListReaders(*cackey_pcsc_handle, NULL, NULL, &pcsc_readers_len);