libcaccard: coding style: s/VReaderID/vreader_id_t/

4 files changed, 14 insertions, 14 deletions

diff --git a/vreader.c b/vreader.c
index 6800ffd..85f96a8 100644
--- a/vreader.c
+++ b/vreader.c
@@ -22,7 +22,7 @@ struct VReaderStruct {
     int    reference_count;
     VCard *card;
     char *name;
-    VReaderID id;
+    vreader_id_t id;
     mutex_t lock;
     VReaderEmul  *reader_private;
     VReaderEmulFree reader_private_free;
@@ -58,7 +58,7 @@ vreader_new(const char *name, VReaderEmul *private,
     reader->reference_count = 1;
     reader->name = name ? strdup(name) : NULL;
     reader->card = NULL;
-    reader->id = (VReaderID)-1;
+    reader->id = (vreader_id_t)-1;
     reader->reader_private = private;
     reader->reader_private_free = private_free;
     return reader;
@@ -126,17 +126,17 @@ vreader_card_is_present(VReader *reader)
     return VREADER_OK;
 }
 
-VReaderID
+vreader_id_t
 vreader_get_id(VReader *reader)
 {
     if (reader == NULL) {
-        return (VReaderID)-1;
+        return (vreader_id_t)-1;
     }
     return reader->id;
 }
 
 VReaderStatus
-vreader_set_id(VReader *reader, VReaderID id)
+vreader_set_id(VReader *reader, vreader_id_t id)
 {
     if (reader == NULL) {
         return VREADER_NO_CARD;
@@ -404,12 +404,12 @@ vreader_get_reader_list(void)
 }
 
 VReader *
-vreader_get_reader_by_id(VReaderID id)
+vreader_get_reader_by_id(vreader_id_t id)
 {
     VReader *reader = NULL;
     VReaderListEntry *current_entry = NULL;
 
-    if (id == (VReaderID) -1) {
+    if (id == (vreader_id_t) -1) {
         return NULL;
     }
 
diff --git a/vreader.h b/vreader.h
index 97bf38d..f3f9434 100644
--- a/vreader.h
+++ b/vreader.h
@@ -30,8 +30,8 @@ void vreader_free(VReader *reader);
 VReaderEmul *vreader_get_private(VReader *);
 VReaderStatus vreader_card_is_present(VReader *reader);
 const char *vreader_get_name(VReader *reader);
-VReaderID vreader_get_id(VReader *reader);
-VReaderStatus vreader_set_id(VReader *reader, VReaderID id);
+vreader_id_t vreader_get_id(VReader *reader);
+VReaderStatus vreader_set_id(VReader *reader, vreader_id_t id);
 
 /* list operations */
 VReaderList *vreader_get_reader_list(void);
@@ -39,7 +39,7 @@ void vreader_list_delete(VReaderList *list);
 VReader *vreader_list_get_reader(VReaderListEntry *entry);
 VReaderListEntry *vreader_list_get_first(VReaderList *list);
 VReaderListEntry *vreader_list_get_next(VReaderListEntry *list);
-VReader *vreader_get_reader_by_id(VReaderID id);
+VReader *vreader_get_reader_by_id(vreader_id_t id);
 VReader *vreader_get_reader_by_name(const char *name);
 
 /*
diff --git a/vreadert.h b/vreadert.h
index bdc1ecd..4c01259 100644
--- a/vreadert.h
+++ b/vreadert.h
@@ -11,7 +11,7 @@ typedef enum {
     VREADER_OUT_OF_MEMORY
 } VReaderStatus;
 
-typedef unsigned int VReaderID;
+typedef unsigned int vreader_id_t;
 typedef struct VReaderStruct VReader;
 typedef struct VReaderListStruct VReaderList;
 typedef struct VReaderListEntryStruct VReaderListEntry;
diff --git a/vscclient.c b/vscclient.c
index 241bdfb..0c9bab3 100644
--- a/vscclient.c
+++ b/vscclient.c
@@ -267,7 +267,7 @@ do_command(void)
             for (reader_entry = vreader_list_get_first(list); reader_entry;
                  reader_entry = vreader_list_get_next(reader_entry)) {
                 VReader *reader = vreader_list_get_reader(reader_entry);
-                VReaderID reader_id;
+                vreader_id_t reader_id;
                 reader_id=vreader_get_id(reader);
                 if (reader_id == -1) {
                     continue;
@@ -333,7 +333,7 @@ do_command(void)
             for (reader_entry = vreader_list_get_first(list); reader_entry;
                  reader_entry = vreader_list_get_next(reader_entry)) {
                 VReader *reader = vreader_list_get_reader(reader_entry);
-                VReaderID reader_id;
+                vreader_id_t reader_id;
                 reader_id=vreader_get_id(reader);
                 if (reader_id == -1) {
                     continue;
@@ -347,7 +347,7 @@ do_command(void)
             for (reader_entry = vreader_list_get_first(list); reader_entry;
                  reader_entry = vreader_list_get_next(reader_entry)) {
                 VReader *reader = vreader_list_get_reader(reader_entry);
-                VReaderID reader_id;
+                vreader_id_t reader_id;
                 reader_id=vreader_get_id(reader);
                 if (reader_id != -1) {
                     continue;