diff options
author | Jim Miller | 2015-06-05 14:25:17 -0500 |
---|---|---|
committer | Jim Miller | 2015-06-05 14:25:17 -0500 |
commit | 72ffc3c02a5546ab93ffcbb2a94193be651c3629 (patch) | |
tree | cb1177a8cb8dbc493863334f8f7c34c6c72e9716 /fingerprintd | |
parent | 5a9233444b519cb866cc657a4dce27c45f089a97 (diff) | |
download | platform-system-core-72ffc3c02a5546ab93ffcbb2a94193be651c3629.tar.gz platform-system-core-72ffc3c02a5546ab93ffcbb2a94193be651c3629.tar.xz platform-system-core-72ffc3c02a5546ab93ffcbb2a94193be651c3629.zip |
Fix error on systems where ssize_t isn't 64-bits
Fixes bug 21491366
Change-Id: If34ab89fdb410350fa5773b5495a27493a6d1211
Diffstat (limited to 'fingerprintd')
-rw-r--r-- | fingerprintd/FingerprintDaemonProxy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fingerprintd/FingerprintDaemonProxy.cpp b/fingerprintd/FingerprintDaemonProxy.cpp index 4f355200b..a8a4024ea 100644 --- a/fingerprintd/FingerprintDaemonProxy.cpp +++ b/fingerprintd/FingerprintDaemonProxy.cpp | |||
@@ -123,7 +123,7 @@ int32_t FingerprintDaemonProxy::enroll(const uint8_t* token, ssize_t tokenSize, | |||
123 | int32_t timeout) { | 123 | int32_t timeout) { |
124 | ALOG(LOG_VERBOSE, LOG_TAG, "enroll(gid=%d, timeout=%d)\n", groupId, timeout); | 124 | ALOG(LOG_VERBOSE, LOG_TAG, "enroll(gid=%d, timeout=%d)\n", groupId, timeout); |
125 | if (tokenSize != sizeof(hw_auth_token_t) ) { | 125 | if (tokenSize != sizeof(hw_auth_token_t) ) { |
126 | ALOG(LOG_VERBOSE, LOG_TAG, "enroll() : invalid token size %" PRId64 "\n", tokenSize); | 126 | ALOG(LOG_VERBOSE, LOG_TAG, "enroll() : invalid token size %zu\n", tokenSize); |
127 | return -1; | 127 | return -1; |
128 | } | 128 | } |
129 | const hw_auth_token_t* authToken = reinterpret_cast<const hw_auth_token_t*>(token); | 129 | const hw_auth_token_t* authToken = reinterpret_cast<const hw_auth_token_t*>(token); |
@@ -171,7 +171,7 @@ int32_t FingerprintDaemonProxy::setActiveGroup(int32_t groupId, const uint8_t* p | |||
171 | char path_name[PATH_MAX]; | 171 | char path_name[PATH_MAX]; |
172 | memcpy(path_name, path, pathlen); | 172 | memcpy(path_name, path, pathlen); |
173 | path_name[pathlen] = '\0'; | 173 | path_name[pathlen] = '\0'; |
174 | ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %" PRId64 ")", groupId, path_name, pathlen); | 174 | ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %zu)", groupId, path_name, pathlen); |
175 | return mDevice->set_active_group(mDevice, groupId, path_name); | 175 | return mDevice->set_active_group(mDevice, groupId, path_name); |
176 | return -1; | 176 | return -1; |
177 | } | 177 | } |