diff options
author | Steve Block <steveblock@google.com> | 2009-12-17 13:39:33 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 19:59:39 +0000 |
commit | 4fc0928eac407b875346cd66443964a6fa057bca (patch) | |
tree | 15cc80a6fdbe1ab5e0407879f328095f9667941a /WebKit/android/jni/JavaSharedClient.cpp | |
parent | ff875e53ee5cadb137435bb73bddf78c2b48a144 (diff) | |
download | external_webkit-4fc0928eac407b875346cd66443964a6fa057bca.zip external_webkit-4fc0928eac407b875346cd66443964a6fa057bca.tar.gz external_webkit-4fc0928eac407b875346cd66443964a6fa057bca.tar.bz2 |
Fixes compiler warnings in JavaSharedClient.cpp.
Change-Id: I5c386924243ef98392b9c67c907421d714273e26
Diffstat (limited to 'WebKit/android/jni/JavaSharedClient.cpp')
-rw-r--r-- | WebKit/android/jni/JavaSharedClient.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebKit/android/jni/JavaSharedClient.cpp b/WebKit/android/jni/JavaSharedClient.cpp index b9ecff7..ce46570 100644 --- a/WebKit/android/jni/JavaSharedClient.cpp +++ b/WebKit/android/jni/JavaSharedClient.cpp @@ -102,24 +102,23 @@ namespace android { void JavaSharedClient::ServiceFunctionPtrQueue() { for (;;) { - void (*proc)(void*); - void* payload; + void (*proc)(void*) = 0; + void* payload = 0; const FuncPtrRec* rec; // we have to copy the proc/payload (if present). we do this so we // don't call the proc inside the mutex (possible deadlock!) gFuncPtrQMutex.acquire(); rec = (const FuncPtrRec*)gFuncPtrQ.front(); - if (NULL != rec) { + if (rec) { proc = rec->fProc; payload = rec->fPayload; gFuncPtrQ.pop_front(); } gFuncPtrQMutex.release(); - if (NULL == rec) { + if (!rec) break; - } proc(payload); } } |