laforge
/
librfid
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

unsigned int -> size_t in some appropriate places. 

Fixes segfaults on x86_64


git-svn-id: https://svn.gnumonks.org/trunk/librfid@1984 e0336214-984f-0b4b-a45f-81c69e1f0ede
This commit is contained in:
ploetz 2007-03-20 00:16:22 +00:00
parent 1c1b42a7c2
commit 9a8dbae5c7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/librfid/rfid_reader_cm5121.h
View File

@ -13,8 +13,8 @@
extern int
PC_to_RDR_Escape(void *handle,
const unsigned char *tx_buf, unsigned int tx_len,
unsigned char *rx_buf, unsigned int *rx_len);
const unsigned char *tx_buf, size_t tx_len,
unsigned char *rx_buf, size_t *rx_len);
extern const struct rfid_reader rfid_reader_cm5121;
// extern struct rfid_asic_transport cm5121_ccid;

4
src/ccid/rfid_reader_cm5121_ccid_direct.c
View File

@ -14,8 +14,8 @@
/* this is the sole function required by rfid_reader_cm5121.c */
int
PC_to_RDR_Escape(void *handle,
const unsigned char *tx_buf, unsigned int tx_len,
unsigned char *rx_buf, unsigned int *rx_len)
const unsigned char *tx_buf, size_t tx_len,
unsigned char *rx_buf, size_t *rx_len)
{
int rc;
ccid_driver_t ch = handle;

10
src/rfid_reader_cm5121.c
View File

@ -67,7 +67,7 @@ int Write1ByteToReg(struct rfid_asic_transport_handle *rath,
{
unsigned char sndbuf[SENDBUF_LEN];
unsigned char rcvbuf[RECVBUF_LEN];
unsigned int retlen = RECVBUF_LEN;
size_t retlen = RECVBUF_LEN;
sndbuf[0] = 0x20;
sndbuf[1] = 0x00;
@ -96,7 +96,7 @@ static int Read1ByteFromReg(struct rfid_asic_transport_handle *rath,
{
unsigned char sndbuf[SENDBUF_LEN];
unsigned char recvbuf[RECVBUF_LEN];
unsigned int retlen = sizeof(recvbuf);
size_t retlen = sizeof(recvbuf);
sndbuf[0] = 0x20;
sndbuf[1] = 0x00;
@ -124,7 +124,7 @@ static int ReadNBytesFromFIFO(struct rfid_asic_transport_handle *rath,
{
unsigned char sndbuf[SENDBUF_LEN];
unsigned char recvbuf[0x7f];
unsigned int retlen = sizeof(recvbuf);
size_t retlen = sizeof(recvbuf);
sndbuf[0] = 0x20;
sndbuf[1] = 0x00;
@ -153,7 +153,7 @@ static int WriteNBytesToFIFO(struct rfid_asic_transport_handle *rath,
{
unsigned char sndbuf[SENDBUF_LEN];
unsigned char recvbuf[0x7f];
unsigned int retlen = sizeof(recvbuf);
size_t retlen = sizeof(recvbuf);
sndbuf[0] = 0x20;
sndbuf[1] = 0x00;
@ -302,7 +302,7 @@ static int cm5121_enable_rc632(struct rfid_asic_transport_handle *rath)
{
unsigned char tx_buf[1] = { 0x01 };
unsigned char rx_buf[64];
unsigned int rx_len = sizeof(rx_buf);
size_t rx_len = sizeof(rx_buf);
PC_to_RDR_Escape(rath->data, tx_buf, 1, rx_buf, &rx_len);

4
src/rfid_reader_cm5121_openct.c
View File

@ -13,8 +13,8 @@ static int slot = 1;
/* this is the sole function required by rfid_reader_cm5121.c */
int
PC_to_RDR_Escape(void *handle,
const unsigned char *tx_buf, unsigned int tx_len,
unsigned char *rx_buf, unsigned int *rx_len)
const unsigned char *tx_buf, size_t tx_len,
unsigned char *rx_buf, size_t *rx_len)
{
int rc;
ct_handle *h = (ct_handle *) handle;