Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security

Browse Source
This commit is contained in:
Nick Kralevich
2010-05-14 09:14:34 -07:00
committed by Android Git Automerger
parent e0abb37a7b 1e4dc54d56
commit 4db8471d9f
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
camera/tests/CameraServiceTest/CameraServiceTest.cpp
View File

@@ -226,7 +226,7 @@ void MCameraClient::assertDataSize(int32_t msgType, OP op, int dataSize) {
} }
void MCameraClient::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) { void MCameraClient::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) {
INFO(__func__); INFO("%s", __func__);
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
ssize_t i = mNotifyCount.indexOfKey(msgType); ssize_t i = mNotifyCount.indexOfKey(msgType);
if (i < 0) { if (i < 0) {
@@ -238,7 +238,7 @@ void MCameraClient::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2)
} }
void MCameraClient::dataCallback(int32_t msgType, const sp<IMemory>& data) { void MCameraClient::dataCallback(int32_t msgType, const sp<IMemory>& data) {
INFO(__func__); INFO("%s", __func__);
int dataSize = data->size(); int dataSize = data->size();
INFO("data type = %d, size = %d", msgType, dataSize); INFO("data type = %d, size = %d", msgType, dataSize);
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
@@ -314,7 +314,7 @@ private:
}; };
status_t MSurface::registerBuffers(const BufferHeap& buffers) { status_t MSurface::registerBuffers(const BufferHeap& buffers) {
INFO(__func__); INFO("%s", __func__);
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
++registerBuffersCount; ++registerBuffersCount;
mCond.signal(); mCond.signal();
@@ -322,21 +322,21 @@ status_t MSurface::registerBuffers(const BufferHeap& buffers) {
} }
void MSurface::postBuffer(ssize_t offset) { void MSurface::postBuffer(ssize_t offset) {
// INFO(__func__); // INFO("%s", __func__);
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
++postBufferCount; ++postBufferCount;
mCond.signal(); mCond.signal();
} }
void MSurface::unregisterBuffers() { void MSurface::unregisterBuffers() {
INFO(__func__); INFO("%s", __func__);
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
++unregisterBuffersCount; ++unregisterBuffersCount;
mCond.signal(); mCond.signal();
} }
sp<GraphicBuffer> MSurface::requestBuffer(int bufferIdx, int usage) { sp<GraphicBuffer> MSurface::requestBuffer(int bufferIdx, int usage) {
INFO(__func__); INFO("%s", __func__);
return NULL; return NULL;
} }
@@ -386,17 +386,17 @@ sp<IHolder> getHolder() {
} }
void putTempObject(sp<IBinder> obj) { void putTempObject(sp<IBinder> obj) {
INFO(__func__); INFO("%s", __func__);
getHolder()->put(obj); getHolder()->put(obj);
} }
sp<IBinder> getTempObject() { sp<IBinder> getTempObject() {
INFO(__func__); INFO("%s", __func__);
return getHolder()->get(); return getHolder()->get();
} }
void clearTempObject() { void clearTempObject() {
INFO(__func__); INFO("%s", __func__);
getHolder()->clear(); getHolder()->clear();
} }
@@ -422,7 +422,7 @@ int getNumberOfCameras() {
// Various Connect Tests // Various Connect Tests
// //
void testConnect(int cameraId) { void testConnect(int cameraId) {
INFO(__func__); INFO("%s", __func__);
sp<ICameraService> cs = getCameraService(); sp<ICameraService> cs = getCameraService();
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
sp<ICamera> c = cs->connect(cc, cameraId); sp<ICamera> c = cs->connect(cc, cameraId);
@@ -431,7 +431,7 @@ void testConnect(int cameraId) {
} }
void testAllowConnectOnceOnly(int cameraId) { void testAllowConnectOnceOnly(int cameraId) {
INFO(__func__); INFO("%s", __func__);
sp<ICameraService> cs = getCameraService(); sp<ICameraService> cs = getCameraService();
// Connect the first client. // Connect the first client.
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
@@ -446,14 +446,14 @@ void testAllowConnectOnceOnly(int cameraId) {
} }
void testReconnectFailed() { void testReconnectFailed() {
INFO(__func__); INFO("%s", __func__);
sp<ICamera> c = interface_cast<ICamera>(getTempObject()); sp<ICamera> c = interface_cast<ICamera>(getTempObject());
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
ASSERT(c->connect(cc) != NO_ERROR); ASSERT(c->connect(cc) != NO_ERROR);
} }
void testReconnectSuccess() { void testReconnectSuccess() {
INFO(__func__); INFO("%s", __func__);
sp<ICamera> c = interface_cast<ICamera>(getTempObject()); sp<ICamera> c = interface_cast<ICamera>(getTempObject());
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
ASSERT(c->connect(cc) == NO_ERROR); ASSERT(c->connect(cc) == NO_ERROR);
@@ -461,20 +461,20 @@ void testReconnectSuccess() {
} }
void testLockFailed() { void testLockFailed() {
INFO(__func__); INFO("%s", __func__);
sp<ICamera> c = interface_cast<ICamera>(getTempObject()); sp<ICamera> c = interface_cast<ICamera>(getTempObject());
ASSERT(c->lock() != NO_ERROR); ASSERT(c->lock() != NO_ERROR);
} }
void testLockUnlockSuccess() { void testLockUnlockSuccess() {
INFO(__func__); INFO("%s", __func__);
sp<ICamera> c = interface_cast<ICamera>(getTempObject()); sp<ICamera> c = interface_cast<ICamera>(getTempObject());
ASSERT(c->lock() == NO_ERROR); ASSERT(c->lock() == NO_ERROR);
ASSERT(c->unlock() == NO_ERROR); ASSERT(c->unlock() == NO_ERROR);
} }
void testLockSuccess() { void testLockSuccess() {
INFO(__func__); INFO("%s", __func__);
sp<ICamera> c = interface_cast<ICamera>(getTempObject()); sp<ICamera> c = interface_cast<ICamera>(getTempObject());
ASSERT(c->lock() == NO_ERROR); ASSERT(c->lock() == NO_ERROR);
c->disconnect(); c->disconnect();
@@ -525,7 +525,7 @@ void runInAnotherProcess(const char *tag) {
} }
void testReconnect(int cameraId) { void testReconnect(int cameraId) {
INFO(__func__); INFO("%s", __func__);
sp<ICameraService> cs = getCameraService(); sp<ICameraService> cs = getCameraService();
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
sp<ICamera> c = cs->connect(cc, cameraId); sp<ICamera> c = cs->connect(cc, cameraId);
@@ -559,7 +559,7 @@ void testLockUnlock(int cameraId) {
} }
void testReconnectFromAnotherProcess(int cameraId) { void testReconnectFromAnotherProcess(int cameraId) {
INFO(__func__); INFO("%s", __func__);
sp<ICameraService> cs = getCameraService(); sp<ICameraService> cs = getCameraService();
sp<MCameraClient> cc = new MCameraClient(); sp<MCameraClient> cc = new MCameraClient();
@@ -729,7 +729,7 @@ class TestGetParameters: public AfterStartPreview {
public: public:
void run() { void run() {
String8 param_str = c->getParameters(); String8 param_str = c->getParameters();
INFO(param_str); INFO("%s", static_cast<const char*>(param_str));
} }
}; };