diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-10-20 10:55:03 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-10-20 10:57:18 -0700 |
| commit | cdd8d78b202e005691467296b9be98816ed4d4a9 (patch) | |
| tree | a6bac93f8c1531c7bbce682a13224684f17cfa1f /android/camera | |
| parent | f9c98df586b228896d98645f4192c9fc30e56f0d (diff) | |
| download | external_qemu-cdd8d78b202e005691467296b9be98816ed4d4a9.zip external_qemu-cdd8d78b202e005691467296b9be98816ed4d4a9.tar.gz external_qemu-cdd8d78b202e005691467296b9be98816ed4d4a9.tar.bz2 | |
Fix emulator crash caused by bad 'printf'
Change-Id: I7c4830ba7606bedcf462e967adad3358723c44ba
Diffstat (limited to 'android/camera')
| -rw-r--r-- | android/camera/camera-capture-linux.c | 4 | ||||
| -rw-r--r-- | android/camera/camera-service.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/camera/camera-capture-linux.c b/android/camera/camera-capture-linux.c index 8a96c0c..32d8b0c 100644 --- a/android/camera/camera-capture-linux.c +++ b/android/camera/camera-capture-linux.c @@ -612,7 +612,7 @@ _camera_device_enum_format_sizes(LinuxCameraDevice* cd, if(_xioctl(cd->handle, VIDIOC_ENUM_FRAMESIZES, &size_enum)) { /* Errors are not welcome here anymore. */ E("%s: Unexpected failure while getting pixel dimensions: %s", - strerror(errno)); + __FUNCTION__, strerror(errno)); free(arr); return -1; } @@ -707,7 +707,7 @@ _camera_device_enum_pixel_formats(LinuxCameraDevice* cd, QemuPixelFormat** fmts) int nn; /* Errors are not welcome here anymore. */ E("%s: Unexpected failure while getting pixel format: %s", - strerror(errno)); + __FUNCTION__, strerror(errno)); for (nn = 0; nn < out_num; nn++) { _qemu_pixel_format_free(arr + nn); } diff --git a/android/camera/camera-service.c b/android/camera/camera-service.c index ee3ea6e..e551dca 100644 --- a/android/camera/camera-service.c +++ b/android/camera/camera-service.c @@ -601,7 +601,7 @@ _qemu_client_query_reply(QemudClient* qc, /* Make sure extra_size is 0 if extra is NULL. */ if (extra == NULL && extra_size != 0) { W("%s: 'extra' = NULL, while 'extra_size' = %d", - __FUNCTION__, extra, extra_size); + __FUNCTION__, (int)extra_size); extra_size = 0; } |