liblog: resolve build warning messages
Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
This commit is contained in:
parent
6aedf1d3d4
commit
153b370624
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2007 The Android Open Source Project
|
||||
* Copyright (C) 2007-2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -31,8 +31,8 @@ extern "C" {
|
|||
#include <stddef.h>
|
||||
|
||||
struct iovec {
|
||||
const void* iov_base;
|
||||
size_t iov_len;
|
||||
void* iov_base;
|
||||
size_t iov_len;
|
||||
};
|
||||
|
||||
extern int readv( int fd, struct iovec* vecs, int count );
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
* Copyright (C) 2008-2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -322,11 +322,11 @@ static const char* getPriorityString(int priority)
|
|||
* Make up something to replace it.
|
||||
*/
|
||||
static ssize_t fake_writev(int fd, const struct iovec *iov, int iovcnt) {
|
||||
int result = 0;
|
||||
struct iovec* end = iov + iovcnt;
|
||||
ssize_t result = 0;
|
||||
const struct iovec* end = iov + iovcnt;
|
||||
for (; iov < end; iov++) {
|
||||
int w = write(fd, iov->iov_base, iov->iov_len);
|
||||
if (w != iov->iov_len) {
|
||||
ssize_t w = write(fd, iov->iov_base, iov->iov_len);
|
||||
if (w != (ssize_t) iov->iov_len) {
|
||||
if (w < 0)
|
||||
return w;
|
||||
return result + w;
|
||||
|
|
10
liblog/uio.c
10
liblog/uio.c
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2007 The Android Open Source Project
|
||||
* Copyright (C) 2007-2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -24,8 +24,8 @@ int readv( int fd, struct iovec* vecs, int count )
|
|||
int total = 0;
|
||||
|
||||
for ( ; count > 0; count--, vecs++ ) {
|
||||
const char* buf = vecs->iov_base;
|
||||
int len = vecs->iov_len;
|
||||
char* buf = vecs->iov_base;
|
||||
int len = vecs->iov_len;
|
||||
|
||||
while (len > 0) {
|
||||
int ret = read( fd, buf, len );
|
||||
|
@ -51,8 +51,8 @@ int writev( int fd, const struct iovec* vecs, int count )
|
|||
int total = 0;
|
||||
|
||||
for ( ; count > 0; count--, vecs++ ) {
|
||||
const char* buf = (const char*)vecs->iov_base;
|
||||
int len = (int)vecs->iov_len;
|
||||
const char* buf = vecs->iov_base;
|
||||
int len = vecs->iov_len;
|
||||
|
||||
while (len > 0) {
|
||||
int ret = write( fd, buf, len );
|
||||
|
|
Loading…
Reference in New Issue