depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

aesx660: Remove home-grown min() implementation

Browse source 
And use GLib's.
This commit is contained in:
Bastien Nocera 2018-09-27 09:11:13 +02:00
parent d09cb88e9a
commit 49ba59369a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libfprint/drivers/aesx660.c
View file

@ -35,8 +35,6 @@ static void complete_deactivation(struct fp_img_dev *dev);
#define BULK_TIMEOUT 4000 #define BULK_TIMEOUT 4000
#define FRAME_HEIGHT AESX660_FRAME_HEIGHT #define FRAME_HEIGHT AESX660_FRAME_HEIGHT
#define min(a, b) (((a) < (b)) ? (a) : (b))
static void static void
aesX660_send_cmd_timeout(fpi_ssm *ssm, aesX660_send_cmd_timeout(fpi_ssm *ssm,
struct fp_dev *_dev, struct fp_dev *_dev,
@ -334,7 +332,7 @@ static void capture_read_stripe_data_cb(struct libusb_transfer *transfer)
fp_dbg("Got %lu bytes of data", actual_len); fp_dbg("Got %lu bytes of data", actual_len);
do { do {
copied = min(aesdev->buffer_max - aesdev->buffer_size, actual_len); copied = MIN(aesdev->buffer_max - aesdev->buffer_size, actual_len);
memcpy(aesdev->buffer + aesdev->buffer_size, memcpy(aesdev->buffer + aesdev->buffer_size,
data, data,
copied); copied);