Piteball/android_device_samsung_klte-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

klte-common: fingerprint: Resolve compilation warnings

Browse source 
* fingerprint_enumerate had an incorrect signature
* Quit partially initializing fingerprint_msg_t instances

Change-Id: I09a05f3656c5bdc1e17fa76b5e68c56e0b7277de
This commit is contained in:
Kevin F. Haggerty 2017-12-22 17:21:22 -07:00
parent 09e4b79ed7
commit 7a56477e86
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fingerprint/fingerprint.c
View file

@ -299,7 +299,7 @@ void send_error_notice(void* device, int error_info_int) {
vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device; vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device;
fingerprint_error_t error_info = (fingerprint_error_t)error_info_int; fingerprint_error_t error_info = (fingerprint_error_t)error_info_int;
fingerprint_msg_t msg = {0}; fingerprint_msg_t msg;
msg.type = FINGERPRINT_ERROR; msg.type = FINGERPRINT_ERROR;
msg.data.error = error_info; msg.data.error = error_info;
ALOGV("recevied error notice! error_info=%d", (int)error_info); ALOGV("recevied error notice! error_info=%d", (int)error_info);
@ -316,7 +316,7 @@ void send_acquired_notice(void* device, int acquired_ret) {
vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device; vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device;
fingerprint_acquired_info_t acquired_info = convert_ret_to_acquired_info(acquired_ret); fingerprint_acquired_info_t acquired_info = convert_ret_to_acquired_info(acquired_ret);
fingerprint_msg_t acqu_msg = {0}; fingerprint_msg_t acqu_msg;
acqu_msg.type = FINGERPRINT_ACQUIRED; acqu_msg.type = FINGERPRINT_ACQUIRED;
acqu_msg.data.acquired.acquired_info = acquired_info; acqu_msg.data.acquired.acquired_info = acquired_info;
ALOGI("acqu_info=%d", (int)acquired_info); ALOGI("acqu_info=%d", (int)acquired_info);
@ -343,7 +343,7 @@ void send_enroll_notice(void* device, int fid, int remaining) {
pthread_mutex_lock(&vdev->lock); pthread_mutex_lock(&vdev->lock);
fingerprint_msg_t msg = {0}; fingerprint_msg_t msg;
msg.type = FINGERPRINT_TEMPLATE_ENROLLING; msg.type = FINGERPRINT_TEMPLATE_ENROLLING;
msg.data.enroll.finger.fid = fid; msg.data.enroll.finger.fid = fid;
msg.data.enroll.samples_remaining = remaining; msg.data.enroll.samples_remaining = remaining;
@ -360,7 +360,7 @@ void send_authenticated_notice(void* device, int fid) {
send_acquired_notice(vdev, FINGERPRINT_ACQUIRED_GOOD); send_acquired_notice(vdev, FINGERPRINT_ACQUIRED_GOOD);
fingerprint_msg_t auth_msg = {0}; fingerprint_msg_t auth_msg;
auth_msg.type = FINGERPRINT_AUTHENTICATED; auth_msg.type = FINGERPRINT_AUTHENTICATED;
auth_msg.data.authenticated.finger.fid = fid; auth_msg.data.authenticated.finger.fid = fid;
auth_msg.data.authenticated.finger.gid = 0; // unused auth_msg.data.authenticated.finger.gid = 0; // unused
@ -386,7 +386,7 @@ void send_remove_notice(void* device, int fid) {
ALOGV("----------------> %s ----------------->fid=%d", __FUNCTION__, fid); ALOGV("----------------> %s ----------------->fid=%d", __FUNCTION__, fid);
vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device; vcs_fingerprint_device_t* vdev = (vcs_fingerprint_device_t*)device;
fingerprint_msg_t msg = {0}; fingerprint_msg_t msg;
msg.type = FINGERPRINT_TEMPLATE_REMOVED; msg.type = FINGERPRINT_TEMPLATE_REMOVED;
msg.data.removed.finger.fid = fid; msg.data.removed.finger.fid = fid;
@ -543,10 +543,9 @@ static int fingerprint_cancel(struct fingerprint_device *device) {
return ret; return ret;
} }
static int fingerprint_enumerate(struct fingerprint_device *device, static int fingerprint_enumerate(struct fingerprint_device *device) {
fingerprint_finger_id_t *results, uint32_t *max_size) {
ALOGV("----------------> %s ----------------->", __FUNCTION__); ALOGV("----------------> %s ----------------->", __FUNCTION__);
if (device == NULL || results == NULL || max_size == NULL) { if (device == NULL) {
ALOGE("Cannot enumerate saved fingerprints with uninitialized params"); ALOGE("Cannot enumerate saved fingerprints with uninitialized params");
return -1; return -1;
} }