summaryrefslogtreecommitdiff
path: root/vreader.c
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2010-07-28 20:10:04 +0300
committerAlon Levy <alevy@redhat.com>2010-07-28 20:10:04 +0300
commitb953e440c2b323ee8cdb35c74f7886fd9c547f16 (patch)
tree8ae34db13454b8bb6c4243589d025567f2f4db0d /vreader.c
parentf8d3142a14d79ed183ba970419f188d35f62e9cc (diff)
white space fixes
Diffstat (limited to 'vreader.c')
-rw-r--r--vreader.c131
1 files changed, 62 insertions, 69 deletions
diff --git a/vreader.c b/vreader.c
index 0fa1c23..cd0f119 100644
--- a/vreader.c
+++ b/vreader.c
@@ -130,14 +130,14 @@ vreader_reset(VReader *reader, VCardPower power, unsigned char *atr, int *len)
VCard *card = vreader_get_card(reader);
if (card == NULL) {
- return VREADER_NO_CARD;
+ return VREADER_NO_CARD;
}
/*
* clean up our state
*/
vcard_reset(card, power);
if (atr) {
- vcard_emul_get_atr(card, atr, len);
+ vcard_emul_get_atr(card, atr, len);
}
vcard_free(card); /* free our reference */
return VREADER_OK;
@@ -146,15 +146,15 @@ vreader_reset(VReader *reader, VCardPower power, unsigned char *atr, int *len)
VReaderStatus
vreader_power_on(VReader *reader, unsigned char *atr, int *len)
{
- VReaderStatus status;
+ VReaderStatus status;
- return vreader_reset(reader, VCARD_POWER_ON, atr, len );
+ return vreader_reset(reader, VCARD_POWER_ON, atr, len );
}
VReaderStatus
vreader_power_off(VReader *reader)
{
- return vreader_reset(reader, VCARD_POWER_OFF, NULL, 0);
+ return vreader_reset(reader, VCARD_POWER_OFF, NULL, 0);
}
@@ -170,21 +170,21 @@ vreader_xfr_bytes(VReader *reader,
VCard *card = vreader_get_card(reader);
if (card == NULL) {
- return VREADER_NO_CARD;
+ return VREADER_NO_CARD;
}
apdu = vcard_apdu_new(send_buf, send_buf_len, &status);
if (apdu == NULL) {
- response = vcard_make_response(status);
- card_status = VCARD_DONE;
+ response = vcard_make_response(status);
+ card_status = VCARD_DONE;
} else {
- card_status = vcard_process_apdu(card, apdu, &response);
+ card_status = vcard_process_apdu(card, apdu, &response);
}
ASSERT(card_status == VCARD_DONE);
if (card_status == VCARD_DONE) {
- int size = MIN(*receive_buf_len, response->b_total_len);
- memcpy(receive_buf, response->b_data, size);
- *receive_buf_len = size;
+ int size = MIN(*receive_buf_len, response->b_total_len);
+ memcpy(receive_buf, response->b_data, size);
+ *receive_buf_len = size;
}
vcard_response_delete(response);
vcard_apdu_delete(apdu);
@@ -212,7 +212,7 @@ vreader_list_entry_new(VReader *reader)
new_reader_list_entry = (VReaderListEntry *)
malloc(sizeof(VReaderListEntry));
if (new_reader_list_entry == NULL) {
- return NULL;
+ return NULL;
}
new_reader_list_entry->next = NULL;
new_reader_list_entry->prev = NULL;
@@ -224,7 +224,7 @@ void
vreader_list_entry_delete(VReaderListEntry *entry)
{
if (entry == NULL) {
- return;
+ return;
}
vreader_free(entry->reader);
free(entry);
@@ -234,30 +234,30 @@ vreader_list_entry_delete(VReaderListEntry *entry)
static VReaderList *
vreader_list_new()
{
- VReaderList *new_reader_list;
+ VReaderList *new_reader_list;
- new_reader_list = (VReaderList *)malloc(sizeof(VReaderList));
- if (new_reader_list == NULL) {
- return NULL;
- }
- new_reader_list->head = NULL;
- new_reader_list->tail = NULL;
- return new_reader_list;
+ new_reader_list = (VReaderList *)malloc(sizeof(VReaderList));
+ if (new_reader_list == NULL) {
+ return NULL;
+ }
+ new_reader_list->head = NULL;
+ new_reader_list->tail = NULL;
+ return new_reader_list;
}
void
vreader_list_delete(VReaderList *list)
{
- VReaderListEntry *current_entry;
- VReaderListEntry *next_entry = NULL;
- for (current_entry= vreader_list_get_first(list); current_entry;
- current_entry=next_entry) {
- next_entry = vreader_list_get_next(current_entry);
- vreader_list_entry_delete(current_entry);
- }
- list->head = NULL;
- list->tail = NULL;
- free(list);
+ VReaderListEntry *current_entry;
+ VReaderListEntry *next_entry = NULL;
+ for (current_entry= vreader_list_get_first(list); current_entry;
+ current_entry=next_entry) {
+ next_entry = vreader_list_get_next(current_entry);
+ vreader_list_entry_delete(current_entry);
+ }
+ list->head = NULL;
+ list->tail = NULL;
+ free(list);
}
@@ -282,35 +282,35 @@ vreader_list_get_reader(VReaderListEntry *entry)
static void
vreader_queue(VReaderList *list, VReaderListEntry *entry)
{
- if (entry == NULL) {
- return;
- }
- entry->next = NULL;
- entry->prev = list->tail;
- if (list->head) {
- list->tail->next = entry;
- } else {
- list->head = entry;
- }
- list->tail = entry;
+ if (entry == NULL) {
+ return;
+ }
+ entry->next = NULL;
+ entry->prev = list->tail;
+ if (list->head) {
+ list->tail->next = entry;
+ } else {
+ list->head = entry;
+ }
+ list->tail = entry;
}
static void
vreader_dequeue(VReaderList *list, VReaderListEntry *entry)
{
if (entry == NULL) {
- return;
+ return;
}
if (entry->next == NULL) {
- list->tail = entry->prev;
+ list->tail = entry->prev;
} else if (entry->prev == NULL) {
- list->head = entry->next;
+ list->head = entry->next;
} else {
- entry->prev->next = entry->next;
- entry->next->prev = entry->prev;
+ entry->prev->next = entry->next;
+ entry->next->prev = entry->prev;
}
if ((list->tail == NULL) || (list->head == NULL)) {
- list->head = list->tail = NULL;
+ list->head = list->tail = NULL;
}
entry->next = entry->prev = NULL;
}
@@ -328,13 +328,13 @@ vreader_list_init()
static void
vreader_list_lock()
{
- MUTEX_LOCK(vreader_list_mutex);
+ MUTEX_LOCK(vreader_list_mutex);
}
static void
vreader_list_unlock()
{
- MUTEX_UNLOCK(vreader_list_mutex);
+ MUTEX_UNLOCK(vreader_list_mutex);
}
static VReaderList *
@@ -345,15 +345,15 @@ vreader_copy_list(VReaderList *list)
new_list = vreader_list_new();
if (new_list == NULL) {
- return NULL;
+ return NULL;
}
for (current_entry= vreader_list_get_first(list); current_entry;
current_entry=vreader_list_get_next(current_entry)) {
- VReader *reader = vreader_list_get_reader(current_entry);
- VReaderListEntry *new_entry = vreader_list_entry_new(reader);
+ VReader *reader = vreader_list_get_reader(current_entry);
+ VReaderListEntry *new_entry = vreader_list_entry_new(reader);
vreader_free(reader);
- vreader_queue(new_list, new_entry);
+ vreader_queue(new_list, new_entry);
}
vreader_list_unlock();
return new_list;
@@ -378,7 +378,7 @@ vreader_add_reader(VReader *reader)
reader_entry = vreader_list_entry_new(reader);
if (reader_entry == NULL) {
- return VREADER_OUT_OF_MEMORY;
+ return VREADER_OUT_OF_MEMORY;
}
vreader_list_lock();
vreader_queue(vreader_list, reader_entry);
@@ -396,9 +396,9 @@ vreader_remove_reader(VReader *reader)
vreader_list_lock();
for (current_entry= vreader_list_get_first(vreader_list); current_entry;
current_entry=vreader_list_get_next(current_entry)) {
- if (current_entry->reader == reader) {
- break;
- }
+ if (current_entry->reader == reader) {
+ break;
+ }
}
vreader_dequeue(vreader_list, current_entry);
vreader_list_unlock();
@@ -416,9 +416,9 @@ vreader_insert_card(VReader *reader, VCard *card)
{
vreader_lock(reader);
if (reader->card) {
- /* decrement reference count */
- vcard_free(reader->card);
- reader->card = NULL;
+ /* decrement reference count */
+ vcard_free(reader->card);
+ reader->card = NULL;
}
reader->card = vcard_reference(card);
vreader_unlock(reader);
@@ -435,10 +435,3 @@ vreader_init()
vreader_list_init();
}
-
-
-
-
-
-
-