summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2014-01-28 15:09:37 -0600
committerGerrit Code Review2014-01-28 15:09:37 -0600
commitd2acdd82e613b3e1d79a00943ac3bf5fbc14a766 (patch)
treed7f0ff36ad86281f3fa4eb36978658711e7c2296 /liblog/fake_log_device.c
parent12db3eb6db3b80011043e404530012612a1d0fbf (diff)
parent44b99c22af84331068935a9bc3e807165a88237c (diff)
downloadplatform-system-core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.tar.gz
platform-system-core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.tar.xz
platform-system-core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.zip
Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* changes: libsysutils: SocketListener export release libsysutils: Add iovec/runOnEachSocket liblog: support struct logger_event_v2 format liblog: update timestamp on NOTICE file libcutils: resolve warning in iosched_policy.c liblog: Add const pedantics logcat: Add -T flag (-t w/o assumption of -d) logcat: Add logcat test suite liblog: Add cpu utilization test liblog: Add liblog test suite debuggerd: Support newline split in log messages liblog: deprecate export LOGGER ioctl definitions liblog: deprecate export of LOGGER_LOG_* defines liblog: Add README liblog: resolve build warning messages liblog: high CPU usage from logcat liblog: fix build again liblog: drop use of sys/cdefs.h liblog: git_master@964770 build problem logcat: Incorporate liblog reading API debuggerd: Incorporate liblog reading API liblog: Interface to support abstracting log read adb: deprecate legacy log service interface adb: regression from Move list.c to inlines liblog: whitespace cleanup libcutils: bug str_parms.c:str_parms_get_float(). libcutils: UNUSED argument warnings libsysutils: Get rid of warnings libcutils: Move list.c to inlines on list.h
Diffstat (limited to 'liblog/fake_log_device.c')
-rw-r--r--liblog/fake_log_device.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index be34f017b..da83a8525 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2008 The Android Open Source Project 2 * Copyright (C) 2008-2014 The Android Open Source Project
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -322,11 +322,11 @@ static const char* getPriorityString(int priority)
322 * Make up something to replace it. 322 * Make up something to replace it.
323 */ 323 */
324static ssize_t fake_writev(int fd, const struct iovec *iov, int iovcnt) { 324static ssize_t fake_writev(int fd, const struct iovec *iov, int iovcnt) {
325 int result = 0; 325 ssize_t result = 0;
326 struct iovec* end = iov + iovcnt; 326 const struct iovec* end = iov + iovcnt;
327 for (; iov < end; iov++) { 327 for (; iov < end; iov++) {
328 int w = write(fd, iov->iov_base, iov->iov_len); 328 ssize_t w = write(fd, iov->iov_base, iov->iov_len);
329 if (w != iov->iov_len) { 329 if (w != (ssize_t) iov->iov_len) {
330 if (w < 0) 330 if (w < 0)
331 return w; 331 return w;
332 return result + w; 332 return result + w;