crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename desfire_error_lookup() into mifare_desfire_error_lookup() for consistency with the rest of the code.

Browse source
This commit is contained in:
Romain Tartiere 2010-09-03 11:24:25 +00:00
parent ff7f136fbe
commit d59e197ff9
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libfreefare/Makefile.am
View file

@ -11,9 +11,9 @@ libfreefare_la_SOURCES = freefare.c \
mifare_desfire.c \ mifare_desfire.c \
mifare_desfire_aid.c \ mifare_desfire_aid.c \
mifare_desfire_authenticate.c \ mifare_desfire_authenticate.c \
mifare_desfire_error.c \
mifare_desfire_key.c \ mifare_desfire_key.c \
mad.c \ mad.c \
desfire_error.c \
mifare_application.c \ mifare_application.c \
tlv.c tlv.c
libfreefare_la_LIBADD = libfreefare_la_LIBADD =

2
libfreefare/freefare.h
View file

@ -347,7 +347,7 @@ uint8_t mifare_desfire_key_get_version (MifareDESFireKey key);
void mifare_desfire_key_set_version (MifareDESFireKey key, uint8_t version); void mifare_desfire_key_set_version (MifareDESFireKey key, uint8_t version);
void mifare_desfire_key_free (MifareDESFireKey key); void mifare_desfire_key_free (MifareDESFireKey key);
const char *desfire_error_lookup (uint8_t error); const char *mifare_desfire_error_lookup (uint8_t error);
uint8_t *tlv_encode (const uint8_t type, const uint8_t *istream, uint16_t isize, size_t *osize); uint8_t *tlv_encode (const uint8_t type, const uint8_t *istream, uint16_t isize, size_t *osize);
uint8_t *tlv_decode (const uint8_t *istream, uint8_t *type, uint16_t *size); uint8_t *tlv_decode (const uint8_t *istream, uint8_t *type, uint16_t *size);

0
libfreefare/desfire_error.c → libfreefare/mifare_desfire_error.c
View file

2
test/test_mifare_desfire.c
View file

@ -34,7 +34,7 @@ uint8_t key_data_3des[16] = { 'C', 'a', 'r', 'd', ' ', 'M', 'a', 's', 't', 'e',
#define cut_assert_success(last_command) \ #define cut_assert_success(last_command) \
do { \ do { \
if ((res < 0) || (MIFARE_DESFIRE (tag)->last_picc_error != OPERATION_OK)) { \ if ((res < 0) || (MIFARE_DESFIRE (tag)->last_picc_error != OPERATION_OK)) { \
cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, desfire_error_lookup (MIFARE_DESFIRE (tag)->last_picc_error), strerror (errno)); \ cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (MIFARE_DESFIRE (tag)->last_picc_error), strerror (errno)); \
} \ } \
} while (0) } while (0)