diff options
| author | Colin Cross <ccross@android.com> | 2014-03-21 15:04:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-21 15:04:25 -0700 |
| commit | e5729fac81c8a984e984fefc90afc64135817d4f (patch) | |
| tree | 526e94e71d66a2cf8faac48c16716bf3c757a2a6 /services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp | |
| parent | 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a (diff) | |
| download | frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.zip frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.tar.gz frameworks_av-e5729fac81c8a984e984fefc90afc64135817d4f.tar.bz2 | |
libcameraservice: fix 64-bit print format warnings
Use PRId64 from inttypes.h to print nsecs_t (int64_t)
Use %zu to print size_t
Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp index 42e02d8..d662cc2 100644 --- a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp +++ b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp @@ -18,8 +18,7 @@ #define ATRACE_TAG ATRACE_TAG_CAMERA //#define LOG_NDEBUG 0 -// This is needed for stdint.h to define INT64_MAX in C++ -#define __STDC_LIMIT_MACROS +#include <inttypes.h> #include <utils/Log.h> #include <utils/Trace.h> @@ -54,8 +53,8 @@ Camera3IOStreamBase::~Camera3IOStreamBase() { bool Camera3IOStreamBase::hasOutstandingBuffersLocked() const { nsecs_t signalTime = mCombinedFence->getSignalTime(); - ALOGV("%s: Stream %d: Has %d outstanding buffers," - " buffer signal time is %lld", + ALOGV("%s: Stream %d: Has %zu outstanding buffers," + " buffer signal time is %" PRId64, __FUNCTION__, mId, mDequeuedBufferCount, signalTime); if (mDequeuedBufferCount > 0 || signalTime == INT64_MAX) { return true; @@ -73,7 +72,7 @@ void Camera3IOStreamBase::dump(int fd, const Vector<String16> &args) const { lines.appendFormat(" Max size: %zu\n", mMaxSize); lines.appendFormat(" Usage: %d, max HAL buffers: %d\n", camera3_stream::usage, camera3_stream::max_buffers); - lines.appendFormat(" Frames produced: %d, last timestamp: %lld ns\n", + lines.appendFormat(" Frames produced: %d, last timestamp: %" PRId64 " ns\n", mFrameCount, mLastTimestamp); lines.appendFormat(" Total buffers: %zu, currently dequeued: %zu\n", mTotalBufferCount, mDequeuedBufferCount); @@ -119,7 +118,7 @@ status_t Camera3IOStreamBase::disconnectLocked() { } if (mDequeuedBufferCount > 0) { - ALOGE("%s: Can't disconnect with %d buffers still dequeued!", + ALOGE("%s: Can't disconnect with %zu buffers still dequeued!", __FUNCTION__, mDequeuedBufferCount); return INVALID_OPERATION; } |